mako: add flac and vp8 codec

- flac and vp8 using android default codec
- these codecs are supported
  (http://developer.android.com/guide/appendix/media-formats.html)
- use libstagefright_soft_flacenc.so as flac encoder
- use libstagefright_soft_vpxdec.so as vp8 decoder
- cleanup media_codec.xml

Change-Id: I64a16b3199085950a01523e80645eb348a4bd265

1 files changed, 62 insertions, 44 deletions

diff --git a/media_codecs.xml b/media_codecs.xml
index ca98ccf..d5d30c9 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -1,44 +1,62 @@
-<CodecList>
-<Encoders>
-<MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
-  <Quirk name="requires-allocate-on-input-ports" />
-  <Quirk name="requires-allocate-on-output-ports"/>
-  <Quirk name="requires-loaded-to-idle-after-allocation"/>
-</MediaCodec>
-<MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
-<MediaCodec name="AACEncoder" type="audio/mp4a-latm" />
-<MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
-</Encoders>
-<Decoders>
-<MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
-<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.qcom.video.decoder.avc" type="video/avc" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports"/>
- <Quirk name="defers-output-buffer-allocation"/>
-</MediaCodec>
-<MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
-<Quirk name="requires-allocate-on-input-ports" />
-<Quirk name="requires-allocate-on-output-ports"/>
-<Quirk name="defers-output-buffer-allocation"/>
-</MediaCodec>
-<MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
- <Quirk name="requires-allocate-on-input-ports" />
- <Quirk name="requires-allocate-on-output-ports"/>
- <Quirk name="defers-output-buffer-allocation"/>
-</MediaCodec>
-<MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
-<Quirk name="requires-allocate-on-input-ports" />
-<Quirk name="requires-allocate-on-output-ports"/>
-<Quirk name="defers-output-buffer-allocation"/>
-</MediaCodec>
-<MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
-<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mpeg4" />
-<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
-</Decoders>
-</CodecList>
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<MediaCodecs>
+    <Encoders>
+        <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports"/>
+            <Quirk name="requires-loaded-to-idle-after-allocation"/>
+        </MediaCodec>
+        <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
+        <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
+        <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
+        <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
+    </Encoders>
+    <Decoders>
+        <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
+        <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.qcom.video.decoder.avc" type="video/avc" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports"/>
+            <Quirk name="defers-output-buffer-allocation"/>
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports"/>
+            <Quirk name="defers-output-buffer-allocation"/>
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports"/>
+            <Quirk name="defers-output-buffer-allocation"/>
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports"/>
+            <Quirk name="defers-output-buffer-allocation"/>
+        </MediaCodec>
+        <MediaCodec name="OMX.google.vpx.decoder" type="video/x-vnd.on2.vp8" />
+        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" />
+        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mpeg4" />
+        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
+    </Decoders>
+</MediaCodecs>