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

Commit 99f5cb42 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: use streamIdx as SurfaceMap index"

parents 1fc768da 0b287578

services/camera/libcameraservice/device3/Camera3Device.cpp

+2 −3
Original line number Diff line number Diff line
@@ -2318,7 +2318,7 @@ sp<Camera3Device::CaptureRequest> Camera3Device::createCaptureRequest( 
                    return NULL;

                }

            }

            newRequest->mOutputSurfaces[i] = surfaces;

            newRequest->mOutputSurfaces[streams.data.i32[i]] = surfaces;

        }



        // Lazy completion of stream configuration (allocation/registration)
@@ -4930,14 +4930,13 @@ status_t Camera3Device::RequestThread::prepareHalRequests() { 


            res = outputStream->getBuffer(&outputBuffers->editItemAt(j),

                    waitDuration,

                    captureRequest->mOutputSurfaces[j]);

                    captureRequest->mOutputSurfaces[outputStream->getId()]);

            if (res != OK) {

                // Can't get output buffer from gralloc queue - this could be due to

                // abandoned queue or other consumer misbehavior, so not a fatal

                // error

                ALOGE("RequestThread: Can't get output buffer, skipping request:"

                        " %s (%d)", strerror(-res), res);



                return TIMED_OUT;

            }