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

Commit e2dfa5a4 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "update to Fence::waitForever() API change" into jb-mr2-dev

parents 4224dedf d7644242

media/libstagefright/SurfaceMediaSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ status_t SurfaceMediaSource::read( MediaBuffer **buffer, 
            // wait for a buffer to be queued

            mFrameAvailableCondition.wait(mMutex);

        } else if (err == OK) {

            err = item.mFence->waitForever(1000, "SurfaceMediaSource::read");

            err = item.mFence->waitForever("SurfaceMediaSource::read");

            if (err) {

                ALOGW("read: failed to wait for buffer fence: %d", err);

            }

media/libstagefright/omx/GraphicBufferSource.cpp

+1 −2
Original line number Diff line number Diff line
@@ -274,8 +274,7 @@ bool GraphicBufferSource::fillCodecBuffer_l() { 
    mNumFramesAvailable--;



    // Wait for it to become available.

    err = item.mFence->waitForever(1000,

            "GraphicBufferSource::fillCodecBuffer_l");

    err = item.mFence->waitForever("GraphicBufferSource::fillCodecBuffer_l");

    if (err != OK) {

        ALOGW("failed to wait for buffer fence: %d", err);

        // keep going

services/camera/libcameraservice/camera3/Camera3Stream.cpp

+1 −2
Original line number Diff line number Diff line
@@ -296,8 +296,7 @@ status_t Camera3Stream::registerBuffersLocked(camera3_device *hal3Device) { 
        }



        sp<Fence> fence = new Fence(streamBuffers[bufferIdx].acquire_fence);

        fence->waitForever(kRegisterFenceTimeoutMs,

                "Camera3Stream::registerBuffers");

        fence->waitForever("Camera3Stream::registerBuffers");



        buffers.editItemAt(bufferIdx) = streamBuffers[bufferIdx].buffer;

    }

services/camera/libcameraservice/camera3/Camera3Stream.h

+0 −2
Original line number Diff line number Diff line
@@ -263,8 +263,6 @@ class Camera3Stream : 
    virtual size_t   getBufferCountLocked() = 0;



  private:

    static const unsigned int kRegisterFenceTimeoutMs = 5000;



    uint32_t oldUsage;

    uint32_t oldMaxBuffers;

services/camera/libcameraservice/gui/RingBufferConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ sp<PinnedBufferItem> RingBufferConsumer::pinSelectedBuffer( 
    }



    if (waitForFence) {

        status_t err = pinnedBuffer->getBufferItem().mFence->waitForever(1000,

        status_t err = pinnedBuffer->getBufferItem().mFence->waitForever(

                "RingBufferConsumer::pinSelectedBuffer");

        if (err != OK) {

            BI_LOGE("Failed to wait for fence of acquired buffer: %s (%d)",