From 88a1fc2d79d48258c2f67ee32157ec25eb71c94d Mon Sep 17 00:00:00 2001
From: Dirk Dougherty <ddougherty@google.com>
Date: Fri, 1 Apr 2011 15:55:28 -0700
Subject: Doc change: update media formats tables with adts/aac and flac

Change-Id: Ic541f9e4ea1907453041d017d7d3608ead45ed6f
---
 docs/html/guide/appendix/media-formats.jd | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd
index 8509466d4856..34a4c1861c56 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>&bull;</big></td>
 <td style="text-align: center;"><big>&bull;</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>
@@ -100,6 +101,18 @@ page.title=Android Supported Media Formats
 <td>3GPP (.3gp)</td>
 </tr>
 
+<tr>
+<td>FLAC</td>
+<td>&nbsp;</td>
+<td style="text-align: center;"><big>&bull;</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>&nbsp;</td>
-- 
cgit v1.2.3-59-g8ed1b