Skip to content

Commit b79d8ec

Browse files
committed
udpate media formats for JB
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
1 parent 4420402 commit b79d8ec

File tree

1 file changed

+21
-10
lines changed

1 file changed

+21
-10
lines changed

docs/html/guide/appendix/media-formats.jd

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ page.title=Android Supported Media Formats
5757

5858
<p class="table-caption" id="formats-table"><strong>Table 1.</strong> Core media format and codec support.</p>
5959

60-
<table>
60+
<table style="font-size:12px">
6161
<tbody>
6262

6363
<tr>
@@ -70,29 +70,39 @@ page.title=Android Supported Media Formats
7070
</tr>
7171

7272
<tr>
73-
<td rowspan="10">Audio</td>
74-
<td>AAC LC/LTP</td>
73+
<td rowspan="11">Audio</td>
74+
<td>AAC LC</td>
7575
<td style="text-align: center;"><big>&bull;</big></td>
7676
<td style="text-align: center;"><big>&bull;</big></td>
77-
<td rowspan="3">Mono/Stereo content in any combination of standard bit
78-
rates up to 160 kbps and sampling rates from 8 to 48kHz</td>
79-
<td rowspan="3">
77+
<td rowspan="2">Support for mono/stereo/5.0/5.1
78+
content with standard sampling rates from 8 to 48 kHz.</td>
79+
<td rowspan="4">
8080
&bull; 3GPP (.3gp)<br>
81-
&bull; MPEG-4 (.mp4, .m4a)<br>
81+
<nobr>&bull; MPEG-4 (.mp4, .m4a)</nobr><br>
8282
&bull; ADTS raw AAC (.aac, decode in Android 3.1+, encode in Android 4.0+, ADIF not supported)<br>
8383
&bull; MPEG-TS (.ts, not seekable, Android 3.0+)</td>
8484
</tr>
8585

8686
<tr>
8787
<td>HE-AACv1 (AAC+)</td>
88-
<td>&nbsp;</td>
88+
<td style="text-align: center;"><big>&bull;</big><br><small>(Android 4.1+)</small></td>
8989
<td style="text-align: center;"><big>&bull;</big></td>
9090
</tr>
9191

9292
<tr>
9393
<td>HE-AACv2 (enhanced AAC+)</td>
9494
<td>&nbsp;</td>
9595
<td style="text-align: center;"><big>&bull;</big></td>
96+
<td>Support for stereo/5.0/5.1
97+
content with standard sampling rates from 8 to 48 kHz.</td>
98+
</tr>
99+
100+
<tr>
101+
<td>AAC ELD (enhanced low delay AAC)</td>
102+
<td style="text-align: center;"><big>&bull;</big><br><small>(Android 4.1+)</small></td>
103+
<td style="text-align: center;"><big>&bull;</big><br><small>(Android 4.1+)</small></td>
104+
<td>Support for mono/stereo content
105+
with standard sampling rates from 16 to 48 kHz</td>
96106
</tr>
97107

98108
<tr>
@@ -160,9 +170,10 @@ no dither applied for 24-bit.
160170

161171
<tr>
162172
<td>PCM/WAVE</td>
163-
<td>&nbsp;</td>
173+
<td style="text-align: center;"><big>&bull;</big><br><small>(Android 4.1+)</small></td>
164174
<td style="text-align: center;"><big>&bull;</big></td>
165-
<td>8- and 16-bit linear PCM (rates up to limit of hardware)</td>
175+
<td>8- and 16-bit linear PCM (rates up to limit of hardware). Sampling
176+
rates for raw PCM recordings at 8000, 16000 and 44100 Hz.</td>
166177
<td>
167178
WAVE (.wav)</td>
168179
</tr>

0 commit comments

Comments
 (0)