aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Harrison <khwebmail@gmail.com>2018-05-08 12:49:58 +0100
committerCharlie-117 <gmoto1179@gmail.com>2020-12-02 18:44:38 +0530
commitd9c64bcd07ca6330aa1567adb2f6ecafaa123932 (patch)
treede9b9d15fc2fea91f5e1a81a655a047bf6b74c5b
parentc5b7ed74a65e59338ad0d1a9220a1b82aa1017c0 (diff)
media: merlin should use the lower-end Google codecs
Change-Id: I904ed5b9381887bb6337fdf9dbbf291073bcd6f3 Signed-off-by: Charlie-117 <gmoto1179@gmail.com>
-rw-r--r--configs/media_codecs.xml2
-rw-r--r--device.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index 14a9e40..7a7baeb 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -116,5 +116,5 @@
</MediaCodec>
</Decoders>
<!-- Video Software -->
- <Include href="media_codecs_google_video.xml" />
+ <Include href="media_codecs_google_video_le.xml" />
</MediaCodecs>
diff --git a/device.mk b/device.mk
index 0ca447b..4c9b138 100644
--- a/device.mk
+++ b/device.mk
@@ -35,6 +35,7 @@ PRODUCT_COPY_FILES += \
# Media
PRODUCT_COPY_FILES += \
+ frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml \
$(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
$(LOCAL_PATH)/configs/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
$(LOCAL_PATH)/configs/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml