Merge "Camera: Use 64 bit for stream use case" into tm-dev (fda15906) · Commits · e / os / android_frameworks_av

camera/CameraSessionStats.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -118,14 +118,14 @@ status_t CameraStreamStats::readFromParcel(const android::Parcel* parcel) {
		return err;
		}

		int dynamicRangeProfile = ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_STANDARD;
		if ((err = parcel->readInt32(&dynamicRangeProfile)) != OK) {
		int64_t dynamicRangeProfile = ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_STANDARD;
		if ((err = parcel->readInt64(&dynamicRangeProfile)) != OK) {
		ALOGE("%s: Failed to read dynamic range profile type from parcel", __FUNCTION__);
		return err;
		}

		int streamUseCase = ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT;
		if ((err = parcel->readInt32(&streamUseCase)) != OK) {
		int64_t streamUseCase = ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT;
		if ((err = parcel->readInt64(&streamUseCase)) != OK) {
		ALOGE("%s: Failed to read stream use case from parcel", __FUNCTION__);
		return err;
		}
		@@ -228,12 +228,12 @@ status_t CameraStreamStats::writeToParcel(android::Parcel* parcel) const {
		return err;
		}

		if ((err = parcel->writeInt32(mDynamicRangeProfile)) != OK) {
		if ((err = parcel->writeInt64(mDynamicRangeProfile)) != OK) {
		ALOGE("%s: Failed to write dynamic range profile type", __FUNCTION__);
		return err;
		}

		if ((err = parcel->writeInt32(mStreamUseCase)) != OK) {
		if ((err = parcel->writeInt64(mStreamUseCase)) != OK) {
		ALOGE("%s: Failed to write stream use case!", __FUNCTION__);
		return err;
		}

camera/camera2/OutputConfiguration.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ int64_t OutputConfiguration::getDynamicRangeProfile() const {
		return mDynamicRangeProfile;
		}

		int OutputConfiguration::getStreamUseCase() const {
		int64_t OutputConfiguration::getStreamUseCase() const {
		return mStreamUseCase;
		}

		@@ -192,8 +192,8 @@ status_t OutputConfiguration::readFromParcel(const android::Parcel* parcel) {
		return err;
		}

		int streamUseCase = ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT;
		if ((err = parcel->readInt32(&streamUseCase)) != OK) {
		int64_t streamUseCase = ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT;
		if ((err = parcel->readInt64(&streamUseCase)) != OK) {
		ALOGE("%s: Failed to read stream use case from parcel", __FUNCTION__);
		return err;
		}
		@@ -232,8 +232,8 @@ status_t OutputConfiguration::readFromParcel(const android::Parcel* parcel) {
		mDynamicRangeProfile = dynamicProfile;

		ALOGV("%s: OutputConfiguration: rotation = %d, setId = %d, surfaceType = %d,"
		" physicalCameraId = %s, isMultiResolution = %d, streamUseCase = %d, timestampBase = %d,"
		" mirrorMode = %d",
		" physicalCameraId = %s, isMultiResolution = %d, streamUseCase = %" PRId64
		", timestampBase = %d, mirrorMode = %d",
		__FUNCTION__, mRotation, mSurfaceSetID, mSurfaceType,
		String8(mPhysicalCameraId).string(), mIsMultiResolution, mStreamUseCase, timestampBase,
		mMirrorMode);
		@@ -317,7 +317,7 @@ status_t OutputConfiguration::writeToParcel(android::Parcel* parcel) const {
		err = parcel->writeInt64(mDynamicRangeProfile);
		if (err != OK) return err;

		err = parcel->writeInt32(mStreamUseCase);
		err = parcel->writeInt64(mStreamUseCase);
		if (err != OK) return err;

		err = parcel->writeInt32(mTimestampBase);

camera/include/camera/CameraSessionStats.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ public:
		// Dynamic range profile
		int64_t mDynamicRangeProfile;
		// Stream use case
		int mStreamUseCase;
		int64_t mStreamUseCase;

		CameraStreamStats() :
		mWidth(0), mHeight(0), mFormat(0), mMaxPreviewFps(0), mDataSpace(0), mUsage(0),

camera/include/camera/camera2/OutputConfiguration.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public:
		bool isShared() const;
		String16 getPhysicalCameraId() const;
		bool isMultiResolution() const;
		int getStreamUseCase() const;
		int64_t getStreamUseCase() const;
		int getTimestampBase() const;
		int getMirrorMode() const;

		@@ -185,7 +185,7 @@ private:
		bool mIsMultiResolution;
		std::vector<int32_t> mSensorPixelModesUsed;
		int64_t mDynamicRangeProfile;
		int mStreamUseCase;
		int64_t mStreamUseCase;
		int mTimestampBase;
		int mMirrorMode;
		};

camera/ndk/include/camera/NdkCameraMetadataTags.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -4216,7 +4216,7 @@ typedef enum acamera_metadata_tag {
		/**
		* <p>The stream use cases supported by this camera device.</p>
		*
		* <p>Type: int32[n] (acamera_metadata_enum_android_scaler_available_stream_use_cases_t)</p>
		* <p>Type: int64[n] (acamera_metadata_enum_android_scaler_available_stream_use_cases_t)</p>
		*
		* <p>This tag may appear in:
		* <ul>
		@@ -4260,7 +4260,7 @@ typedef enum acamera_metadata_tag {
		* reprocessable session, constrained high speed session, or RAW stream combinations, the
		* application should leave stream use cases within the session as DEFAULT.</p>
		*/
		ACAMERA_SCALER_AVAILABLE_STREAM_USE_CASES = // int32[n] (acamera_metadata_enum_android_scaler_available_stream_use_cases_t)
		ACAMERA_SCALER_AVAILABLE_STREAM_USE_CASES = // int64[n] (acamera_metadata_enum_android_scaler_available_stream_use_cases_t)
		ACAMERA_SCALER_START + 25,
		ACAMERA_SCALER_END,