ffmpeg: include binary

Author: T-Dynamos

pythonforandroid/recipes/android/src/android/_android.pyx

@@ -280,6 +280,41 @@ class AndroidBrowser(object):
 import webbrowser
 webbrowser.register('android', AndroidBrowser)
 
+# Native executable support on Android.
+#
+# Android restricts execve() to specific app-owned paths (including the native
+# library directory) and resolves native dependencies via the dynamic linker.
+# To run standalone binaries (e.g. ffmpeg), they are placed in
+# ApplicationInfo.nativeLibraryDir and LD_LIBRARY_PATH is set accordingly.
+
+from android import mActivity
+from os.path import join
+from os import environ
+
+_NATIVE_LIB_DIR = mActivity.getApplicationInfo().nativeLibraryDir
+
+# ensure dynamic linker can resolve bundled native dependencies
+environ["LD_LIBRARY_PATH"] = _NATIVE_LIB_DIR
+
+_EXECUTABLES = {
+    "ffmpeg": "libffmpegbin.so",
+}
+
+def get_executable(name):
+    """
+    Return absolute path to an executable stored in the app's native
+    library directory.
+    """
+    try:
+        filename = _EXECUTABLES[name]
+    except KeyError:
+        available = ", ".join(sorted(_EXECUTABLES))
+        raise KeyError(
+            f"Unknown executable {name}. Available executables: {available}"
+        )
+
+    return join(_NATIVE_LIB_DIR, filename)
+
 
 def start_service(title="Background Service",
                   description="", arg="",

pythonforandroid/recipes/ffmpeg/__init__.py

@@ -1,15 +1,27 @@
 from pythonforandroid.toolchain import Recipe, current_directory, shprint
 from os.path import exists, join, realpath
 import sh
+from multiprocessing import cpu_count
 
 
 class FFMpegRecipe(Recipe):
     version = 'n6.1.2'
     # Moved to github.com instead of ffmpeg.org to improve download speed
     url = 'https://github.com/FFmpeg/FFmpeg/archive/{version}.zip'
-    depends = ['sdl2']  # Need this to build correct recipe order
+    depends = [('sdl2', 'sdl3')]  # Need this to build correct recipe order
     opts_depends = ['openssl', 'ffpyplayer_codecs', 'av_codecs']
     patches = ['patches/configure.patch']
+    _libs = [
+        "libavcodec.so",
+        "libavfilter.so",
+        "libavutil.so",
+        "libswscale.so",
+        "libavdevice.so",
+        "libavformat.so",
+        "libswresample.so",
+        "libffmpegbin.so",
+    ]
+    built_libraries = dict.fromkeys(_libs, "./lib")
 
     def should_build(self, arch):
         build_dir = self.get_build_dir(arch.arch)
@@ -98,9 +110,8 @@ def build_arch(self, arch):
                 '--disable-symver',
             ]
 
-            # disable binaries / doc
+            # disable doc
             flags += [
-                '--disable-programs',
                 '--disable-doc',
             ]
 
@@ -148,11 +159,9 @@ def build_arch(self, arch):
 
             configure = sh.Command('./configure')
             shprint(configure, *flags, _env=env)
-            shprint(sh.make, '-j4', _env=env)
+            shprint(sh.make, '-j', f"{cpu_count()}", _env=env)
             shprint(sh.make, 'install', _env=env)
-            # copy libs:
-            sh.cp('-a', sh.glob('./lib/lib*.so'),
-                  self.ctx.get_libs_dir(arch.arch))
+            shprint(sh.cp, "ffmpeg", "./lib/libffmpegbin.so")
 
 
 recipe = FFMpegRecipe()