From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Tue, 25 Apr 2017 10:13:42 +0000 (+0800)
Subject: Enable Stagefright FFMPEG plugins
X-Git-Tag: android-x86-7.1-r1~34
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=7f5c1f87c60d11a1e1fac226b2dbc4749bc6c7be

Enable Stagefright FFMPEG plugins

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
---

diff --git a/device.mk b/device.mk
index 25f4100..c5359bd 100644
--- a/device.mk
+++ b/device.mk
@@ -20,7 +20,9 @@ PRODUCT_PROPERTY_OVERRIDES := \
     ro.ril.hsxpa=1 \
     ro.ril.gprsclass=10 \
     keyguard.no_require_sim=true \
-    ro.com.android.dataroaming=true
+    ro.com.android.dataroaming=true \
+    media.sf.omx-plugin=libffmpeg_omx.so \
+    media.sf.extractor-plugin=libffmpeg_extractor.so
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \
     ro.arch=x86 \
diff --git a/media_codecs.xml b/media_codecs.xml
index ba1fbdb..5b31bac 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -78,6 +78,7 @@ Only the three quirks included above are recognized at this point:
 -->
 
 <MediaCodecs>
+    <Include href="media_codecs_ffmpeg.xml" />
     <Include href="media_codecs_google_audio.xml" />
     <Include href="media_codecs_google_video.xml" />
 </MediaCodecs>
diff --git a/packages.mk b/packages.mk
index 0e9889a..31bcaa4 100644
--- a/packages.mk
+++ b/packages.mk
@@ -85,6 +85,13 @@ PRODUCT_PACKAGES += \
     hciconfig \
     hcitool \
 
+# Stagefright FFMPEG plugins
+PRODUCT_PACKAGES += \
+    i965_drv_video \
+    libffmpeg_extractor \
+    libffmpeg_omx \
+    media_codecs_ffmpeg.xml
+
 # Third party apps
 PRODUCT_PACKAGES += \
     CMFileManager \