diff options
| author | Unsuk Jung <unsuk@google.com> | 2015-06-10 18:15:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-10 18:15:25 +0000 |
| commit | be29e77af64fff10238ab14a1b6c74729a3198c0 (patch) | |
| tree | 83fa034ac8bc04ba026deba25a75f1f0ce54c36d | |
| parent | 4403f1b4bed33649e9c8a7a51bc16eb6dc2e5264 (diff) | |
| parent | bdfefc859a3b8bf588dd554b37d3ac01da4962d7 (diff) | |
| download | source.android.com-be29e77af64fff10238ab14a1b6c74729a3198c0.tar.gz | |
am bdfefc85: am e916e8f7: Merge "Clarify decoding support for codecs reported by CamcorderProfile" into lmp-mr1-dev
* commit 'bdfefc859a3b8bf588dd554b37d3ac01da4962d7':
Clarify decoding support for codecs reported by CamcorderProfile
| -rw-r--r-- | src/compatibility/5.1/android-5.1-cdd.html | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/compatibility/5.1/android-5.1-cdd.html b/src/compatibility/5.1/android-5.1-cdd.html index 0e59cec2..d787b57a 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 @@ files from installing and running correctly on other compatible devices.</p> <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 @@ Android source code, at dalvik/docs</p> <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’s documentation. In any cases where this Compatibility Definition or the |