Merge "[MediaQuality] Add getParameterCapabilities" into main (176e13d0) · Commits · e / os / android_frameworks_base

media/java/android/media/quality/MediaQualityContract.java

+28 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,13 @@ public class MediaQualityContract {
		*/
		public static final String PARAMETER_FILM_MODE = "film_mode";

		/**
		* Enable/disable black color auto stretch
		*
		* @hide
		*/
		public static final String PARAMETER_BLACK_STRETCH = "black_stretch";

		/**
		* Enable/disable blue color auto stretch
		*
		@@ -453,6 +460,27 @@ public class MediaQualityContract {
		*/
		public static final String PARAMETER_GAMMA = "gamma";

		/**
		* @hide
		*
		*/
		public static final String PARAMETER_COLOR_TEMPERATURE_RED_GAIN =
		"color_temperature_red_gain";

		/**
		* @hide
		*
		*/
		public static final String PARAMETER_COLOR_TEMPERATURE_GREEN_GAIN =
		"color_temperature_green_gain";

		/**
		* @hide
		*
		*/
		public static final String PARAMETER_COLOR_TEMPERATURE_BLUE_GAIN =
		"color_temperature_blue_gain";

		/**
		* @hide
		*

services/core/java/com/android/server/media/quality/MediaQualityService.java

+34 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.hardware.tv.mediaquality.IPictureProfileChangedListener;
		import android.hardware.tv.mediaquality.ISoundProfileAdjustmentListener;
		import android.hardware.tv.mediaquality.ISoundProfileChangedListener;
		import android.hardware.tv.mediaquality.ParamCapability;
		import android.hardware.tv.mediaquality.ParameterRange;
		import android.hardware.tv.mediaquality.PictureParameter;
		import android.hardware.tv.mediaquality.PictureParameters;
		import android.hardware.tv.mediaquality.SoundParameter;
		@@ -1133,7 +1134,39 @@ public class MediaQualityService extends SystemService {
		@Override
		public List<ParameterCapability> getParameterCapabilities(
		List<String> names, UserHandle user) {
		return new ArrayList<>();
		byte[] byteArray = MediaQualityUtils.convertParameterToByteArray(names);
		ParamCapability[] caps = new ParamCapability[byteArray.length];
		try {
		mMediaQuality.getParamCaps(byteArray, caps);
		} catch (RemoteException e) {
		Slog.e(TAG, "Failed to get parameter capabilities", e);
		}

		return getListParameterCapability(caps);
		}

		private List<ParameterCapability> getListParameterCapability(ParamCapability[] caps) {
		List<ParameterCapability> pcList = new ArrayList<>();
		for (ParamCapability pcHal : caps) {
		String name = MediaQualityUtils.getParameterName(pcHal.name);
		boolean isSupported = pcHal.isSupported;
		int type = pcHal.defaultValue == null ? 0 : pcHal.defaultValue.getTag() + 1;
		Bundle bundle = convertToCaps(pcHal.range);

		pcList.add(new ParameterCapability(name, isSupported, type, bundle));
		}
		return pcList;
		}

		private Bundle convertToCaps(ParameterRange range) {
		Bundle bundle = new Bundle();
		bundle.putObject("INT_MIN_MAX", range.numRange.getIntMinMax());
		bundle.putObject("INT_VALUES_SUPPORTED", range.numRange.getIntValuesSupported());
		bundle.putObject("DOUBLE_MIN_MAX", range.numRange.getDoubleMinMax());
		bundle.putObject("DOUBLE_VALUES_SUPPORTED", range.numRange.getDoubleValuesSupported());
		bundle.putObject("LONG_MIN_MAX", range.numRange.getLongMinMax());
		bundle.putObject("LONG_VALUES_SUPPORTED", range.numRange.getLongValuesSupported());
		return bundle;
		}

		@GuardedBy("mPictureProfileLock")

services/core/java/com/android/server/media/quality/MediaQualityUtils.java

+493 −0

File changed.

Preview size limit exceeded, changes collapsed.