diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-19 15:03:48 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2014-03-21 14:04:17 -0700 |
| commit | 2c46bc2e89bd77e32770ce4fd2d882b8c046ed30 (patch) | |
| tree | 64056addffedeace535f01984a93dd5a93102f90 /camera | |
| parent | 4b038a8f2c2ddff7b4c6fc7c82927300b38561c5 (diff) | |
| download | android_device_generic_goldfish-2c46bc2e89bd77e32770ce4fd2d882b8c046ed30.tar.gz android_device_generic_goldfish-2c46bc2e89bd77e32770ce4fd2d882b8c046ed30.tar.bz2 android_device_generic_goldfish-2c46bc2e89bd77e32770ce4fd2d882b8c046ed30.zip | |
stagefright: use media_codecs_google*.xml files
Bug: 13549114
Change-Id: I067651e29fecf3f1219ff3f8b802b47c208e461c
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/media_codecs.xml | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/camera/media_codecs.xml b/camera/media_codecs.xml index 31aa8b3..87d11f2 100644 --- a/camera/media_codecs.xml +++ b/camera/media_codecs.xml @@ -16,10 +16,12 @@ <!-- <!DOCTYPE MediaCodecs [ -<!ELEMENT MediaCodecs (Decoders,Encoders)> -<!ELEMENT Decoders (MediaCodec*)> -<!ELEMENT Encoders (MediaCodec*)> -<!ELEMENT MediaCodec (Type*,Quirk*)> +<!ELEMENT Include EMPTY> +<!ATTLIST Include href CDATA #REQUIRED> +<!ELEMENT MediaCodecs (Decoders|Encoders|Include)*> +<!ELEMENT Decoders (MediaCodec|Include)*> +<!ELEMENT Encoders (MediaCodec|Include)*> +<!ELEMENT MediaCodec (Type|Quirk|Include)*> <!ATTLIST MediaCodec name CDATA #REQUIRED> <!ATTLIST MediaCodec type CDATA> <!ELEMENT Type EMPTY> @@ -76,32 +78,7 @@ Only the three quirks included above are recognized at this point: --> <MediaCodecs> - <Decoders> - <MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg" /> - <MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp" /> - <MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb" /> - <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" /> - <MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw" /> - <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" /> - <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" /> - <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" /> - <MediaCodec name="OMX.google.gsm.decoder" type="audio/gsm" /> - - <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" /> - <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" /> - <MediaCodec name="OMX.google.h264.decoder" type="video/avc" /> - <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" /> - <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" /> - </Decoders> - - <Encoders> - <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" /> - <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" /> - <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" /> - <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" /> - <MediaCodec name="OMX.google.h264.encoder" type="video/avc" /> - <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" /> - <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" /> - <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" /> - </Encoders> + <Include href="media_codecs_google_audio.xml" /> + <Include href="media_codecs_google_telephony.xml" /> + <Include href="media_codecs_google_video.xml" /> </MediaCodecs> |