aboutsummaryrefslogtreecommitdiff
path: root/en/compatibility/5.1/android-5.1-cdd.html
diff options
context:
space:
mode:
authorAndroid Partner Docs <noreply@android.com>2017-06-13 21:26:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-13 21:26:42 +0000
commitb8087179e42959b1efeb64a81110d6d0aa2b798f (patch)
treeb0254fc055b6adcae6a60704966ac029afb600cf /en/compatibility/5.1/android-5.1-cdd.html
parente5ecdabfcf75d07d42c93ab2b472b8340b674ae7 (diff)
parent669198e6d1bd5047baeea4f298f27ec22fbc71f5 (diff)
downloadsource.android.com-b8087179e42959b1efeb64a81110d6d0aa2b798f.tar.gz
Merge "Docs: Changes to source.android.com" am: 0a9ccdf0b0 am: c391221fea am: 6ccb9c7cc8
am: 669198e6d1 Change-Id: Idf6e6994594f7e8514edbd0c54bd1cc92dd898de
Diffstat (limited to 'en/compatibility/5.1/android-5.1-cdd.html')
-rw-r--r--en/compatibility/5.1/android-5.1-cdd.html16
1 files changed, 9 insertions, 7 deletions
diff --git a/en/compatibility/5.1/android-5.1-cdd.html b/en/compatibility/5.1/android-5.1-cdd.html
index 3fcff269..77448964 100644
--- a/en/compatibility/5.1/android-5.1-cdd.html
+++ b/en/compatibility/5.1/android-5.1-cdd.html
@@ -2096,18 +2096,20 @@ devices only when supported by hardware.</p>
<p class="table_footnote">2 STRONGLY RECOMMENDED for Android Television device implementations when
supported by hardware.</p>
-<p>Android device implementations, when supporting H.265 codec as described in <a href="#5_1_3_video_codecs">section 5.1.3</a>, MUST support the Main Profile Level 3 Main tier and the following SD video
-decoding profiles and SHOULD support the HD decoding profiles. Android
-Television devices MUST support the Main Profile Level 4.1 Main tier and the HD
-1080p decoding profile and SHOULD support Main10 Level 5 Main Tier profile and
-the UHD decoding profile.</p>
+<p>Android device implementations, when supporting H.265 codec as described in
+<a href="#5_1_3_video_codecs">section 5.1.3</a>, MUST support the Main Profile Level 3 Main tier
+and the following SD video decoding profiles and SHOULD support the HD decoding profiles. Android
+Television devices SHOULD support Main10 Level 5 Main Tier profile and the UHD decoding profile.
+Android Television devices are STRONGLY RECOMMENDED to support the HD 1080p decoding profile.
+If the HD 1080p decoding profile is supported, it MUST support the Main Profile Level
+4.1 Main tier</p>
<table>
<tr>
<th></th>
<th>SD (Low quality)</th>
<th>SD (High quality)</th>
<th>HD 720p </strong>1 </td>
- <th>HD 1080p </strong>1 </td>
+ <th>HD 1080p </strong>2 </td>
<th>UHD </strong>2</td>
</tr>
<tr>
@@ -2140,7 +2142,7 @@ the UHD decoding profile.</p>
<p class="table_footnote">1 Required for Android Television device implementation, but for other type of
devices only when supported by hardware.</p>
-<p class="table_footnote">2 Required for Android Television device implementations when supported by
+<p class="table_footnote">2 STRONGLY RECOMMENDED for Android Television device implementations when supported by
hardware.</p>
<h2 id="5_4_audio_recording">5.4. Audio Recording</h2>