diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2011-04-03 13:40:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-03 13:40:48 -0700 |
| commit | 1676920113d35b66e6e8846ffb7dded7e011c2fa (patch) | |
| tree | 6818cd104732825d53a96c8692dbb41311bfee7b /docs | |
| parent | 90a1befa551a9e6dc8f06b7331e26e6470ab824f (diff) | |
| parent | 88a1fc2d79d48258c2f67ee32157ec25eb71c94d (diff) | |
| download | frameworks_base-1676920113d35b66e6e8846ffb7dded7e011c2fa.zip frameworks_base-1676920113d35b66e6e8846ffb7dded7e011c2fa.tar.gz frameworks_base-1676920113d35b66e6e8846ffb7dded7e011c2fa.tar.bz2 | |
Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/appendix/media-formats.jd | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index 8509466..34a4c18 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -52,8 +52,8 @@ page.title=Android Supported Media Formats <table> <tbody> -<tr> +<tr> <th>Type</th> <th>Format / Codec</th> <th>Encoder</th> @@ -63,12 +63,13 @@ page.title=Android Supported Media Formats </tr> <tr> -<td rowspan="9">Audio</td> +<td rowspan="10">Audio</td> <td>AAC LC/LTP</td> <td style="text-align: center;"><big>•</big></td> <td style="text-align: center;"><big>•</big></td> -<td rowspan="3">Mono/Stereo content in any combination of standard bit rates up to 160 kbps and sampling rates from 8 to 48kHz</td> -<td rowspan="3">3GPP (.3gp) and MPEG-4 (.mp4, .m4a). No support for raw AAC (.aac)</td> +<td rowspan="3">Mono/Stereo content in any combination of standard bit +rates up to 160 kbps and sampling rates from 8 to 48kHz</td> +<td rowspan="3">3GPP (.3gp), and MPEG-4 (.mp4, .m4a). ADTS raw AAC (.aac, decode only, ADIF not supported, Android 3.1+). </td> </tr> <tr> @@ -101,6 +102,18 @@ page.title=Android Supported Media Formats </tr> <tr> +<td>FLAC</td> +<td> </td> +<td style="text-align: center;"><big>•</big><br><small>(Android 3.1+)</small></td> +<td>Mono/Stereo (no multichannel). Sample rates up to 48 kHz (but up to 44.1 +kHz is recommended on devices with 44.1 kHz output, as the 48 to 44.1 kHz +downsampler does not include a low-pass filter). 16-bit recommended; +no dither applied for 24-bit. +</td> +<td>FLAC (.flac) only</td> +</tr> + +<tr> <td>MP3</td> <td> </td> <td style="text-align: center;"><big>•</big></td> |