Merge "TvContract: Add columns for video format and resolution" (0e33c128) · Commits · e / os / android_frameworks_base

api/current.txt

+20 −0

Original line number	Diff line number	Diff line
		@@ -15851,6 +15851,7 @@ package android.media.tv {
		}

		public static final class TvContract.Channels implements android.media.tv.TvContract.BaseTvColumns {
		method public static final java.lang.String getVideoResolution(java.lang.String);
		field public static final java.lang.String COLUMN_BROWSABLE = "browsable";
		field public static final java.lang.String COLUMN_DESCRIPTION = "description";
		field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name";
		@@ -15864,6 +15865,7 @@ package android.media.tv {
		field public static final java.lang.String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id";
		field public static final java.lang.String COLUMN_TYPE = "type";
		field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
		field public static final java.lang.String COLUMN_VIDEO_FORMAT = "video_format";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/channel";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/channel";
		field public static final android.net.Uri CONTENT_URI;
		@@ -15895,6 +15897,22 @@ package android.media.tv {
		field public static final int TYPE_SECAM = 3; // 0x3
		field public static final int TYPE_S_DMB = 393472; // 0x60100
		field public static final int TYPE_T_DMB = 393216; // 0x60000
		field public static final java.lang.String VIDEO_FORMAT_1080I = "VIDEO_FORMAT_1080I";
		field public static final java.lang.String VIDEO_FORMAT_1080P = "VIDEO_FORMAT_1080P";
		field public static final java.lang.String VIDEO_FORMAT_2160P = "VIDEO_FORMAT_2160P";
		field public static final java.lang.String VIDEO_FORMAT_240P = "VIDEO_FORMAT_240P";
		field public static final java.lang.String VIDEO_FORMAT_360P = "VIDEO_FORMAT_360P";
		field public static final java.lang.String VIDEO_FORMAT_4320P = "VIDEO_FORMAT_4320P";
		field public static final java.lang.String VIDEO_FORMAT_480I = "VIDEO_FORMAT_480I";
		field public static final java.lang.String VIDEO_FORMAT_480P = "VIDEO_FORMAT_480P";
		field public static final java.lang.String VIDEO_FORMAT_576I = "VIDEO_FORMAT_576I";
		field public static final java.lang.String VIDEO_FORMAT_576P = "VIDEO_FORMAT_576P";
		field public static final java.lang.String VIDEO_FORMAT_720P = "VIDEO_FORMAT_720P";
		field public static final java.lang.String VIDEO_RESOLUTION_ED = "VIDEO_RESOLUTION_ED";
		field public static final java.lang.String VIDEO_RESOLUTION_FHD = "VIDEO_RESOLUTION_FHD";
		field public static final java.lang.String VIDEO_RESOLUTION_HD = "VIDEO_RESOLUTION_HD";
		field public static final java.lang.String VIDEO_RESOLUTION_SD = "VIDEO_RESOLUTION_SD";
		field public static final java.lang.String VIDEO_RESOLUTION_UHD = "VIDEO_RESOLUTION_UHD";
		}

		public static final class TvContract.Channels.Logo {
		@@ -15915,6 +15933,8 @@ package android.media.tv {
		field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
		field public static final java.lang.String COLUMN_TITLE = "title";
		field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
		field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";
		field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program";
		field public static final android.net.Uri CONTENT_URI;

media/java/android/media/tv/TvContract.java

+121 −0

Original line number	Diff line number	Diff line
		@@ -22,7 +22,9 @@ import android.content.ContentUris;
		import android.net.Uri;
		import android.provider.BaseColumns;

		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;

		/**
		* <p>
		@@ -380,6 +382,81 @@ public final class TvContract {
		/** The service type for radio channels that have audio only. */
		public static final int SERVICE_TYPE_AUDIO = 0x2;

		/** The video format for 240p. */
		public static final String VIDEO_FORMAT_240P = "VIDEO_FORMAT_240P";

		/** The video format for 360p. */
		public static final String VIDEO_FORMAT_360P = "VIDEO_FORMAT_360P";

		/** The video format for 480i. */
		public static final String VIDEO_FORMAT_480I = "VIDEO_FORMAT_480I";

		/** The video format for 480p. */
		public static final String VIDEO_FORMAT_480P = "VIDEO_FORMAT_480P";

		/** The video format for 576i. */
		public static final String VIDEO_FORMAT_576I = "VIDEO_FORMAT_576I";

		/** The video format for 576p. */
		public static final String VIDEO_FORMAT_576P = "VIDEO_FORMAT_576P";

		/** The video format for 720p. */
		public static final String VIDEO_FORMAT_720P = "VIDEO_FORMAT_720P";

		/** The video format for 1080i. */
		public static final String VIDEO_FORMAT_1080I = "VIDEO_FORMAT_1080I";

		/** The video format for 1080p. */
		public static final String VIDEO_FORMAT_1080P = "VIDEO_FORMAT_1080P";

		/** The video format for 2160p. */
		public static final String VIDEO_FORMAT_2160P = "VIDEO_FORMAT_2160P";

		/** The video format for 4320p. */
		public static final String VIDEO_FORMAT_4320P = "VIDEO_FORMAT_4320P";

		/** The video resolution for standard-definition. */
		public static final String VIDEO_RESOLUTION_SD = "VIDEO_RESOLUTION_SD";

		/** The video resolution for enhanced-definition. */
		public static final String VIDEO_RESOLUTION_ED = "VIDEO_RESOLUTION_ED";

		/** The video resolution for high-definition. */
		public static final String VIDEO_RESOLUTION_HD = "VIDEO_RESOLUTION_HD";

		/** The video resolution for full high-definition. */
		public static final String VIDEO_RESOLUTION_FHD = "VIDEO_RESOLUTION_FHD";

		/** The video resolution for ultra high-definition. */
		public static final String VIDEO_RESOLUTION_UHD = "VIDEO_RESOLUTION_UHD";

		private static final Map<String, String> VIDEO_FORMAT_TO_RESOLUTION_MAP =
		new HashMap<String, String>();

		static {
		VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_480I, VIDEO_RESOLUTION_SD);
		VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_480P, VIDEO_RESOLUTION_ED);
		VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_576I, VIDEO_RESOLUTION_SD);
		VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_576P, VIDEO_RESOLUTION_ED);
		VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_720P, VIDEO_RESOLUTION_HD);
		VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_1080I, VIDEO_RESOLUTION_HD);
		VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_1080P, VIDEO_RESOLUTION_FHD);
		VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_2160P, VIDEO_RESOLUTION_UHD);
		VIDEO_FORMAT_TO_RESOLUTION_MAP.put(VIDEO_FORMAT_4320P, VIDEO_RESOLUTION_UHD);
		}

		/**
		* Returns the video resolution (definition) for a given video format.
		*
		* @param videoFormat The video format defined in {@link Channels}.
		* @return the corresponding video resolution string. {@code null} if the resolution string
		* is not defined for the given video format.
		* @see #COLUMN_VIDEO_FORMAT
		*/
		public static final String getVideoResolution(String videoFormat) {
		return VIDEO_FORMAT_TO_RESOLUTION_MAP.get(videoFormat);
		}

		/**
		* The name of the {@link TvInputService} subclass that provides this TV channel. This
		* should be a fully qualified class name (such as, "com.example.project.TvInputService").
		@@ -512,6 +589,24 @@ public final class TvContract {
		*/
		public static final String COLUMN_DESCRIPTION = "description";

		/**
		* The typical video format for programs from this TV channel.
		* <p>
		* This is primarily used to filter out channels based on video format by applications. The
		* value should match one of the followings: {@link #VIDEO_FORMAT_240P},
		* {@link #VIDEO_FORMAT_360P}, {@link #VIDEO_FORMAT_480I}, {@link #VIDEO_FORMAT_480P},
		* {@link #VIDEO_FORMAT_576I}, {@link #VIDEO_FORMAT_576P}, {@link #VIDEO_FORMAT_720P},
		* {@link #VIDEO_FORMAT_1080I}, {@link #VIDEO_FORMAT_1080P}, {@link #VIDEO_FORMAT_2160P},
		* {@link #VIDEO_FORMAT_4320P}. Note that the actual video resolution of each program from a
		* given channel can vary thus one should use {@link Programs#COLUMN_VIDEO_WIDTH} and
		* {@link Programs#COLUMN_VIDEO_HEIGHT} to get more accurate video resolution.
		* </p><p>
		* Type: TEXT
		* </p><p>
		* @see #getVideoResolution
		*/
		public static final String COLUMN_VIDEO_FORMAT = "video_format";

		/**
		* The flag indicating whether this TV channel is browsable or not.
		* <p>
		@@ -718,6 +813,32 @@ public final class TvContract {
		*/
		public static final String COLUMN_LONG_DESCRIPTION = "long_description";

		/**
		* The width of the video for this TV program, in the unit of pixels.
		* <p>
		* Together with {@link #COLUMN_VIDEO_HEIGHT} this is used to determine the video resolution
		* of the current TV program. Can be empty if it is not known initially or the program does
		* not convey any video such as the programs from type {@link Channels#SERVICE_TYPE_AUDIO}
		* channels.
		* </p><p>
		* Type: INTEGER
		* </p>
		*/
		public static final String COLUMN_VIDEO_WIDTH = "video_width";

		/**
		* The height of the video for this TV program, in the unit of pixels.
		* <p>
		* Together with {@link #COLUMN_VIDEO_WIDTH} this is used to determine the video resolution
		* of the current TV program. Can be empty if it is not known initially or the program does
		* not convey any video such as the programs from type {@link Channels#SERVICE_TYPE_AUDIO}
		* channels.
		* </p><p>
		* Type: INTEGER
		* </p>
		*/
		public static final String COLUMN_VIDEO_HEIGHT = "video_height";

		/**
		* The comma-separated audio languages of this TV program.
		* <p>