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

Commit 75655bf2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Make originalDataSpace be const upon stream creation" am: 23d97888 

Change-Id: I5f522733603779431bc80f220ef4a0d6236896cd
parents f6f6dccb 23d97888

services/camera/libcameraservice/device3/Camera3Stream.cpp

+1 −4
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ Camera3Stream::Camera3Stream(int id, 
    mFormatOverridden(false),

    mOriginalFormat(format),

    mDataSpaceOverridden(false),

    mOriginalDataSpace(HAL_DATASPACE_UNKNOWN),

    mOriginalDataSpace(dataSpace),

    mPhysicalCameraId(physicalCameraId),

    mLastTimestamp(0) {
@@ -137,9 +137,6 @@ int Camera3Stream::getOriginalFormat() const { 


void Camera3Stream::setDataSpaceOverride(bool dataSpaceOverridden) {

    mDataSpaceOverridden = dataSpaceOverridden;

    if (dataSpaceOverridden && mOriginalDataSpace == HAL_DATASPACE_UNKNOWN) {

        mOriginalDataSpace = camera3_stream::data_space;

    }

}



bool Camera3Stream::isDataSpaceOverridden() const {

services/camera/libcameraservice/device3/Camera3Stream.h

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ class Camera3Stream : 


    //Keep track of original dataSpace in case it gets overridden

    bool mDataSpaceOverridden;

    android_dataspace mOriginalDataSpace;

    const android_dataspace mOriginalDataSpace;



    String8 mPhysicalCameraId;

    nsecs_t mLastTimestamp;