refactor: move ffmpeg decoders to media3ext module (#19)

anilbeesetti · web-flow · commit 4fa77815e2af · 2023-09-03T16:19:08.000+05:30
diff --git a/media3ext/.gitignore b/media3ext/.gitignore
diff --git a/media3ext/build.gradle.kts b/media3ext/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 android {
-    namespace = "io.github.anilbeesetti.nextlib.ffcodecs"
+    namespace = "io.github.anilbeesetti.nextlib.media3ext"
 
     compileSdk = 33
 
diff --git a/media3ext/consumer-rules.pro b/media3ext/consumer-rules.pro
diff --git a/media3ext/src/main/AndroidManifest.xml b/media3ext/src/main/AndroidManifest.xml
diff --git a/media3ext/src/main/cpp/CMakeLists.txt b/media3ext/src/main/cpp/CMakeLists.txt
diff --git a/media3ext/src/main/cpp/ffaudio.cpp b/media3ext/src/main/cpp/ffaudio.cpp
@@ -183,7 +183,7 @@ int transformError(int errorNumber) {
 
 extern "C"
 JNIEXPORT jlong JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegInitialize(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegAudioDecoder_ffmpegInitialize(JNIEnv *env,
                                                                         jobject thiz,
                                                                         jstring codec_name,
                                                                         jbyteArray extra_data,
@@ -201,7 +201,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegInitialize
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegDecode(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegAudioDecoder_ffmpegDecode(JNIEnv *env,
                                                                     jobject thiz,
                                                                     jlong context,
                                                                     jobject input_data,
@@ -244,7 +244,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegDecode(JNI
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegGetChannelCount(
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegAudioDecoder_ffmpegGetChannelCount(
         JNIEnv *env, jobject thiz, jlong context) {
     if (!context) {
         LOGE("Context must be non-NULL.");
@@ -255,7 +255,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegGetChannel
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegGetSampleRate(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegAudioDecoder_ffmpegGetSampleRate(JNIEnv *env,
                                                                            jobject thiz,
                                                                            jlong context) {
     if (!context) {
@@ -267,7 +267,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegGetSampleR
 
 extern "C"
 JNIEXPORT jlong JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegReset(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegAudioDecoder_ffmpegReset(JNIEnv *env,
                                                                    jobject thiz,
                                                                    jlong jContext,
                                                                    jbyteArray extra_data) {
@@ -300,7 +300,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegReset(JNIE
 
 extern "C"
 JNIEXPORT void JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegAudioDecoder_ffmpegRelease(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegAudioDecoder_ffmpegRelease(JNIEnv *env,
                                                                      jobject thiz,
                                                                      jlong context) {
     if (context) {
diff --git a/media3ext/src/main/cpp/ffcommon.cpp b/media3ext/src/main/cpp/ffcommon.cpp
diff --git a/media3ext/src/main/cpp/ffcommon.h b/media3ext/src/main/cpp/ffcommon.h
diff --git a/media3ext/src/main/cpp/ffmain.cpp b/media3ext/src/main/cpp/ffmain.cpp
@@ -14,21 +14,21 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
 
 extern "C"
 JNIEXPORT jstring JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegLibrary_ffmpegGetVersion(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegLibrary_ffmpegGetVersion(JNIEnv *env,
                                                                    jclass clazz) {
     return env->NewStringUTF(LIBAVCODEC_IDENT);
 }
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegLibrary_ffmpegGetInputBufferPaddingSize(
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegLibrary_ffmpegGetInputBufferPaddingSize(
         JNIEnv *env, jclass clazz) {
     return (jint) AV_INPUT_BUFFER_PADDING_SIZE;
 }
 
 extern "C"
 JNIEXPORT jboolean JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegLibrary_ffmpegHasDecoder(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegLibrary_ffmpegHasDecoder(JNIEnv *env,
                                                                    jclass clazz,
                                                                    jstring codec_name) {
     return getCodecByName(env, codec_name) != nullptr;
diff --git a/media3ext/src/main/cpp/ffvideo.cpp b/media3ext/src/main/cpp/ffvideo.cpp
@@ -130,7 +130,7 @@ JniContext *createVideoContext(JNIEnv *env,
 
 extern "C"
 JNIEXPORT jlong JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegInitialize(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegVideoDecoder_ffmpegInitialize(JNIEnv *env,
                                                                                  jobject thiz,
                                                                                  jstring codec_name,
                                                                                  jbyteArray extra_data,
@@ -146,7 +146,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegInitialize
 
 extern "C"
 JNIEXPORT jlong JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegReset(JNIEnv *env, jobject thiz,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegVideoDecoder_ffmpegReset(JNIEnv *env, jobject thiz,
                                                                             jlong jContext) {
     auto *const jniContext = reinterpret_cast<JniContext *>(jContext);
     AVCodecContext *context = jniContext->codecContext;
@@ -161,7 +161,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegReset(JNIE
 
 extern "C"
 JNIEXPORT void JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegRelease(JNIEnv *env, jobject thiz,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegVideoDecoder_ffmpegRelease(JNIEnv *env, jobject thiz,
                                                                               jlong jContext) {
     auto *const jniContext = reinterpret_cast<JniContext *>(jContext);
     AVCodecContext *context = jniContext->codecContext;
@@ -173,7 +173,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegRelease(JN
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegRenderFrame(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegVideoDecoder_ffmpegRenderFrame(JNIEnv *env,
                                                                                   jobject thiz,
                                                                                   jlong jContext,
                                                                                   jobject surface,
@@ -291,7 +291,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegRenderFram
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegSendPacket(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegVideoDecoder_ffmpegSendPacket(JNIEnv *env,
                                                                                  jobject thiz,
                                                                                  jlong jContext,
                                                                                  jobject encoded_data,
@@ -326,7 +326,7 @@ Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegSendPacket
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_io_github_anilbeesetti_nextlib_ffcodecs_FfmpegVideoDecoder_ffmpegReceiveFrame(JNIEnv *env,
+Java_io_github_anilbeesetti_nextlib_media3ext_ffdecoder_FfmpegVideoDecoder_ffmpegReceiveFrame(JNIEnv *env,
                                                                                    jobject thiz,
                                                                                    jlong jContext,
                                                                                    jint output_mode,
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FFmpegOnlyRenderersFactory.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FFmpegOnlyRenderersFactory.java
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.ffcodecs;
+package io.github.anilbeesetti.nextlib.media3ext.ffdecoder;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioDecoder.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioDecoder.java
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.ffcodecs;
+package io.github.anilbeesetti.nextlib.media3ext.ffdecoder;
 
 import android.annotation.SuppressLint;
 
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioRenderer.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegAudioRenderer.java
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.ffcodecs;
+package io.github.anilbeesetti.nextlib.media3ext.ffdecoder;
 
 import static androidx.media3.exoplayer.audio.AudioSink.SINK_FORMAT_SUPPORTED_DIRECTLY;
 import static androidx.media3.exoplayer.audio.AudioSink.SINK_FORMAT_SUPPORTED_WITH_TRANSCODING;
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegDecoderException.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegDecoderException.java
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.ffcodecs;
+package io.github.anilbeesetti.nextlib.media3ext.ffdecoder;
 
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.decoder.DecoderException;
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegLibrary.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegLibrary.java
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.ffcodecs;
+package io.github.anilbeesetti.nextlib.media3ext.ffdecoder;
 
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegVideoDecoder.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegVideoDecoder.java
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.ffcodecs;
+package io.github.anilbeesetti.nextlib.media3ext.ffdecoder;
 
 import android.util.Log;
 import android.view.Surface;
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegVideoRenderer.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/FfmpegVideoRenderer.java
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.ffcodecs;
+package io.github.anilbeesetti.nextlib.media3ext.ffdecoder;
 
 import static java.lang.Runtime.getRuntime;
 
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/NextRenderersFactory.kt b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/NextRenderersFactory.kt
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.ffcodecs
+package io.github.anilbeesetti.nextlib.media3ext.ffdecoder
 
 import android.content.Context
 import android.os.Handler
@@ -11,7 +11,7 @@ import androidx.media3.exoplayer.audio.AudioSink
 import androidx.media3.exoplayer.mediacodec.MediaCodecSelector
 import androidx.media3.exoplayer.text.TextOutput
 import androidx.media3.exoplayer.video.VideoRendererEventListener
-import io.github.anilbeesetti.nextlib.text.NextTextRenderer
+import io.github.anilbeesetti.nextlib.media3ext.text.NextTextRenderer
 
 class NextRenderersFactory(context: Context) : DefaultRenderersFactory(context) {
 
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/package-info.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/ffdecoder/package-info.java
@@ -1,4 +1,4 @@
 @NonNullApi
-package io.github.anilbeesetti.nextlib.ffcodecs;
+package io.github.anilbeesetti.nextlib.media3ext.ffdecoder;
 
 import androidx.media3.common.util.NonNullApi;
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/text/Media3TextRenderer.java b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/text/Media3TextRenderer.java
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.text;
+package io.github.anilbeesetti.nextlib.media3ext.text;
 
 import static androidx.media3.common.util.Assertions.checkNotNull;
 import static androidx.media3.common.util.Assertions.checkState;
diff --git a/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/text/NextTextRenderer.kt b/media3ext/src/main/java/io/github/anilbeesetti/nextlib/media3ext/text/NextTextRenderer.kt
@@ -1,4 +1,4 @@
-package io.github.anilbeesetti.nextlib.text
+package io.github.anilbeesetti.nextlib.media3ext.text
 
 import android.os.Looper
 import androidx.media3.exoplayer.text.SubtitleDecoderFactory
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,4 +14,4 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "nextlib"
-include(":ffcodecs")
+include(":media3ext")

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`android {`
`10`		`- namespace = "io.github.anilbeesetti.nextlib.ffcodecs"`
	`10`	`+ namespace = "io.github.anilbeesetti.nextlib.media3ext"`
`11`	`11`
`12`	`12`	`compileSdk = 33`
`13`	`13`