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

Commit 5e1f08b3 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

update to new Consumer APIs 

Change-Id: I3c5d4be2a2e8783fbf98b3e268fd02658f71dc7d
parent 5478f3c4

camera/ProCamera.cpp

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ status_t ProCamera::createStreamCpu(int width, int height, int format, 
    if (c == 0) return NO_INIT;



    sp<BufferQueue> bq = new BufferQueue();

    sp<CpuConsumer> cc = new CpuConsumer(bq, heapCount, synchronousMode);

    sp<CpuConsumer> cc = new CpuConsumer(bq, heapCount/*, synchronousMode*/);

    cc->setName(String8("ProCamera::mCpuConsumer"));



    sp<Surface> stc = new Surface(

media/libstagefright/SurfaceMediaSource.cpp

+3 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MetaData.h>

#include <OMX_IVCommon.h>

#include <MetadataBufferType.h>

#include <media/hardware/MetadataBufferType.h>



#include <ui/GraphicBuffer.h>

#include <gui/ISurfaceComposer.h>
@@ -54,9 +54,8 @@ SurfaceMediaSource::SurfaceMediaSource(uint32_t bufferWidth, uint32_t bufferHeig 
        ALOGE("Invalid dimensions %dx%d", bufferWidth, bufferHeight);

    }



    mBufferQueue = new BufferQueue(true);

    mBufferQueue = new BufferQueue();

    mBufferQueue->setDefaultBufferSize(bufferWidth, bufferHeight);

    mBufferQueue->setSynchronousMode(true);

    mBufferQueue->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER |

            GRALLOC_USAGE_HW_TEXTURE);
@@ -71,7 +70,7 @@ SurfaceMediaSource::SurfaceMediaSource(uint32_t bufferWidth, uint32_t bufferHeig 
    listener = static_cast<BufferQueue::ConsumerListener*>(this);

    proxy = new BufferQueue::ProxyConsumerListener(listener);



    status_t err = mBufferQueue->consumerConnect(proxy);

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

    if (err != NO_ERROR) {

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

                strerror(-err), err);

media/libstagefright/omx/GraphicBufferSource.cpp

+4 −5
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 
//#define LOG_NDEBUG 0

#include <utils/Log.h>



#include <GraphicBufferSource.h>

#include "GraphicBufferSource.h"



#include <OMX_Core.h>

#include <media/stagefright/foundation/ADebug.h>



#include <MetadataBufferType.h>

#include <media/hardware/MetadataBufferType.h>

#include <ui/GraphicBuffer.h>



namespace android {
@@ -51,10 +51,9 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, 


    String8 name("GraphicBufferSource");



    mBufferQueue = new BufferQueue(true);

    mBufferQueue = new BufferQueue();

    mBufferQueue->setConsumerName(name);

    mBufferQueue->setDefaultBufferSize(bufferWidth, bufferHeight);

    mBufferQueue->setSynchronousMode(true);

    mBufferQueue->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER |

            GRALLOC_USAGE_HW_TEXTURE);
@@ -75,7 +74,7 @@ GraphicBufferSource::GraphicBufferSource(OMXNodeInstance* nodeInstance, 
    sp<BufferQueue::ConsumerListener> proxy;

    proxy = new BufferQueue::ProxyConsumerListener(listener);



    mInitCheck = mBufferQueue->consumerConnect(proxy);

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

    if (mInitCheck != NO_ERROR) {

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

                strerror(-mInitCheck), mInitCheck);

services/camera/libcameraservice/camera2/CallbackProcessor.cpp

+1 −2
Original line number Diff line number Diff line
@@ -111,8 +111,7 @@ status_t CallbackProcessor::updateStream(const Parameters &params) { 
        // Create CPU buffer queue endpoint, since app hasn't given us one

        // Make it async to avoid disconnect deadlocks

        sp<BufferQueue> bq = new BufferQueue();

        mCallbackConsumer = new CpuConsumer(bq, kCallbackHeapCount,

                /*synchronized*/ false);

        mCallbackConsumer = new CpuConsumer(bq, kCallbackHeapCount);

        mCallbackConsumer->setFrameAvailableListener(this);

        mCallbackConsumer->setName(String8("Camera2Client::CallbackConsumer"));

        mCallbackWindow = new Surface(

services/camera/libcameraservice/camera2/StreamingProcessor.cpp

+1 −2
Original line number Diff line number Diff line
@@ -322,8 +322,7 @@ status_t StreamingProcessor::updateRecordingStream(const Parameters &params) { 
        sp<BufferQueue> bq = new BufferQueue();

        mRecordingConsumer = new BufferItemConsumer(bq,

                GRALLOC_USAGE_HW_VIDEO_ENCODER,

                mRecordingHeapCount + 1,

                true);

                mRecordingHeapCount + 1);

        mRecordingConsumer->setFrameAvailableListener(this);

        mRecordingConsumer->setName(String8("Camera2-RecordingConsumer"));

        mRecordingWindow = new Surface(