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

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

Merge "fix fallout from binderizing BufferQueues consumer side"

parents f36dbfe3 910813bd

media/libstagefright/SurfaceMediaSource.cpp

+2 −4
Original line number Diff line number Diff line
@@ -65,10 +65,8 @@ SurfaceMediaSource::SurfaceMediaSource(uint32_t bufferWidth, uint32_t bufferHeig 
    // 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<...>

    // that's what we create.

    wp<BufferQueue::ConsumerListener> listener;

    sp<BufferQueue::ConsumerListener> proxy;

    listener = static_cast<BufferQueue::ConsumerListener*>(this);

    proxy = new BufferQueue::ProxyConsumerListener(listener);

    wp<BufferQueue::ConsumerListener> listener = static_cast<BufferQueue::ConsumerListener*>(this);

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



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

    if (err != NO_ERROR) {

media/libstagefright/omx/GraphicBufferSource.cpp

+2 −5
Original line number Diff line number Diff line
@@ -69,11 +69,8 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, 
    // 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<...>

    // that's what we create.

    wp<BufferQueue::ConsumerListener> listener;

    listener = static_cast<BufferQueue::ConsumerListener*>(this);



    sp<BufferQueue::ConsumerListener> proxy;

    proxy = new BufferQueue::ProxyConsumerListener(listener);

    wp<BufferQueue::ConsumerListener> listener = static_cast<BufferQueue::ConsumerListener*>(this);

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



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

    if (mInitCheck != NO_ERROR) {