diff options
| author | Dirk Dougherty <> | 2009-04-15 11:29:53 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-15 11:29:53 -0700 |
| commit | d9671b8e05806742c7a592fda3208e6134f4acd6 (patch) | |
| tree | be27640b22a4f1ba3a749fb3f40de53f77480d6d /docs/html | |
| parent | b01b0cb4b646547c9f3a50543a0004979dac5910 (diff) | |
| download | frameworks_base-d9671b8e05806742c7a592fda3208e6134f4acd6.zip frameworks_base-d9671b8e05806742c7a592fda3208e6134f4acd6.tar.gz frameworks_base-d9671b8e05806742c7a592fda3208e6134f4acd6.tar.bz2 | |
AI 146341: g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change)
BUG=1675368
Automated import of CL 146341
Diffstat (limited to 'docs/html')
| -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 5419ad6..323192d 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> |