diff options
| author | Scott Rowe <scottrowe@google.com> | 2015-04-24 18:21:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 18:21:42 +0000 |
| commit | 1db13a90108312531bffbae94c7aeadaf2826a49 (patch) | |
| tree | c2b20d60f3da04f096312c1dd6374df8303138de /docs/html/guide | |
| parent | 6e37e5a006979e76ba111769149a0b48e0d8ba49 (diff) | |
| parent | 6a6bfe5e84b598f24d73138523d7f8d88729daed (diff) | |
| download | frameworks_base-1db13a90108312531bffbae94c7aeadaf2826a49.zip frameworks_base-1db13a90108312531bffbae94c7aeadaf2826a49.tar.gz frameworks_base-1db13a90108312531bffbae94c7aeadaf2826a49.tar.bz2 | |
am 6a6bfe5e: am 6e5063fe: docs: Supported media protocols, codecs, formats for Android TV
* commit '6a6bfe5e84b598f24d73138523d7f8d88729daed':
docs: Supported media protocols, codecs, formats for Android TV
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/appendix/media-formats.jd | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index 19f510a..2a908ba 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -71,7 +71,7 @@ page.tags=video,audio,mpeg,mp4,m4a,mp3,3gp,3gpp,flac,wave,wav </tr> <tr> -<td rowspan="11">Audio</td> +<td rowspan="12">Audio</td> <td>AAC LC</td> <td style="text-align: center;"><big>•</big></td> <td style="text-align: center;"><big>•</big></td> @@ -180,6 +180,15 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> </tr> <tr> +<td>Opus</td> +<td style="text-align: center;"></td> +<td style="text-align: center;"><big>•</big><br><small>(Android 5.0+)</small></td> +<td></td> +<td> + Matroska (.mkv)</td> +</tr> + +<tr> <td rowspan="5">Image</td> <td>JPEG</td> <td style="text-align: center;"><big>•</big></td> @@ -235,7 +244,7 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> <tr> -<td rowspan="4">Video</td> +<td rowspan="6">Video</td> <td>H.263</td> <td style="text-align: center;"><big>•</big></td> <td style="text-align: center;"><big>•</big></td> @@ -257,6 +266,15 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> </tr> <tr> +<td>H.265 HEVC</td> +<td style="text-align: center;" nowrap></td> +<td style="text-align: center;" nowrap><big>•</big><br><small>(Android 5.0+)</small></td> +<td>Main Profile Level 3 for mobile devices and Main Profile Level 4.1 for Android TV</td> +<td> + • MPEG-4 (.mp4)<br> +</tr> + +<tr> <td>MPEG-4 SP</td> <td> </td> <td style="text-align: center;"><big>•</big></td> @@ -275,6 +293,16 @@ rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td> • Matroska (.mkv, Android 4.0+)</td> </tr> +<tr> +<td>VP9</td> +<td style="text-align: center;" nowrap></td> +<td style="text-align: center;" nowrap><big>•</big><br><small>(Android 4.4+)</small></td> +<td></td> +<td> + • <a href="http://www.webmproject.org/">WebM</a> (.webm)<br> + • Matroska (.mkv, Android 4.0+)</td> +</tr> + </tbody></table> |