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

Commit 52059779 authored by Dan Stoza's avatar Dan Stoza
Browse files

Remove deprecated BufferQueue constructor 

Bug: 13415624
Change-Id: I1a824d09ce582ee54753683d30cdc23813c13b6b
parent fca092d9

include/media/stagefright/SurfaceMediaSource.h

+5 −4
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public: 
    // pass metadata through the buffers. Currently, it is force set to true

    bool isMetaDataStoredInVideoBuffers() const;



    sp<BufferQueue> getBufferQueue() const { return mBufferQueue; }

    sp<IGraphicBufferProducer> getProducer() const { return mProducer; }



    // To be called before start()

    status_t setMaxAcquiredBufferCount(size_t count);
@@ -146,9 +146,10 @@ protected: 
    static bool isExternalFormat(uint32_t format);



private:

    // mBufferQueue is the exchange point between the producer and

    // this consumer

    sp<BufferQueue> mBufferQueue;

    // A BufferQueue, represented by these interfaces, is the exchange point

    // between the producer and this consumer

    sp<IGraphicBufferProducer> mProducer;

    sp<IGraphicBufferConsumer> mConsumer;



    struct SlotData {

        sp<GraphicBuffer> mGraphicBuffer;

media/libstagefright/SurfaceMediaSource.cpp

+10 −10
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ SurfaceMediaSource::SurfaceMediaSource(uint32_t bufferWidth, uint32_t bufferHeig 
        ALOGE("Invalid dimensions %dx%d", bufferWidth, bufferHeight);

    }



    mBufferQueue = new BufferQueue();

    mBufferQueue->setDefaultBufferSize(bufferWidth, bufferHeight);

    mBufferQueue->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER |

    BufferQueue::createBufferQueue(&mProducer, &mConsumer);

    mConsumer->setDefaultBufferSize(bufferWidth, bufferHeight);

    mConsumer->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER |

            GRALLOC_USAGE_HW_TEXTURE);



    sp<ISurfaceComposer> composer(ComposerService::getComposerService());
