moved android and local headers to ffmpeg5

gpac · Mar 12, 2022 · a2b059c · a2b059c
1 parent f6b88a1
commit a2b059c
Show file tree

Hide file tree

Showing 201 changed files with 6,320 additions and 34,240 deletions.
diff --git a/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GPACInstance.java b/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GPACInstance.java
@@ -63,14 +63,13 @@ synchronized static Map<String, Throwable> loadAllLibraries(GpacConfig config) {
         if (errors != null)
             return errors;
         StringBuilder sb = new StringBuilder();
-        final String[] toLoad = { "GLESv2", "log",//$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-                                 "jpegdroid", "javaenv", //$NON-NLS-1$ //$NON-NLS-2$
-                                 "mad", "ft2", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                                 "openjpeg", "png", "z", //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$
-                                 "stlport_shared", "stdc++", "faad", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+        final String[] toLoad = { "GLESv2", "log",
+                                 "jpegdroid", "javaenv",
+                                 "mad", "ft2", "faad",
+                                 "openjpeg", "png", "z",
                                  "avutil", "swscale", "swresample", "avcodec", "avformat", "avfilter", "avdevice",
                                  "gpacWrapper", "gpac",
-                                 "gm_droid_mpegv" }; // //$NON-NLS-1$ //$NON-NLS-2$
+                                 "gm_droid_mpegv" };
         HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
         for (String s : toLoad) {
             try {

diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.xml
@@ -13,6 +13,6 @@
         </activity>
 
     </application>
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="23" />
 
-</manifest> 
+</manifest>
diff --git a/build/android/default.properties b/build/android/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-23
diff --git a/build/android/jni/Application.mk b/build/android/jni/Application.mk
@@ -1,5 +1,5 @@
-APP_ABI := armeabi armeabi-v7a x86
-APP_STL := gnustl_static
+APP_ABI := x86 armeabi-v7a
+APP_STL := c++_static
 APP_CPPFLAGS := -frtti -fexceptions -Wno-parentheses -Wno-shift-negative-value -Wno-pointer-sign
 APP_CFLAGS := -Wno-parentheses -Wno-shift-negative-value -Wno-pointer-sign
 LOCAL_CFLAGS := -O3

diff --git a/build/android/jni/common.mk b/build/android/jni/common.mk
@@ -1,8 +1,5 @@
 COMMON_PATH := $(call my-dir)
 
-#Settings common to all JNI Builds
-TARGET_PLATFORM	 := android-4
-
 # Common Flags for ligpac and modules
 LOCAL_CFLAGS += -DGPAC_CONFIG_ANDROID
 LOCAL_CFLAGS +=	-DGPAC_HAVE_CONFIG_H
@@ -11,4 +8,4 @@ LOCAL_CFLAGS += -DGPAC_HAS_IPV6
 LOCAL_CFLAGS += -Wno-shift-negative-value
 LOCAL_CFLAGS += -Wno-deprecated-declarations
 LOCAL_CFLAGS += -Wno-pointer-sign
-LOCAL_LDLIBS += -Wl,--no-warn-shared-textrel
+# LOCAL_LDLIBS += -Wl,--no-warn-shared-textrel
diff --git a/build/android/jni/libgpac/Android.mk b/build/android/jni/libgpac/Android.mk
@@ -1,5 +1,4 @@
 LOCAL_PATH:= $(call my-dir)
-APP_ABI          := armeabi armeabi-v7a x86
 
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/../common.mk
@@ -15,7 +14,6 @@ LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/freetype/freety
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/jpeg/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/png/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/faad
-LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/ffmpeg_android/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/openjpeg
 +LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/openssl_android/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../modules

diff --git a/build/android/jni/libgpac/Application.mk b/build/android/jni/libgpac/Application.mk
@@ -1,6 +1,5 @@
 LOCAL_PATH:= $(call my-dir)
 include $(LOCAL_PATH)/../common.mk
-APP_ABI          := armeabi armeabi-v7a x86
 APP_MODULES := gpac
 
 #APP_CFLAGS += -Wno-shift-negative-value -Wno-pointer-sign
diff --git a/build/android/jni/modules/Application.mk b/build/android/jni/modules/Application.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 include $(LOCAL_PATH)/../common.mk
-APP_ABI          := armeabi-v7a armeabi x86
+
 APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/jni/modules/Android.mk
-APP_MODULES := gm_ft_font gm_droid_out libjavaenv gm_droid_audio gm_droid_mpegv 
+APP_MODULES := gm_ft_font gm_droid_out libjavaenv gm_droid_audio gm_droid_mpegv
 
 #old modules to backport or drop
 #APP_MODULES :=  gm_widgetman gm_droid_cam gm_osd gm_mediacodec_dec

diff --git a/build/android/jni/wrapper/Application.mk b/build/android/jni/wrapper/Application.mk
@@ -1,5 +1,4 @@
 LOCAL_PATH:= $(call my-dir)
 include $(LOCAL_PATH)/../common.mk
-APP_ABI          := armeabi armeabi-v7a x86
-APP_MODULES := gpacWrapper
 
+APP_MODULES := gpacWrapper
diff --git a/extra_lib/include/ffmpeg_android/libavcodec/ac3_parser.h b/extra_lib/include/ffmpeg_android/libavcodec/ac3_parser.h
diff --git a/extra_lib/include/ffmpeg_android/libavcodec/adts_parser.h b/extra_lib/include/ffmpeg_android/libavcodec/adts_parser.h