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

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

Merge "always pass the BufferQueue explicitely to consumers"

parents 099b457f 8d764bfc

camera/ProCamera.cpp

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ status_t ProCamera::createStreamCpu(int width, int height, int format, 
    sp <IProCameraUser> c = mCamera;

    if (c == 0) return NO_INIT;



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

    sp<BufferQueue> bq = new BufferQueue();

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

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



    sp<Surface> stc = new Surface(

cmds/stagefright/stagefright.cpp

+2 −1
Original line number Diff line number Diff line
@@ -937,7 +937,8 @@ int main(int argc, char **argv) { 
        } else {

            CHECK(useSurfaceTexAlloc);



            sp<GLConsumer> texture = new GLConsumer(0 /* tex */);

            sp<BufferQueue> bq = new BufferQueue();

            sp<GLConsumer> texture = new GLConsumer(bq, 0 /* tex */);

            gSurface = new Surface(texture->getBufferQueue());

        }

libvideoeditor/lvpp/NativeWindowRenderer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -568,7 +568,8 @@ void NativeWindowRenderer::destroyRenderInput(RenderInput* input) { 
RenderInput::RenderInput(NativeWindowRenderer* renderer, GLuint textureId)

    : mRenderer(renderer)

    , mTextureId(textureId) {

    mST = new GLConsumer(mTextureId);

    sp<BufferQueue> bq = new BufferQueue();

    mST = new GLConsumer(bq, mTextureId);

    mSTC = new Surface(mST->getBufferQueue());

    native_window_connect(mSTC.get(), NATIVE_WINDOW_API_MEDIA);

}

services/camera/libcameraservice/camera2/CallbackProcessor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ status_t CallbackProcessor::updateStream(const Parameters &params) { 
    if (!mCallbackToApp && mCallbackConsumer == 0) {

        // Create CPU buffer queue endpoint, since app hasn't given us one

        // Make it async to avoid disconnect deadlocks

        mCallbackConsumer = new CpuConsumer(kCallbackHeapCount,

        sp<BufferQueue> bq = new BufferQueue();

        mCallbackConsumer = new CpuConsumer(bq, kCallbackHeapCount,

                /*synchronized*/ false);

        mCallbackConsumer->setFrameAvailableListener(this);

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

services/camera/libcameraservice/camera2/JpegProcessor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ status_t JpegProcessor::updateStream(const Parameters &params) { 


    if (mCaptureConsumer == 0) {

        // Create CPU buffer queue endpoint

        mCaptureConsumer = new CpuConsumer(1);

        sp<BufferQueue> bq = new BufferQueue();

        mCaptureConsumer = new CpuConsumer(bq, 1);

        mCaptureConsumer->setFrameAvailableListener(this);

        mCaptureConsumer->setName(String8("Camera2Client::CaptureConsumer"));

        mCaptureWindow = new Surface(