@@ -68,7 +68,7 @@ SurfaceMediaSource::SurfaceMediaSource(uint32_t bufferWidth, uint32_t bufferHeig 
    wp<ConsumerListener> listener = static_cast<ConsumerListener*>(this);

    sp<BufferQueue::ProxyConsumerListener> proxy = new BufferQueue::ProxyConsumerListener(listener);



    status_t err = mBufferQueue->consumerConnect(proxy, false);

    status_t err = mConsumer->consumerConnect(proxy, false);

    if (err != NO_ERROR) {

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

                strerror(-err), err);
@@ -108,7 +108,7 @@ void SurfaceMediaSource::dump( 
    Mutex::Autolock lock(mMutex);



    result.append(buffer);

    mBufferQueue->dump(result, "");

    mConsumer->dump(result, "");

}



status_t SurfaceMediaSource::setFrameRate(int32_t fps)
@@ -166,7 +166,7 @@ status_t SurfaceMediaSource::start(MetaData *params) 
    CHECK_GT(mMaxAcquiredBufferCount, 1);



    status_t err =

        mBufferQueue->setMaxAcquiredBufferCount(mMaxAcquiredBufferCount);

        mConsumer->setMaxAcquiredBufferCount(mMaxAcquiredBufferCount);



    if (err != OK) {

        return err;
@@ -223,7 +223,7 @@ status_t SurfaceMediaSource::stop() 


    mMediaBuffersAvailableCondition.signal();



    return mBufferQueue->consumerDisconnect();

    return mConsumer->consumerDisconnect();

}



sp<MetaData> SurfaceMediaSource::getFormat()
@@ -293,7 +293,7 @@ status_t SurfaceMediaSource::read( 
    // wait here till the frames come in from the client side

    while (mStarted) {



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

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

        if (err == BufferQueue::NO_BUFFER_AVAILABLE) {

            // wait for a buffer to be queued

            mFrameAvailableCondition.wait(mMutex);
@@ -316,7 +316,7 @@ status_t SurfaceMediaSource::read( 
                if (mStartTimeNs > 0) {

                    if (item.mTimestamp < mStartTimeNs) {

                        // This frame predates start of record, discard

                        mBufferQueue->releaseBuffer(

                        mConsumer->releaseBuffer(

                                item.mBuf, item.mFrameNumber, EGL_NO_DISPLAY,

                                EGL_NO_SYNC_KHR, Fence::NO_FENCE);

                        continue;
@@ -416,7 +416,7 @@ void SurfaceMediaSource::signalBufferReturned(MediaBuffer *buffer) { 
            ALOGV("Slot %d returned, matches handle = %p", id,

                    mSlots[id].mGraphicBuffer->handle);



            mBufferQueue->releaseBuffer(id, mSlots[id].mFrameNumber,

            mConsumer->releaseBuffer(id, mSlots[id].mFrameNumber,

                                        EGL_NO_DISPLAY, EGL_NO_SYNC_KHR,

                    Fence::NO_FENCE);

media/libstagefright/omx/GraphicBufferSource.cpp

+18 −18
Original line number Diff line number Diff line
@@ -68,13 +68,13 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, 


    String8 name("GraphicBufferSource");



    mBufferQueue = new BufferQueue();

    mBufferQueue->setConsumerName(name);

    mBufferQueue->setDefaultBufferSize(bufferWidth, bufferHeight);

    mBufferQueue->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER |

    BufferQueue::createBufferQueue(&mProducer, &mConsumer);

    mConsumer->setConsumerName(name);

    mConsumer->setDefaultBufferSize(bufferWidth, bufferHeight);

    mConsumer->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER |

            GRALLOC_USAGE_HW_TEXTURE);



    mInitCheck = mBufferQueue->setMaxAcquiredBufferCount(bufferCount);

    mInitCheck = mConsumer->setMaxAcquiredBufferCount(bufferCount);

    if (mInitCheck != NO_ERROR) {

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

                bufferCount, mInitCheck);
@@ -88,7 +88,7 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, 
    wp<BufferQueue::ConsumerListener> listener = static_cast<BufferQueue::ConsumerListener*>(this);

    sp<BufferQueue::ProxyConsumerListener> proxy = new BufferQueue::ProxyConsumerListener(listener);



    mInitCheck = mBufferQueue->consumerConnect(proxy, false);

    mInitCheck = mConsumer->consumerConnect(proxy, false);

    if (mInitCheck != NO_ERROR) {

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

                strerror(-mInitCheck), mInitCheck);
@@ -100,8 +100,8 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, 


GraphicBufferSource::~GraphicBufferSource() {

    ALOGV("~GraphicBufferSource");

    if (mBufferQueue != NULL) {

        status_t err = mBufferQueue->consumerDisconnect();

    if (mConsumer != NULL) {

        status_t err = mConsumer->consumerDisconnect();

        if (err != NO_ERROR) {

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

        }
@@ -273,7 +273,7 @@ void GraphicBufferSource::codecBufferEmptied(OMX_BUFFERHEADERTYPE* header) { 
        if (id == mLatestSubmittedBufferId) {

            CHECK_GT(mLatestSubmittedBufferUseCount--, 0);

        } else {

            mBufferQueue->releaseBuffer(id, codecBuffer.mFrameNumber,

            mConsumer->releaseBuffer(id, codecBuffer.mFrameNumber,

                    EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, Fence::NO_FENCE);

        }

    } else {
@@ -342,7 +342,7 @@ void GraphicBufferSource::suspend(bool suspend) { 


        while (mNumFramesAvailable > 0) {

            BufferQueue::BufferItem item;

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

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



            if (err == BufferQueue::NO_BUFFER_AVAILABLE) {

                // shouldn't happen.
@@ -355,7 +355,7 @@ void GraphicBufferSource::suspend(bool suspend) { 


            --mNumFramesAvailable;



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

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

                    EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, item.mFence);

        }

        return;
@@ -392,7 +392,7 @@ bool GraphicBufferSource::fillCodecBuffer_l() { 
    ALOGV("fillCodecBuffer_l: acquiring buffer, avail=%d",

            mNumFramesAvailable);

    BufferQueue::BufferItem item;

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

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

    if (err == BufferQueue::NO_BUFFER_AVAILABLE) {

        // shouldn't happen

        ALOGW("fillCodecBuffer_l: frame was not available");
@@ -433,7 +433,7 @@ bool GraphicBufferSource::fillCodecBuffer_l() { 


    if (err != OK) {

        ALOGV("submitBuffer_l failed, releasing bq buf %d", item.mBuf);

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

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

                EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, Fence::NO_FENCE);

    } else {

        ALOGV("buffer submitted (bq %d, cbi %d)", item.mBuf, cbi);
@@ -456,7 +456,7 @@ bool GraphicBufferSource::repeatLatestSubmittedBuffer_l() { 
        //

        // To be on the safe side we try to release the buffer.

        ALOGD("repeatLatestSubmittedBuffer_l: slot was NULL");

        mBufferQueue->releaseBuffer(

        mConsumer->releaseBuffer(

                mLatestSubmittedBufferId,

                mLatestSubmittedBufferFrameNum,

                EGL_NO_DISPLAY,
@@ -510,7 +510,7 @@ void GraphicBufferSource::setLatestSubmittedBuffer_l( 


    if (mLatestSubmittedBufferId >= 0) {

        if (mLatestSubmittedBufferUseCount == 0) {

            mBufferQueue->releaseBuffer(

            mConsumer->releaseBuffer(

                    mLatestSubmittedBufferId,

                    mLatestSubmittedBufferFrameNum,

                    EGL_NO_DISPLAY,
@@ -733,7 +733,7 @@ void GraphicBufferSource::onFrameAvailable() { 
        }



        BufferQueue::BufferItem item;

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

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

        if (err == OK) {

            // If this is the first time we're seeing this buffer, add it to our

            // slot table.
@@ -741,7 +741,7 @@ void GraphicBufferSource::onFrameAvailable() { 
                ALOGV("onFrameAvailable: setting mBufferSlot %d", item.mBuf);

                mBufferSlot[item.mBuf] = item.mGraphicBuffer;

            }

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

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

                    EGL_NO_DISPLAY, EGL_NO_SYNC_KHR, item.mFence);

        }

        return;
@@ -762,7 +762,7 @@ void GraphicBufferSource::onBuffersReleased() { 
    Mutex::Autolock lock(mMutex);



    uint32_t slotMask;

    if (mBufferQueue->getReleasedBuffers(&slotMask) != NO_ERROR) {

    if (mConsumer->getReleasedBuffers(&slotMask) != NO_ERROR) {

        ALOGW("onBuffersReleased: unable to get released buffer set");

        slotMask = 0xffffffff;

    }

media/libstagefright/omx/GraphicBufferSource.h

+6 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public: 
    // Returns the handle to the producer side of the BufferQueue.  Buffers

    // queued on this will be received by GraphicBufferSource.

    sp<IGraphicBufferProducer> getIGraphicBufferProducer() const {

        return mBufferQueue;

        return mProducer;

    }



    // This is called when OMX transitions to OMX_StateExecuting, which means
@@ -210,8 +210,11 @@ private: 


    bool mSuspended;



    // We consume graphic buffers from this.

    sp<BufferQueue> mBufferQueue;

    // Our BufferQueue interfaces. mProducer is passed to the producer through

    // getIGraphicBufferProducer, and mConsumer is used internally to retrieve

    // the buffers queued by the producer.

    sp<IGraphicBufferProducer> mProducer;

    sp<IGraphicBufferConsumer> mConsumer;



    // Number of frames pending in BufferQueue that haven't yet been

    // forwarded to the codec.

media/libstagefright/tests/SurfaceMediaSource_test.cpp

+4 −6
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ protected: 
        } else {

            ALOGV("No actual display. Choosing EGLSurface based on SurfaceMediaSource");

            sp<IGraphicBufferProducer> sms = (new SurfaceMediaSource(

                    getSurfaceWidth(), getSurfaceHeight()))->getBufferQueue();

                    getSurfaceWidth(), getSurfaceHeight()))->getProducer();

            sp<Surface> stc = new Surface(sms);

            sp<ANativeWindow> window = stc;
@@ -360,9 +360,7 @@ protected: 
    virtual void SetUp() {

        android::ProcessState::self()->startThreadPool();

        mSMS = new SurfaceMediaSource(mYuvTexWidth, mYuvTexHeight);



        // Manual cast is required to avoid constructor ambiguity

        mSTC = new Surface(static_cast<sp<IGraphicBufferProducer> >( mSMS->getBufferQueue()));

        mSTC = new Surface(mSMS->getProducer());

        mANW = mSTC;

    }
@@ -397,7 +395,7 @@ protected: 
        ALOGV("SMS-GLTest::SetUp()");

        android::ProcessState::self()->startThreadPool();

        mSMS = new SurfaceMediaSource(mYuvTexWidth, mYuvTexHeight);

        mSTC = new Surface(static_cast<sp<IGraphicBufferProducer> >( mSMS->getBufferQueue()));

        mSTC = new Surface(mSMS->getProducer());

        mANW = mSTC;



        // Doing the setup related to the GL Side
@@ -782,7 +780,7 @@ TEST_F(SurfaceMediaSourceGLTest, ChooseAndroidRecordableEGLConfigDummyWriter) { 
    ALOGV("Verify creating a surface w/ right config + dummy writer*********");



    mSMS = new SurfaceMediaSource(mYuvTexWidth, mYuvTexHeight);

    mSTC = new Surface(static_cast<sp<IGraphicBufferProducer> >( mSMS->getBufferQueue()));

    mSTC = new Surface(mSMS->getProducer());

    mANW = mSTC;



    DummyRecorder writer(mSMS);