commit bdfefc859a3b8bf588dd554b37d3ac01da4962d7
author Unsuk Jung <unsuk@google.com> Tue Jun 09 19:50:06 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 09 19:50:06 2015 +0000
tree 432227b2fc6f45ece5cbd12191c4a4573904d76f
parent 5203277b532cb14f6f62a852a6d04ccf3c147fc0
parent e916e8f75532f2bd361eec5b452e1a7de8432ae2

am e916e8f7: Merge "Clarify decoding support for codecs reported by CamcorderProfile" into lmp-mr1-dev

* commit 'e916e8f75532f2bd361eec5b452e1a7de8432ae2':
  Clarify decoding support for codecs reported by CamcorderProfile

src/compatibility/5.1/android-5.1-cdd.html

diff --git a/src/compatibility/5.1/android-5.1-cdd.html b/src/compatibility/5.1/android-5.1-cdd.html
index 0e59cec..d787b57 100644
--- a/src/compatibility/5.1/android-5.1-cdd.html
+++ b/src/compatibility/5.1/android-5.1-cdd.html
@@ -1581,7 +1581,13 @@
 <p>Device implementations MUST support the core media formats specified in the
 Android SDK documentation [<a href="http://developer.android.com/guide/appendix/media-formats.html">Resources, 50</a>] except where explicitly permitted in this document. Specifically, device
 implementations MUST support the media formats, encoders, decoders, file types,
-and container formats defined in the tables below. All of these codecs are
+and container formats defined in the tables below and reported via MediaCodecList
+[<a href="http://developer.android.com/reference/android/media/MediaCodecList.html">Resources,112</a>].
+Device implementations MUST also be able to decode all profiles reported in its CamcorderProfile
+[<a href="http://developer.android.com/reference/android/media/CamcorderProfile.html">Resources,
+113</a>].
+
+All of these codecs are
 provided as software implementations in the preferred Android implementation
 from the Android Open Source Project.</p>
 
@@ -4930,6 +4936,10 @@
 
 <p>111. Android Auto feature: <a href="http://developer.android.com/reference/android/content/res/Configuration.html#UI_MODE_TYPE_CAR">http://developer.android.com/reference/android/content/res/Configuration.html#UI_MODE_TYPE_CAR</a></p>
 
+<p>112. Android MediaCodecList API: <a href="http://developer.android.com/reference/android/media/MediaCodecList.html">http://developer.android.com/reference/android/media/MediaCodecList.html</a></p>
+
+<p>113. Android CamcorderProfile API: <a href="http://developer.android.com/reference/android/media/CamcorderProfile.html">http://developer.android.com/reference/android/media/CamcorderProfile.html</a></p>
+
 <p>Many of these resources are derived directly or indirectly from the Android
 SDK, and will be functionally identical to the information in that SDK&rsquo;s
 documentation. In any cases where this Compatibility Definition or the