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

Commit c7ba4a5c authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Camera2Api: Creating a JPEG stream needs to use the right size 

JPEG streams have variable size, so use the HAL-provided max size
to size the stream buffers.

Change-Id: Ie6900bc9ece6e972eae93fca6aca779224c9bfc6
parent 7919fa2c

services/camera/libcameraservice/photography/CameraDeviceClient.cpp

+17 −2
Original line number Diff line number Diff line
@@ -337,8 +337,23 @@ status_t CameraDeviceClient::createStream(int width, int height, int format, 
    // after each call, but only once we are done with all.



    int streamId = -1;

    res = mDevice->createStream(anw, width, height, format, /*size*/1,

    if (format == HAL_PIXEL_FORMAT_BLOB) {

        // JPEG buffers need to be sized for maximum possible compressed size

        CameraMetadata staticInfo = mDevice->info();

        camera_metadata_entry_t entry = staticInfo.find(ANDROID_JPEG_MAX_SIZE);

        if (entry.count == 0) {

            ALOGE("%s: Camera %d: Can't find maximum JPEG size in "

                    "static metadata!", __FUNCTION__, mCameraId);

            return INVALID_OPERATION;

        }

        int32_t maxJpegSize = entry.data.i32[0];

        res = mDevice->createStream(anw, width, height, format, maxJpegSize,

                &streamId);

    } else {

        // All other streams are a known size

        res = mDevice->createStream(anw, width, height, format, /*size*/0,

                &streamId);

    }



    if (res == OK) {

        mStreamMap.add(bufferProducer->asBinder(), streamId);