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

Commit 68a91b9d authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera: Update dataspace to new spec, convert for older HALs" into nyc-dev

parents 53ce1e03 2cbf6cea

media/libstagefright/CameraSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ status_t CameraSource::start(MetaData *meta) { 
    mStartTimeUs = 0;

    mNumInputBuffers = 0;

    mEncoderFormat = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;

    mEncoderDataSpace = HAL_DATASPACE_BT709;

    mEncoderDataSpace = HAL_DATASPACE_V0_BT709;



    if (meta) {

        int64_t startTimeUs;

media/libstagefright/MediaCodecSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ namespace android { 


const int32_t kDefaultSwVideoEncoderFormat = HAL_PIXEL_FORMAT_YCbCr_420_888;

const int32_t kDefaultHwVideoEncoderFormat = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;

const int32_t kDefaultVideoEncoderDataSpace = HAL_DATASPACE_BT709;

const int32_t kDefaultVideoEncoderDataSpace = HAL_DATASPACE_V0_BT709;



const int kStopTimeoutUs = 300000; // allow 1 sec for shutting down encoder

services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ status_t CallbackProcessor::updateStream(const Parameters &params) { 
                callbackFormat, params.previewFormat);

        res = device->createStream(mCallbackWindow,

                params.previewWidth, params.previewHeight, callbackFormat,

                HAL_DATASPACE_JFIF, CAMERA3_STREAM_ROTATION_0, &mCallbackStreamId);

                HAL_DATASPACE_V0_JFIF, CAMERA3_STREAM_ROTATION_0, &mCallbackStreamId);

        if (res != OK) {

            ALOGE("%s: Camera %d: Can't create output stream for callbacks: "

                    "%s (%d)", __FUNCTION__, mId,

services/camera/libcameraservice/api1/client2/JpegProcessor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ status_t JpegProcessor::updateStream(const Parameters &params) { 
        // Create stream for HAL production

        res = device->createStream(mCaptureWindow,

                params.pictureWidth, params.pictureHeight,

                HAL_PIXEL_FORMAT_BLOB, HAL_DATASPACE_JFIF,

                HAL_PIXEL_FORMAT_BLOB, HAL_DATASPACE_V0_JFIF,

                CAMERA3_STREAM_ROTATION_0, &mCaptureStreamId);

        if (res != OK) {

            ALOGE("%s: Camera %d: Can't create output stream for capture: "

services/camera/libcameraservice/api1/client2/Parameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { 


    // Set up initial state for non-Camera.Parameters state variables

    videoFormat = HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED;

    videoDataSpace = HAL_DATASPACE_BT709;

    videoDataSpace = HAL_DATASPACE_V0_BT709;

    videoBufferMode = hardware::ICamera::VIDEO_BUFFER_MODE_DATA_CALLBACK_YUV;

    playShutterSound = true;

    enableFaceDetect = false;