summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lajos Molnar <lajos@google.com> 2016-06-23 17:52:48 -0700
committer Lajos Molnar <lajos@google.com> 2016-06-28 14:20:31 +0000
commit671da98e2d13d4777f25134057dcd37c32700d69 (patch)
treec3f3fdd50f30baf5e985b54626f5c94c4aa79321
parent0e792f567ac1b37a75e94e1ff1017f2f152494ef (diff)
media: document VP9 CSD for MediaCodec
Also document that concatenated CSD is only supported for AVC. Bug: 10672559 Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
-rw-r--r--media/java/android/media/MediaCodec.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index 71d1aaafe45f..81ac5943974f 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -297,8 +297,8 @@ import java.util.Map;
Codec-specific data in the format is automatically submitted to the codec upon {@link #start};
you <strong>MUST NOT</strong> submit this data explicitly. If the format did not contain codec
specific data, you can choose to submit it using the specified number of buffers in the correct
- order, according to the format requirements. Alternately, you can concatenate all codec-specific
- data and submit it as a single codec-config buffer.
+ order, according to the format requirements. In case of H.264 AVC, you can also concatenate all
+ codec-specific data and submit it as a single codec-config buffer.
<p>
Android uses the following codec-specific data buffers. These are also required to be set in
the track format for proper {@link MediaMuxer} track configuration. Each parameter set and the
@@ -355,6 +355,13 @@ import java.util.Map;
<td class=NA>Not Used</td>
<td class=NA>Not Used</td>
</tr>
+ <tr>
+ <td>VP9</td>
+ <td>VP9 <a href="http://wiki.webmproject.org/vp9-codecprivate">CodecPrivate</a> Data
+ (optional)</td>
+ <td class=NA>Not Used</td>
+ <td class=NA>Not Used</td>
+ </tr>
</tbody>
</table>