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

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

Merge "GraphicBufferSource fixes" into jb-mr2-dev

parents e6800cea b9f4140b

media/libstagefright/omx/GraphicBufferSource.cpp

+75 −53
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static const bool EXTRA_CHECK = true; 




GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance,

        uint32_t bufferWidth, uint32_t bufferHeight) :

        uint32_t bufferWidth, uint32_t bufferHeight, uint32_t bufferCount) :

    mInitCheck(UNKNOWN_ERROR),

    mNodeInstance(nodeInstance),

    mExecuting(false),
@@ -40,20 +40,31 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, 
    mEndOfStream(false),

    mEndOfStreamSent(false) {



    ALOGV("GraphicBufferSource w=%u h=%u", bufferWidth, bufferHeight);

    ALOGV("GraphicBufferSource w=%u h=%u c=%u",

            bufferWidth, bufferHeight, bufferCount);



    if (bufferWidth == 0 || bufferHeight == 0) {

        ALOGE("Invalid dimensions %dx%d", bufferWidth, bufferHeight);

        ALOGE("Invalid dimensions %ux%u", bufferWidth, bufferHeight);

        mInitCheck = BAD_VALUE;

        return;

    }



    String8 name("GraphicBufferSource");



    mBufferQueue = new BufferQueue(true);

    mBufferQueue->setConsumerName(name);

    mBufferQueue->setDefaultBufferSize(bufferWidth, bufferHeight);

    mBufferQueue->setSynchronousMode(true);

    mBufferQueue->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER |

            GRALLOC_USAGE_HW_TEXTURE);



    mInitCheck = mBufferQueue->setMaxAcquiredBufferCount(bufferCount);

    if (mInitCheck != NO_ERROR) {

        ALOGE("Unable to set BQ max acquired buffer count to %u: %d",

                bufferCount, mInitCheck);

        return;

    }



    // Note that we can't create an sp<...>(this) in a ctor that will not keep a

    // reference once the ctor ends, as that would cause the refcount of 'this'

    // dropping to 0 at the end of the ctor.  Since all we need is a wp<...>
@@ -64,23 +75,25 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, 
    sp<BufferQueue::ConsumerListener> proxy;

    proxy = new BufferQueue::ProxyConsumerListener(listener);



    status_t err = mBufferQueue->consumerConnect(proxy);

    if (err != NO_ERROR) {

    mInitCheck = mBufferQueue->consumerConnect(proxy);

    if (mInitCheck != NO_ERROR) {

        ALOGE("Error connecting to BufferQueue: %s (%d)",

                strerror(-err), err);

                strerror(-mInitCheck), mInitCheck);

        return;

    }



    mInitCheck = OK;

    CHECK(mInitCheck == NO_ERROR);

}



GraphicBufferSource::~GraphicBufferSource() {

    ALOGV("~GraphicBufferSource");

    if (mBufferQueue != NULL) {

        status_t err = mBufferQueue->consumerDisconnect();

        if (err != NO_ERROR) {

            ALOGW("consumerDisconnect failed: %d", err);

        }

    }

}



