diff options
| author | Chulwoo Lee <chulwoo@google.com> | 2014-08-04 02:09:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-01 16:06:20 +0000 |
| commit | 98ccd4a80547f4a3196d2c2034760965cd076bc5 (patch) | |
| tree | 36d28f706a8c3957af6cb421b110aa772bc0eb5c | |
| parent | 4ec6ec4736c61c2c0a13464970bb46e48cd05d0e (diff) | |
| parent | f0b820182b395b5adf8005be3db0333b17c8dece (diff) | |
| download | TV-98ccd4a80547f4a3196d2c2034760965cd076bc5.tar.gz | |
Merge "Add valid content rating" into lmp-dev
| -rw-r--r-- | sample/res/raw/hls_channels.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sample/res/raw/hls_channels.xml b/sample/res/raw/hls_channels.xml index c083cb2c..120c9dd6 100644 --- a/sample/res/raw/hls_channels.xml +++ b/sample/res/raw/hls_channels.xml @@ -27,7 +27,8 @@ duration_sec="3600" video_url="http://devimages.apple.com/iphone/samples/bipbop/gear1/prog_index.m3u8" description="Bip-Bop sample video - Low resolution" - content_rating="RATING_US_TV_G, RATING_KR_TV_ALL" /> + content_rating="android.media.tv/US/US_TVPG/US_TVPG_TV_G, + android.media.tv/KR/KR_TV/KR_TV_ALL" /> </Channel> <Channel display_number="2-2" @@ -42,7 +43,7 @@ duration_sec="3600" video_url="http://devimages.apple.com/iphone/samples/bipbop/gear4/prog_index.m3u8" description="Bip-Bop sample video - High resolution" - content_rating="RATING_US_TV_PG/SUBRATING_US_D" /> + content_rating="android.media.tv/US/US_TVPG/US_TVPG_TV_PG/US_TVPG_D" /> </Channel> <Channel display_number="2-3" @@ -57,7 +58,7 @@ duration_sec="3600" video_url="https://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8" description="Bip-Bop sample video - High resolution" - content_rating="RATING_US_TV_PG/SUBRATING_US_D/SUBRATING_US_L" /> + content_rating="android.media.tv/US/US_TVPG/US_TVPG_TV_14/US_TVPG_D/US_TVPG_L" /> </Channel> <Channel display_number="3-1" @@ -72,6 +73,6 @@ duration_sec="3600" video_url="http://playertest.longtailvideo.com/adaptive/bbbfull/bbbfull.m3u8" description="Big Buck Bunny Sample Video" - content_rating="RATING_US_TV_G" /> + content_rating="android.media.tv/US/US_TVPG/US_TVPG_TV_G" /> </Channel> </Channels> |