From b578d44123096aa41a6e6d328d416fdcc9ac5d01 Mon Sep 17 00:00:00 2001
From: Ziyann <jaraidaniel@gmail.com>
Date: Thu, 20 Nov 2014 11:44:00 +0100
Subject: tuna: stagefright: use media_codecs_google*.xml files

Change-Id: I66d6128fa2e88b8986dc88625bf7ff08de7f7049
---
 device.mk        |  3 +++
 media_codecs.xml | 24 +++---------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/device.mk b/device.mk
index 3ed6c8f..4969058 100755
--- a/device.mk
+++ b/device.mk
@@ -88,6 +88,9 @@ PRODUCT_COPY_FILES += \
 
 # Media profiles
 PRODUCT_COPY_FILES += \
+	frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
+	frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
+	frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
 	$(DEVICE_FOLDER)/media_profiles.xml:system/etc/media_profiles.xml \
 	$(DEVICE_FOLDER)/media_codecs.xml:system/etc/media_codecs.xml
 
diff --git a/media_codecs.xml b/media_codecs.xml
index 4dc85f8..52d79e3 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -76,6 +76,8 @@ Only the three quirks included above are recognized at this point:
 -->
 
 <MediaCodecs>
+    <Include href="media_codecs_google_audio.xml" />
+    <Include href="media_codecs_google_telephony.xml" />
     <Decoders>
         <MediaCodec name="OMX.TI.DUCATI1.VIDEO.DECODER" >
             <Type name="video/mp4v-es" />
@@ -84,21 +86,6 @@ Only the three quirks included above are recognized at this point:
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
         </MediaCodec>
-
-        <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.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>
@@ -113,11 +100,6 @@ Only the three quirks included above are recognized at this point:
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
         </MediaCodec>
-
-        <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
-        <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
-        <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
-        <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_video.xml" />
 </MediaCodecs>
-- 
cgit v1.1