Move ffmpeg integration from litr-muxers to litr-ffmpeg module

linkedin · Dec 11, 2023 · dbe09a4 · dbe09a4
1 parent b10ebca
commit dbe09a4
Show file tree

Hide file tree

Showing 36 changed files with 55 additions and 36 deletions.
diff --git a/litr-demo/build.gradle b/litr-demo/build.gradle
@@ -42,7 +42,9 @@ android {
 dependencies {
     implementation project(':litr')
     implementation project(':litr-filters')
-    implementation project(':litr-muxers')
+
+    // uncomment to experiment with ffmpeg
+    // implementation project(':litr-ffmpeg')
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.0'

diff --git a/litr-demo/src/main/java/com/linkedin/android/litr/demo/data/RecordCameraPresenter.kt b/litr-demo/src/main/java/com/linkedin/android/litr/demo/data/RecordCameraPresenter.kt
@@ -22,7 +22,7 @@ import com.linkedin.android.litr.codec.MediaCodecEncoder
 import com.linkedin.android.litr.exception.MediaTransformationException
 import com.linkedin.android.litr.filter.GlFilter
 import com.linkedin.android.litr.io.*
-import com.linkedin.android.litr.muxers.NativeMediaMuxerMediaTarget
+// import com.linkedin.android.litr.muxers.NativeMediaMuxerMediaTarget
 import com.linkedin.android.litr.render.GlVideoRenderer
 import java.util.UUID
 
@@ -131,20 +131,27 @@ class RecordCameraPresenter(
         targetMedia: TargetMedia,
         enableNativeMuxer: Boolean
     ): MediaTarget {
-        return if (enableNativeMuxer) {
-            NativeMediaMuxerMediaTarget(
-                targetMedia.targetFile.path,
-                2,
-                0,
-                MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4
-            )
-        } else {
-            MediaMuxerMediaTarget(
-                targetMedia.targetFile.path,
-                2,
-                0,
-                MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4
-            )
-        }
+        return MediaMuxerMediaTarget(
+            targetMedia.targetFile.path,
+            2,
+            0,
+            MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4
+        )
+        // remove above code and uncomment if need to experiment with ffmpeg muxer
+//        return if (enableNativeMuxer) {
+//            NativeMediaMuxerMediaTarget(
+//                targetMedia.targetFile.path,
+//                2,
+//                0,
+//                MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4
+//            )
+//        } else {
+//            MediaMuxerMediaTarget(
+//                targetMedia.targetFile.path,
+//                2,
+//                0,
+//                MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4
+//            )
+//        }
     }
 }
diff --git a/litr-demo/src/main/java/com/linkedin/android/litr/demo/data/TranscodeVideoGlPresenter.kt b/litr-demo/src/main/java/com/linkedin/android/litr/demo/data/TranscodeVideoGlPresenter.kt
@@ -25,7 +25,7 @@ import com.linkedin.android.litr.io.MediaMuxerMediaTarget
 import com.linkedin.android.litr.io.MediaRange
 import com.linkedin.android.litr.io.MediaSource
 import com.linkedin.android.litr.io.MediaTarget
-import com.linkedin.android.litr.muxers.NativeMediaMuxerMediaTarget
+//import com.linkedin.android.litr.muxers.NativeMediaMuxerMediaTarget
 import com.linkedin.android.litr.render.AudioRenderer
 import com.linkedin.android.litr.render.GlVideoRenderer
 import java.util.UUID
@@ -156,21 +156,30 @@ class TranscodeVideoGlPresenter(
         else
             MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4
 
-        return if (enableNativeMuxer) {
-            NativeMediaMuxerMediaTarget(
-                targetMedia.targetFile.absolutePath,
-                targetMedia.includedTrackCount,
-                videoRotation,
-                outputFormat
-            )
-        } else {
-            MediaMuxerMediaTarget(
-                context,
-                Uri.fromFile(targetMedia.targetFile),
-                targetMedia.includedTrackCount,
-                videoRotation,
-                outputFormat
-            )
-        }
+        return MediaMuxerMediaTarget(
+            context,
+            Uri.fromFile(targetMedia.targetFile),
+            targetMedia.includedTrackCount,
+            videoRotation,
+            outputFormat
+        )
+
+        // remove above code and uncomment if need to experiment with ffmpeg muxer
+//        return if (enableNativeMuxer) {
+//            NativeMediaMuxerMediaTarget(
+//                targetMedia.targetFile.absolutePath,
+//                targetMedia.includedTrackCount,
+//                videoRotation,
+//                outputFormat
+//            )
+//        } else {
+//            MediaMuxerMediaTarget(
+//                context,
+//                Uri.fromFile(targetMedia.targetFile),
+//                targetMedia.includedTrackCount,
+//                videoRotation,
+//                outputFormat
+//            )
+//        }
     }
 }
diff --git a/litr-muxers/.gitignore → litr-ffmpeg/.gitignore b/litr-muxers/.gitignore → litr-ffmpeg/.gitignore
diff --git a/litr-muxers/README.md → litr-ffmpeg/README.md b/litr-muxers/README.md → litr-ffmpeg/README.md
@@ -1,6 +1,7 @@
 # Litr Muxers module
 
-The Litr Muxers module provides `NativeMediaMuxerMediaTarget`, which uses FFmpeg for muxing 
+The Litr FFmpeg module provides integration with ffmpeg. Currently, it offers 
+`NativeMediaMuxerMediaTarget`, which uses FFmpeg for muxing 
 individual streams into a target file container.
 
 ## Build instructions (Linux, macOS)

diff --git a/litr-muxers/build.gradle → litr-ffmpeg/build.gradle b/litr-muxers/build.gradle → litr-ffmpeg/build.gradle
diff --git a/litr-muxers/src/main/AndroidManifest.xml → litr-ffmpeg/src/main/AndroidManifest.xml b/litr-muxers/src/main/AndroidManifest.xml → litr-ffmpeg/src/main/AndroidManifest.xml
diff --git a/litr-muxers/src/main/cpp/CMakeLists.txt → litr-ffmpeg/src/main/cpp/CMakeLists.txt b/litr-muxers/src/main/cpp/CMakeLists.txt → litr-ffmpeg/src/main/cpp/CMakeLists.txt
diff --git a/litr-muxers/src/main/cpp/FFmpeg.h → litr-ffmpeg/src/main/cpp/FFmpeg.h b/litr-muxers/src/main/cpp/FFmpeg.h → litr-ffmpeg/src/main/cpp/FFmpeg.h
diff --git a/litr-muxers/src/main/cpp/Logging.h → litr-ffmpeg/src/main/cpp/Logging.h b/litr-muxers/src/main/cpp/Logging.h → litr-ffmpeg/src/main/cpp/Logging.h
diff --git a/litr-muxers/src/main/cpp/MediaMuxer.cpp → litr-ffmpeg/src/main/cpp/MediaMuxer.cpp b/litr-muxers/src/main/cpp/MediaMuxer.cpp → litr-ffmpeg/src/main/cpp/MediaMuxer.cpp
diff --git a/litr-muxers/src/main/cpp/MediaMuxer.h → litr-ffmpeg/src/main/cpp/MediaMuxer.h b/litr-muxers/src/main/cpp/MediaMuxer.h → litr-ffmpeg/src/main/cpp/MediaMuxer.h
diff --git a/litr-muxers/src/main/cpp/NativeLogger.cpp → litr-ffmpeg/src/main/cpp/NativeLogger.cpp b/litr-muxers/src/main/cpp/NativeLogger.cpp → litr-ffmpeg/src/main/cpp/NativeLogger.cpp
diff --git a/...-muxers/src/main/cpp/NativeMediaMuxer.cpp → ...-ffmpeg/src/main/cpp/NativeMediaMuxer.cpp b/...-muxers/src/main/cpp/NativeMediaMuxer.cpp → ...-ffmpeg/src/main/cpp/NativeMediaMuxer.cpp
diff --git a/litr-muxers/src/main/cpp/build_ffmpeg.sh → litr-ffmpeg/src/main/cpp/build_ffmpeg.sh b/litr-muxers/src/main/cpp/build_ffmpeg.sh → litr-ffmpeg/src/main/cpp/build_ffmpeg.sh
diff --git a/...ers/src/main/cpp/ffmpeg_bundled/README.md → ...peg/src/main/cpp/ffmpeg_bundled/README.md b/...ers/src/main/cpp/ffmpeg_bundled/README.md → ...peg/src/main/cpp/ffmpeg_bundled/README.md
diff --git a/...dled/android-libs/arm64-v8a/libavcodec.so → ...dled/android-libs/arm64-v8a/libavcodec.so b/...dled/android-libs/arm64-v8a/libavcodec.so → ...dled/android-libs/arm64-v8a/libavcodec.so
diff --git a/...led/android-libs/arm64-v8a/libavformat.so → ...led/android-libs/arm64-v8a/libavformat.so b/...led/android-libs/arm64-v8a/libavformat.so → ...led/android-libs/arm64-v8a/libavformat.so
diff --git a/...ndled/android-libs/arm64-v8a/libavutil.so → ...ndled/android-libs/arm64-v8a/libavutil.so b/...ndled/android-libs/arm64-v8a/libavutil.so → ...ndled/android-libs/arm64-v8a/libavutil.so
diff --git a/...ed/android-libs/armeabi-v7a/libavcodec.so → ...ed/android-libs/armeabi-v7a/libavcodec.so b/...ed/android-libs/armeabi-v7a/libavcodec.so → ...ed/android-libs/armeabi-v7a/libavcodec.so
diff --git a/...d/android-libs/armeabi-v7a/libavformat.so → ...d/android-libs/armeabi-v7a/libavformat.so b/...d/android-libs/armeabi-v7a/libavformat.so → ...d/android-libs/armeabi-v7a/libavformat.so
diff --git a/...led/android-libs/armeabi-v7a/libavutil.so → ...led/android-libs/armeabi-v7a/libavutil.so b/...led/android-libs/armeabi-v7a/libavutil.so → ...led/android-libs/armeabi-v7a/libavutil.so
diff --git a/...eg_bundled/android-libs/x86/libavcodec.so → ...eg_bundled/android-libs/x86/libavcodec.so b/...eg_bundled/android-libs/x86/libavcodec.so → ...eg_bundled/android-libs/x86/libavcodec.so
diff --git a/...g_bundled/android-libs/x86/libavformat.so → ...g_bundled/android-libs/x86/libavformat.so b/...g_bundled/android-libs/x86/libavformat.so → ...g_bundled/android-libs/x86/libavformat.so
diff --git a/...peg_bundled/android-libs/x86/libavutil.so → ...peg_bundled/android-libs/x86/libavutil.so b/...peg_bundled/android-libs/x86/libavutil.so → ...peg_bundled/android-libs/x86/libavutil.so
diff --git a/...bundled/android-libs/x86_64/libavcodec.so → ...bundled/android-libs/x86_64/libavcodec.so b/...bundled/android-libs/x86_64/libavcodec.so → ...bundled/android-libs/x86_64/libavcodec.so
diff --git a/...undled/android-libs/x86_64/libavformat.so → ...undled/android-libs/x86_64/libavformat.so b/...undled/android-libs/x86_64/libavformat.so → ...undled/android-libs/x86_64/libavformat.so
diff --git a/..._bundled/android-libs/x86_64/libavutil.so → ..._bundled/android-libs/x86_64/libavutil.so b/..._bundled/android-libs/x86_64/libavutil.so → ..._bundled/android-libs/x86_64/libavutil.so
diff --git a/...ffmpeg_bundled/extra/libavutil/avconfig.h → ...ffmpeg_bundled/extra/libavutil/avconfig.h b/...ffmpeg_bundled/extra/libavutil/avconfig.h → ...ffmpeg_bundled/extra/libavutil/avconfig.h
diff --git a/...edin/android/litr/muxers/MediaFormatEx.kt → ...edin/android/litr/muxers/MediaFormatEx.kt b/...edin/android/litr/muxers/MediaFormatEx.kt → ...edin/android/litr/muxers/MediaFormatEx.kt
diff --git a/...kedin/android/litr/muxers/NativeLogger.kt → ...kedin/android/litr/muxers/NativeLogger.kt b/...kedin/android/litr/muxers/NativeLogger.kt → ...kedin/android/litr/muxers/NativeLogger.kt
diff --git a/...n/android/litr/muxers/NativeMediaMuxer.kt → ...n/android/litr/muxers/NativeMediaMuxer.kt b/...n/android/litr/muxers/NativeMediaMuxer.kt → ...n/android/litr/muxers/NativeMediaMuxer.kt
diff --git a/...itr/muxers/NativeMediaMuxerMediaTarget.kt → ...itr/muxers/NativeMediaMuxerMediaTarget.kt b/...itr/muxers/NativeMediaMuxerMediaTarget.kt → ...itr/muxers/NativeMediaMuxerMediaTarget.kt
diff --git a/...in/android/litr/muxers/NativeMuxersLib.kt → ...in/android/litr/muxers/NativeMuxersLib.kt b/...in/android/litr/muxers/NativeMuxersLib.kt → ...in/android/litr/muxers/NativeMuxersLib.kt
diff --git a/...ndroid/litr/muxers/NativeOutputFormats.kt → ...ndroid/litr/muxers/NativeOutputFormats.kt b/...ndroid/litr/muxers/NativeOutputFormats.kt → ...ndroid/litr/muxers/NativeOutputFormats.kt
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':litr-demo', ':litr', ':litr-filters', ':litr-muxers'
+include ':litr-demo', ':litr', ':litr-filters', ':litr-ffmpeg'