Merge "CameraExtensionService: Enable set/get for dynamic range + color space" into main (e250ac35) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -20013,11 +20013,14 @@ package android.hardware.camera2.params {

		public final class ExtensionSessionConfiguration {
		ctor public ExtensionSessionConfiguration(int, @NonNull java.util.List<android.hardware.camera2.params.OutputConfiguration>, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraExtensionSession.StateCallback);
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void clearColorSpace();
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") @Nullable public android.graphics.ColorSpace getColorSpace();
		method @NonNull public java.util.concurrent.Executor getExecutor();
		method public int getExtension();
		method @NonNull public java.util.List<android.hardware.camera2.params.OutputConfiguration> getOutputConfigurations();
		method @Nullable public android.hardware.camera2.params.OutputConfiguration getPostviewOutputConfiguration();
		method @NonNull public android.hardware.camera2.CameraExtensionSession.StateCallback getStateCallback();
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void setColorSpace(@NonNull android.graphics.ColorSpace.Named);
		method public void setPostviewOutputConfiguration(@Nullable android.hardware.camera2.params.OutputConfiguration);
		}

core/api/lint-baseline.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1461,6 +1461,7 @@ UnflaggedApi: android.graphics.text.PositionedGlyphs#getItalicOverride(int):
		New API must be flagged with @FlaggedApi: method android.graphics.text.PositionedGlyphs.getItalicOverride(int)
		UnflaggedApi: android.graphics.text.PositionedGlyphs#getWeightOverride(int):
		New API must be flagged with @FlaggedApi: method android.graphics.text.PositionedGlyphs.getWeightOverride(int)

		UnflaggedApi: android.hardware.camera2.ExtensionCaptureRequest:
		New API must be flagged with @FlaggedApi: class android.hardware.camera2.ExtensionCaptureRequest
		UnflaggedApi: android.hardware.camera2.ExtensionCaptureRequest#ExtensionCaptureRequest():

core/api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -4758,9 +4758,13 @@ package android.hardware.camera2.extension {

		@FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class CameraOutputSurface {
		ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public CameraOutputSurface(@NonNull android.view.Surface, @NonNull android.util.Size);
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public int getColorSpace();
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public long getDynamicRangeProfile();
		method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public int getImageFormat();
		method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public android.util.Size getSize();
		method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public android.view.Surface getSurface();
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void setColorSpace(int);
		method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void setDynamicRangeProfile(long);
		}

		@FlaggedApi("com.android.internal.camera.flags.concert_mode") public class CharacteristicsMap {

core/api/system-lint-baseline.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -535,6 +535,10 @@ ListenerLast: android.telephony.satellite.SatelliteManager#stopSatelliteTransmis
		Listeners should always be at end of argument list (method `stopSatelliteTransmissionUpdates`)


		MethodNameUnits: android.hardware.camera2.extension.CameraOutputSurface#getColorSpace():
		Expected method name units to be `Bytes`, was `Space` in `getColorSpace`


		MissingGetterMatchingBuilder: android.service.voice.HotwordTrainingData.Builder#addTrainingAudio(android.service.voice.HotwordTrainingAudio):
		android.service.voice.HotwordTrainingData does not declare a `getTrainingAudios()` method matching method android.service.voice.HotwordTrainingData.Builder.addTrainingAudio(android.service.voice.HotwordTrainingAudio)
		MissingGetterMatchingBuilder: android.telecom.CallScreeningService.CallResponse.Builder#setShouldScreenCallViaAudioProcessing(boolean):

core/java/android/hardware/camera2/extension/CameraOutputSurface.java

+49 −0

Original line number	Diff line number	Diff line
		@@ -18,8 +18,11 @@ package android.hardware.camera2.extension;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.SuppressLint;
		import android.annotation.SystemApi;
		import android.graphics.ImageFormat;
		import android.hardware.camera2.params.ColorSpaceProfiles;
		import android.hardware.camera2.params.DynamicRangeProfiles;
		import android.hardware.camera2.utils.SurfaceUtils;
		import android.util.Size;
		import android.view.Surface;
		@@ -65,6 +68,8 @@ public final class CameraOutputSurface {
		mOutputSurface.size = new android.hardware.camera2.extension.Size();
		mOutputSurface.size.width = size.getWidth();
		mOutputSurface.size.height = size.getHeight();
		mOutputSurface.dynamicRangeProfile = DynamicRangeProfiles.STANDARD;
		mOutputSurface.colorSpace = ColorSpaceProfiles.UNSPECIFIED;
		}

		/**
		@@ -95,4 +100,48 @@ public final class CameraOutputSurface {
		public @ImageFormat.Format int getImageFormat() {
		return mOutputSurface.imageFormat;
		}

		/**
		* Return the dynamic range profile. The default
		* dynamicRangeProfile is
		* {@link android.hardware.camera2.params.DynamicRangeProfiles.STANDARD}
		* unless specified by CameraOutputSurface.setDynamicRangeProfile.
		*/
		@FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)
		public @DynamicRangeProfiles.Profile long getDynamicRangeProfile() {
		return mOutputSurface.dynamicRangeProfile;
		}

		/**
		* Return the color space. The default colorSpace is
		* {@link android.hardware.camera2.params.ColorSpaceProfiles.UNSPECIFIED}
		* unless specified by CameraOutputSurface.setColorSpace.
		*/
		@SuppressLint("MethodNameUnits")
		@FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)
		public int getColorSpace() {
		return mOutputSurface.colorSpace;
		}

		/**
		* Set the dynamic range profile. The default dynamicRangeProfile
		* will be {@link android.hardware.camera2.params.DynamicRangeProfiles.STANDARD}
		* unless explicitly set using this method.
		*/
		@FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)
		public void setDynamicRangeProfile(
		@DynamicRangeProfiles.Profile long dynamicRangeProfile) {
		mOutputSurface.dynamicRangeProfile = dynamicRangeProfile;
		}

		/**
		* Set the color space. The default colorSpace
		* will be
		* {@link android.hardware.camera2.params.ColorSpaceProfiles.UNSPECIFIED}
		* unless explicitly set using this method.
		*/
		@FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)
		public void setColorSpace(int colorSpace) {
		mOutputSurface.colorSpace = colorSpace;
		}
		}