void GraphicBufferSource::omxExecuting() {

    Mutex::Autolock autoLock(mMutex);
@@ -98,8 +111,12 @@ void GraphicBufferSource::omxExecuting() { 
    // one codec buffer simultaneously.  (We could instead try to submit

    // all BQ buffers whenever any codec buffer is freed, but if we get the

    // initial conditions right that will never be useful.)

    while (mNumFramesAvailable && isCodecBufferAvailable_l()) {

        fillCodecBuffer_l();

    while (mNumFramesAvailable) {

        if (!fillCodecBuffer_l()) {

            ALOGV("stop load with frames available (codecAvail=%d)",

                    isCodecBufferAvailable_l());

            break;

        }

    }



    ALOGV("done loading initial frames, avail=%d", mNumFramesAvailable);
@@ -166,7 +183,7 @@ void GraphicBufferSource::codecBufferEmptied(OMX_BUFFERHEADERTYPE* header) { 
    // see if the GraphicBuffer reference was null, which should only ever

    // happen for EOS.

    if (codecBuffer.mGraphicBuffer == NULL) {

        CHECK(mEndOfStream);

        CHECK(mEndOfStream && mEndOfStreamSent);

        // No GraphicBuffer to deal with, no additional input or output is

        // expected, so just return.

        return;
@@ -216,8 +233,9 @@ void GraphicBufferSource::codecBufferEmptied(OMX_BUFFERHEADERTYPE* header) { 


    if (mNumFramesAvailable) {

        // Fill this codec buffer.

        CHECK(!mEndOfStream);

        ALOGV("buffer freed, %d frames avail", mNumFramesAvailable);

        CHECK(!mEndOfStreamSent);

        ALOGV("buffer freed, %d frames avail (eos=%d)",

                mNumFramesAvailable, mEndOfStream);

        fillCodecBuffer_l();

    } else if (mEndOfStream) {

        // No frames available, but EOS is pending, so use this buffer to
@@ -228,14 +246,17 @@ void GraphicBufferSource::codecBufferEmptied(OMX_BUFFERHEADERTYPE* header) { 
    return;

}



status_t GraphicBufferSource::fillCodecBuffer_l() {

bool GraphicBufferSource::fillCodecBuffer_l() {

    CHECK(mExecuting && mNumFramesAvailable > 0);



    int cbi = findAvailableCodecBuffer_l();

    if (cbi < 0) {

        // No buffers available, bail.

        ALOGV("fillCodecBuffer_l: no codec buffers, avail now %d",

                mNumFramesAvailable);

    } else {

        return false;

    }



    ALOGV("fillCodecBuffer_l: acquiring buffer, avail=%d",

            mNumFramesAvailable);

    BufferQueue::BufferItem item;
@@ -243,11 +264,11 @@ status_t GraphicBufferSource::fillCodecBuffer_l() { 
    if (err == BufferQueue::NO_BUFFER_AVAILABLE) {

        // shouldn't happen

        ALOGW("fillCodecBuffer_l: frame was not available");

            return err;

        return false;

    } else if (err != OK) {

        // now what? fake end-of-stream?

        ALOGW("fillCodecBuffer_l: acquireBuffer returned err=%d", err);

            return err;

        return false;

    }



    mNumFramesAvailable--;
@@ -275,9 +296,8 @@ status_t GraphicBufferSource::fillCodecBuffer_l() { 
    } else {

        ALOGV("buffer submitted (bq %d, cbi %d)", item.mBuf, cbi);

    }

    }



    return OK;

    return true;

}



status_t GraphicBufferSource::signalEndOfInputStream() {
@@ -372,6 +392,7 @@ void GraphicBufferSource::submitEndOfInputStream_l() { 
    } else {

        ALOGV("submitEndOfInputStream_l: buffer submitted, header=%p cbi=%d",

                header, cbi);

        mEndOfStreamSent = true;

    }

}
@@ -400,7 +421,8 @@ int GraphicBufferSource::findMatchingCodecBuffer_l( 
void GraphicBufferSource::onFrameAvailable() {

    Mutex::Autolock autoLock(mMutex);



    ALOGV("onFrameAvailable exec=%d avail=%d", mExecuting, mNumFramesAvailable);

    ALOGV("onFrameAvailable exec=%d avail=%d",

            mExecuting, mNumFramesAvailable);



    if (mEndOfStream) {

        // This should only be possible if a new buffer was queued after

media/libstagefright/omx/GraphicBufferSource.h

+4 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ namespace android { 
class GraphicBufferSource : public BufferQueue::ConsumerListener {

public:

    GraphicBufferSource(OMXNodeInstance* nodeInstance,

            uint32_t bufferWidth, uint32_t bufferHeight);

            uint32_t bufferWidth, uint32_t bufferHeight, uint32_t bufferCount);

    virtual ~GraphicBufferSource();



    // We can't throw an exception if the constructor fails, so we just set
@@ -124,7 +124,9 @@ private: 
    // in the onFrameAvailable callback, or if we're in codecBufferEmptied

    // and mNumFramesAvailable is nonzero).  Returns without doing anything if

    // we don't have a codec buffer available.

    status_t fillCodecBuffer_l();

    //

    // Returns true if we successfully filled a codec buffer with a BQ buffer.

    bool fillCodecBuffer_l();



    // Marks the mCodecBuffers entry as in-use, copies the GraphicBuffer

    // reference into the codec buffer, and submits the data to the codec.

media/libstagefright/omx/OMXNodeInstance.cpp

+2 −1
Original line number Diff line number Diff line
@@ -590,7 +590,8 @@ status_t OMXNodeInstance::createInputSurface( 
    }



    GraphicBufferSource* bufferSource = new GraphicBufferSource(

            this, def.format.video.nFrameWidth, def.format.video.nFrameHeight);

            this, def.format.video.nFrameWidth, def.format.video.nFrameHeight,

            def.nBufferCountActual);

    if ((err = bufferSource->initCheck()) != OK) {

        delete bufferSource;

        return err;