diff options
| author | Danielle Roberts <daroberts@google.com> | 2015-10-08 00:15:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-08 00:15:59 +0000 |
| commit | de59dbf895c5b54c6ec594239b7c35b774870acc (patch) | |
| tree | 29c90adef1c26f7f53a16ec154f6f955a379adf6 | |
| parent | 2ef8dc73dc08d2116a3cbec5d95f81961697aad4 (diff) | |
| parent | 2764d6f6614cdb48585788cc9c2d4ce0454734a3 (diff) | |
| download | source.android.com-de59dbf895c5b54c6ec594239b7c35b774870acc.tar.gz | |
Merge "CDD: Add devices must be able to decode all formats it can encode to Mulitmedia (formerly change 787297)" into mnc-dev
| -rw-r--r-- | src/compatibility/android-cdd.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compatibility/android-cdd.html b/src/compatibility/android-cdd.html index 0edd45c3..ef7f09a5 100644 --- a/src/compatibility/android-cdd.html +++ b/src/compatibility/android-cdd.html @@ -1760,13 +1760,14 @@ 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 +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 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>]. +113</a>] and MUST be able to decode all formats it can encode. All of these codecs are provided as software implementations in the preferred Android implementation |