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

Commit f5143e45 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Propagate colorspace to heic composite stream" into udc-dev am:... 

Merge "Camera: Propagate colorspace to heic composite stream" into udc-dev am: ef881646 am: 094416c7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23335499



Change-Id: I6c8f2c501b55f0bb9b9b9b607b3b61f26b571d25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7c0f7f3 094416c7

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ status_t HeicCompositeStream::createInternalStreams(const std::vector<sp<Surface 
        camera_stream_rotation_t rotation, int *id, const String8& physicalCameraId,

        const std::unordered_set<int32_t> &sensorPixelModesUsed,

        std::vector<int> *surfaceIds,

        int /*streamSetId*/, bool /*isShared*/, int32_t /*colorSpace*/,

        int /*streamSetId*/, bool /*isShared*/, int32_t colorSpace,

        int64_t /*dynamicProfile*/, int64_t /*streamUseCase*/, bool useReadoutTimestamp) {

    sp<CameraDeviceBase> device = mDevice.promote();

    if (!device.get()) {
@@ -153,7 +153,7 @@ status_t HeicCompositeStream::createInternalStreams(const std::vector<sp<Surface 
            ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT,

            OutputConfiguration::TIMESTAMP_BASE_DEFAULT,

            OutputConfiguration::MIRROR_MODE_AUTO,

            ANDROID_REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_UNSPECIFIED,

            colorSpace,

            useReadoutTimestamp);

    if (res == OK) {

        mAppSegmentSurfaceId = (*surfaceIds)[0];
@@ -196,7 +196,7 @@ status_t HeicCompositeStream::createInternalStreams(const std::vector<sp<Surface 
            ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT,

            OutputConfiguration::TIMESTAMP_BASE_DEFAULT,

            OutputConfiguration::MIRROR_MODE_AUTO,

            ANDROID_REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_UNSPECIFIED,

            colorSpace,

            useReadoutTimestamp);

    if (res == OK) {

        mMainImageSurfaceId = sourceSurfaceId[0];