Fix ffmpeg library loading. Create a DecoderRenderer interface and use it to move the MediaCodec code into for Qualcomm devices.

2026-04-20 23:40:11 +00:00 · 2013-11-19 02:49:33 -05:00
parent 2c2e713166
commit 0504bed5e9
49 changed files with 246 additions and 114 deletions
--- a/jni/ffmpeg/Android.mk
+++ b/jni/ffmpeg/Android.mk
@@ -2,36 +2,36 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libavcodec
-LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libavcodec.so
+LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libavcodec-55.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libavformat
-LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libavformat.so
+LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libavformat-55.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libswscale
-LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libswscale.so
+LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libswscale-2.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libavutil
-LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libavutil.so
+LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libavutil-52.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libavfilter
-LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libavfilter.so
+LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libavfilter-3.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libwsresample
-LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libswresample.so
+LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/lib/libswresample-0.so
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 include $(PREBUILT_SHARED_LIBRARY)
--- a/jni/ffmpeg/armeabi-v7a/lib/libavcodec-55.so
+++ b/jni/ffmpeg/armeabi-v7a/lib/libavcodec-55.so
--- a/jni/ffmpeg/armeabi-v7a/lib/libavcodec.so.55
+++ b/jni/ffmpeg/armeabi-v7a/lib/libavcodec.so.55
--- a/jni/ffmpeg/armeabi-v7a/lib/libavfilter-3.so
+++ b/jni/ffmpeg/armeabi-v7a/lib/libavfilter-3.so
--- a/jni/ffmpeg/armeabi-v7a/lib/libavformat-55.so
+++ b/jni/ffmpeg/armeabi-v7a/lib/libavformat-55.so
--- a/jni/ffmpeg/armeabi-v7a/lib/libavutil-52.so
+++ b/jni/ffmpeg/armeabi-v7a/lib/libavutil-52.so
--- a/jni/ffmpeg/armeabi-v7a/lib/libswresample-0.so
+++ b/jni/ffmpeg/armeabi-v7a/lib/libswresample-0.so
--- a/jni/ffmpeg/armeabi-v7a/lib/libswscale-2.so
+++ b/jni/ffmpeg/armeabi-v7a/lib/libswscale-2.so
--- a/jni/ffmpeg/armeabi/lib/libavcodec-55.so
+++ b/jni/ffmpeg/armeabi/lib/libavcodec-55.so
--- a/jni/ffmpeg/armeabi/lib/libavfilter-3.so
+++ b/jni/ffmpeg/armeabi/lib/libavfilter-3.so
--- a/jni/ffmpeg/armeabi/lib/libavformat-55.so
+++ b/jni/ffmpeg/armeabi/lib/libavformat-55.so
--- a/jni/ffmpeg/armeabi/lib/libavutil-52.so
+++ b/jni/ffmpeg/armeabi/lib/libavutil-52.so
--- a/jni/ffmpeg/armeabi/lib/libswresample-0.so
+++ b/jni/ffmpeg/armeabi/lib/libswresample-0.so
--- a/jni/ffmpeg/armeabi/lib/libswresample.so
+++ b/jni/ffmpeg/armeabi/lib/libswresample.so
--- a/jni/ffmpeg/armeabi/lib/libswscale-2.so
+++ b/jni/ffmpeg/armeabi/lib/libswscale-2.so
--- a/jni/ffmpeg/x86/lib/libavcodec-55.so
+++ b/jni/ffmpeg/x86/lib/libavcodec-55.so
--- a/jni/ffmpeg/x86/lib/libavfilter-3.so
+++ b/jni/ffmpeg/x86/lib/libavfilter-3.so
--- a/jni/ffmpeg/x86/lib/libavformat-55.so
+++ b/jni/ffmpeg/x86/lib/libavformat-55.so
--- a/jni/ffmpeg/x86/lib/libavutil-52.so
+++ b/jni/ffmpeg/x86/lib/libavutil-52.so
--- a/jni/ffmpeg/x86/lib/libswresample-0.so
+++ b/jni/ffmpeg/x86/lib/libswresample-0.so
--- a/jni/ffmpeg/x86/lib/libswscale-2.so
+++ b/jni/ffmpeg/x86/lib/libswscale-2.so