Merge changes from topic "am-6269d6c0d0bb413c84e5068d06041457" (9a3f63d7) · Commits · e / os / android_frameworks_base

core/java/android/provider/MediaStore.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -2029,6 +2029,27 @@ public final class MediaStore {
		* <P>Type: INTEGER</P>
		*/
		public static final String BOOKMARK = "bookmark";

		/**
		* The standard of color aspects
		* <P>Type: INTEGER</P>
		* @hide
		*/
		public static final String COLOR_STANDARD = "color_standard";

		/**
		* The transfer of color aspects
		* <P>Type: INTEGER</P>
		* @hide
		*/
		public static final String COLOR_TRANSFER = "color_transfer";

		/**
		* The range of color aspects
		* <P>Type: INTEGER</P>
		* @hide
		*/
		public static final String COLOR_RANGE = "color_range";
		}

		public static final class Media implements VideoColumns {

media/java/android/media/MediaMetadataRetriever.java

+34 −0

Original line number	Diff line number	Diff line
		@@ -923,5 +923,39 @@ public class MediaMetadataRetriever
		* @hide
		*/
		public static final int METADATA_KEY_EXIF_LENGTH = 34;

		/**
		* This key retrieves the color standard, if available.
		*
		* @see MediaFormat#COLOR_STANDARD_BT709
		* @see MediaFormat#COLOR_STANDARD_BT601_PAL
		* @see MediaFormat#COLOR_STANDARD_BT601_NTSC
		* @see MediaFormat#COLOR_STANDARD_BT2020
		*
		* @hide
		*/
		public static final int METADATA_KEY_COLOR_STANDARD = 35;

		/**
		* This key retrieves the color transfer, if available.
		*
		* @see MediaFormat#COLOR_TRANSFER_LINEAR
		* @see MediaFormat#COLOR_TRANSFER_SDR_VIDEO
		* @see MediaFormat#COLOR_TRANSFER_ST2084
		* @see MediaFormat#COLOR_TRANSFER_HLG
		*
		* @hide
		*/
		public static final int METADATA_KEY_COLOR_TRANSFER = 36;

		/**
		* This key retrieves the color range, if available.
		*
		* @see MediaFormat#COLOR_RANGE_LIMITED
		* @see MediaFormat#COLOR_RANGE_FULL
		*
		* @hide
		*/
		public static final int METADATA_KEY_COLOR_RANGE = 37;
		// Add more here...
		}

media/java/android/media/MediaScanner.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -524,6 +524,9 @@ public class MediaScanner implements AutoCloseable {
		private boolean mScanSuccess;
		private int mWidth;
		private int mHeight;
		private int mColorStandard;
		private int mColorTransfer;
		private int mColorRange;

		public MyMediaScannerClient() {
		mDateFormatter = new SimpleDateFormat("yyyyMMdd'T'HHmmss");
		@@ -592,6 +595,9 @@ public class MediaScanner implements AutoCloseable {
		mCompilation = 0;
		mWidth = 0;
		mHeight = 0;
		mColorStandard = -1;
		mColorTransfer = -1;
		mColorRange = -1;

		return entry;
		}
		@@ -760,6 +766,12 @@ public class MediaScanner implements AutoCloseable {
		mWidth = parseSubstring(value, 0, 0);
		} else if (name.equalsIgnoreCase("height")) {
		mHeight = parseSubstring(value, 0, 0);
		} else if (name.equalsIgnoreCase("colorstandard")) {
		mColorStandard = parseSubstring(value, 0, -1);
		} else if (name.equalsIgnoreCase("colortransfer")) {
		mColorTransfer = parseSubstring(value, 0, -1);
		} else if (name.equalsIgnoreCase("colorrange")) {
		mColorRange = parseSubstring(value, 0, -1);
		} else {
		//Log.v(TAG, "unknown tag: " + name + " (" + mProcessGenres + ")");
		}
		@@ -905,6 +917,15 @@ public class MediaScanner implements AutoCloseable {
		if (resolution != null) {
		map.put(Video.Media.RESOLUTION, resolution);
		}
		if (mColorStandard >= 0) {
		map.put(Video.Media.COLOR_STANDARD, mColorStandard);
		}
		if (mColorTransfer >= 0) {
		map.put(Video.Media.COLOR_TRANSFER, mColorTransfer);
		}
		if (mColorRange >= 0) {
		map.put(Video.Media.COLOR_RANGE, mColorRange);
		}
		if (mDate > 0) {
		map.put(Video.Media.DATE_TAKEN, mDate);
		}