Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceb1f0af authored by Andy McFadden's avatar Andy McFadden Committed by Android (Google) Code Review
Browse files

Merge "Pass additional arg to acquireBuffer calls."

parents 132a4fb8 656e8625

media/libstagefright/SurfaceMediaSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ status_t SurfaceMediaSource::read( MediaBuffer **buffer, 
    // wait here till the frames come in from the client side

    while (mStarted) {



        status_t err = mBufferQueue->acquireBuffer(&item);

        status_t err = mBufferQueue->acquireBuffer(&item, 0);

        if (err == BufferQueue::NO_BUFFER_AVAILABLE) {

            // wait for a buffer to be queued

            mFrameAvailableCondition.wait(mMutex);

media/libstagefright/omx/GraphicBufferSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ bool GraphicBufferSource::fillCodecBuffer_l() { 
    ALOGV("fillCodecBuffer_l: acquiring buffer, avail=%d",

            mNumFramesAvailable);

    BufferQueue::BufferItem item;

    status_t err = mBufferQueue->acquireBuffer(&item);

    status_t err = mBufferQueue->acquireBuffer(&item, 0);

    if (err == BufferQueue::NO_BUFFER_AVAILABLE) {

        // shouldn't happen

        ALOGW("fillCodecBuffer_l: frame was not available");
@@ -422,7 +422,7 @@ void GraphicBufferSource::onFrameAvailable() { 
        ALOGW("onFrameAvailable: EOS is set, ignoring frame");



        BufferQueue::BufferItem item;

        status_t err = mBufferQueue->acquireBuffer(&item);

        status_t err = mBufferQueue->acquireBuffer(&item, 0);

        if (err == OK) {

            mBufferQueue->releaseBuffer(item.mBuf, item.mFrameNumber,

                    EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, item.mFence);

services/camera/libcameraservice/camera2/StreamingProcessor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ status_t StreamingProcessor::processRecordingFrame() { 
    if (client == 0) {

        // Discard frames during shutdown

        BufferItemConsumer::BufferItem imgBuffer;

        res = mRecordingConsumer->acquireBuffer(&imgBuffer);

        res = mRecordingConsumer->acquireBuffer(&imgBuffer, 0);

        if (res != OK) {

            if (res != BufferItemConsumer::NO_BUFFER_AVAILABLE) {

                ALOGE("%s: Camera %d: Can't acquire recording buffer: %s (%d)",
@@ -635,7 +635,7 @@ status_t StreamingProcessor::processRecordingFrame() { 
        SharedParameters::Lock l(client->getParameters());

        Mutex::Autolock m(mMutex);

        BufferItemConsumer::BufferItem imgBuffer;

        res = mRecordingConsumer->acquireBuffer(&imgBuffer);

        res = mRecordingConsumer->acquireBuffer(&imgBuffer, 0);

        if (res != OK) {

            if (res != BufferItemConsumer::NO_BUFFER_AVAILABLE) {

                ALOGE("%s: Camera %d: Can't acquire recording buffer: %s (%d)",

services/camera/libcameraservice/camera2/ZslProcessor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ status_t ZslProcessor::processNewZslBuffer() { 
    }

    ALOGVV("Trying to get next buffer");

    BufferItemConsumer::BufferItem item;

    res = zslConsumer->acquireBuffer(&item);

    res = zslConsumer->acquireBuffer(&item, 0);

    if (res != OK) {

        if (res != BufferItemConsumer::NO_BUFFER_AVAILABLE) {

            ALOGE("%s: Camera %d: Error receiving ZSL image buffer: "

services/camera/libcameraservice/gui/RingBufferConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ void RingBufferConsumer::onFrameAvailable() { 
        /**

         * Acquire new frame

         */

        err = acquireBufferLocked(&item);

        err = acquireBufferLocked(&item, 0);

        if (err != OK) {

            if (err != NO_BUFFER_AVAILABLE) {

                BI_LOGE("Error acquiring buffer: %s (%d)", strerror(err), err);