diff options
| author | 2009-04-15 11:35:03 -0700 | |
|---|---|---|
| committer | 2009-04-15 11:35:03 -0700 | |
| commit | 7cf6fa727a6ad62b844b251456fd89c216052613 (patch) | |
| tree | 5c9d3daa0226336cf6217ba3f03f01d99ffcee34 | |
| parent | e9a65c3a4a4cc79b8971a6f01db4b851cc585a63 (diff) | |
| parent | 2fd2f6e5c689a87f790f581521f5335ebcda2450 (diff) | |
Merge branch 'readonly-p4-donut' into donut
| -rw-r--r-- | docs/html/guide/appendix/media-formats.jd | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index 5419ad679297..323192d09339 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -95,7 +95,7 @@ page.title=Android Supported Media Formats <td>JPEG</td> <td style="text-align: center;">X</td> <td style="text-align: center;">X</td> -<td>base+progressive</td> +<td>Base+progressive</td> <td>JPEG (.jpg)</td> </tr> @@ -127,24 +127,24 @@ page.title=Android Supported Media Formats <tr> <td rowspan="3">Video</td> <td>H.263</td> -<td style="text-align: center;">X</td> +<td style="text-align: center;"></td> <td style="text-align: center;">X</td> <td> </td> <td>3GPP (.3gp)</td> </tr> <tr> -<td>H.264</td> -<td style="text-align: center;">X</td> +<td>H.264 AVC</td> +<td style="text-align: center;"></td> <td style="text-align: center;">X</td> <td> </td> <td>3GPP (.3gp) and MPEG-4 (.mp4)</td> </tr> <tr> -<td>MPEG4 SP</td> -<td> </td> +<td>MPEG-4 SP</td> <td> </td> +<td style="text-align: center;">X</td> <td> </td> <td>3GPP (.3gp)</td> </tr> @@ -171,7 +171,7 @@ page.title=Android Supported Media Formats <td>Audio</td> <td>WMA</td> <td> </td> -<td>X</td> +<td style="text-align: center;">X</td> <td>Supports WMA standard L1-L3: <ul> <li>L1: 64 kbps - 161 kbps @ 44.1kHz</li> @@ -184,13 +184,22 @@ Mono and stereo profiles with 16-bits per sample. Decoder does not support WMA P </tr> <tr> -<td>Video</td> +<td rowspan="2">Video</td> <td>WMV</td> <td> </td> -<td>X</td> +<td style="text-align: center;">X</td> <td>Versions 7, 8 and 9. Simple profile only</td> <td>Windows Media Video (.wmv)</td> </tr> + +<tr> +<td>H.264 AVC</td> +<td> </td> +<td style="text-align: center;">X</td> +<td>Limited to baseline profile up to 480x320, and 600 kbps average bitrate for the video stream.</td> +<td>3GPP (.3gp) and MPEG-4 (.mp4)</td> +</tr> + </tbody></table> |