Files
streamctl/docker/termux/ffmpeg_mediacodec_set_parameters.patch
Dmitrii Okunev 2a5ab1bfc1 Rebuild ffmpeg
2025-09-21 00:00:28 +01:00

121 lines
4.7 KiB
Diff

commit e01e33bde9fe5cc6bed67dd3e445a386d2d40608
Author: Dmitrii Okunev <xaionaro@dx.center>
Date: Sun Apr 20 17:54:21 2025 +0100
Add MediaCodec function setParameters
diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c
index 96c886666a..b63a60a292 100644
--- a/libavcodec/mediacodec_wrapper.c
+++ b/libavcodec/mediacodec_wrapper.c
@@ -192,6 +192,8 @@ struct JNIAMediaCodecFields {
jmethodID release_output_buffer_id;
jmethodID release_output_buffer_at_time_id;
+ jmethodID set_parameters_id;
+
jmethodID set_input_surface_id;
jmethodID signal_end_of_input_stream_id;
@@ -234,6 +236,8 @@ static const struct FFJniField jni_amediacodec_mapping[] = {
{ "android/media/MediaCodec", "getOutputFormat", "()Landroid/media/MediaFormat;", FF_JNI_METHOD, OFFSET(get_output_format_id), 1 },
+ { "android/media/MediaCodec", "setParameters", "(Landroid/media/MediaFormat;)V", FF_JNI_METHOD, OFFSET(set_parameters_id), 1 },
+
{ "android/media/MediaCodec", "dequeueInputBuffer", "(J)I", FF_JNI_METHOD, OFFSET(dequeue_input_buffer_id), 1 },
{ "android/media/MediaCodec", "queueInputBuffer", "(IIIJI)V", FF_JNI_METHOD, OFFSET(queue_input_buffer_id), 1 },
{ "android/media/MediaCodec", "getInputBuffer", "(I)Ljava/nio/ByteBuffer;", FF_JNI_METHOD, OFFSET(get_input_buffer_id), 0 },
@@ -1411,6 +1415,25 @@ fail:
return ret;
}
+static int mediacodec_jni_setParameters(FFAMediaCodec *ctx,
+ const FFAMediaFormat *format_ctx)
+{
+ int ret = 0;
+ JNIEnv *env = NULL;
+ FFAMediaCodecJni *codec = (FFAMediaCodecJni *)ctx;
+ const FFAMediaFormatJni *format = (FFAMediaFormatJni *)format_ctx;
+
+ JNI_GET_ENV_OR_RETURN(env, codec, AVERROR_EXTERNAL);
+
+ (*env)->CallVoidMethod(env, codec->object, codec->jfields.set_parameters_id, format->object);
+
+ if (ff_jni_exception_check(env, 1, codec) < 0) {
+ ret = AVERROR_EXTERNAL;
+ }
+
+ return ret;
+}
+
static int mediacodec_jni_start(FFAMediaCodec* ctx)
{
int ret = 0;
@@ -1818,6 +1841,8 @@ static const FFAMediaCodec media_codec_jni = {
.getBufferFlagEndOfStream = mediacodec_jni_getBufferFlagEndOfStream,
.getBufferFlagKeyFrame = mediacodec_jni_getBufferFlagKeyFrame,
+ .setParameters = mediacodec_jni_setParameters,
+
.getConfigureFlagEncode = mediacodec_jni_getConfigureFlagEncode,
.cleanOutputBuffers = mediacodec_jni_cleanOutputBuffers,
.signalEndOfInputStream = mediacodec_jni_signalEndOfInputStream,
@@ -2178,6 +2203,21 @@ static int mediacodec_ndk_configure(FFAMediaCodec* ctx,
return 0;
}
+static int mediacodec_ndk_setParameters(FFAMediaCodec *ctx,
+ const FFAMediaFormat *format_ctx)
+{
+ FFAMediaCodecNdk *codec = (FFAMediaCodecNdk *)ctx;
+ FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)format_ctx;
+
+ int status = AMediaCodec_setParameters(codec->impl, format->impl);
+ if (status != AMEDIA_OK) {
+ av_log(codec, AV_LOG_ERROR, "codec setParameters failed, %d\n", status);
+ return AVERROR_EXTERNAL;
+ }
+
+ return 0;
+}
+
#define MEDIACODEC_NDK_WRAPPER(method) \
static int mediacodec_ndk_ ## method(FFAMediaCodec* ctx) \
{ \
@@ -2393,6 +2433,8 @@ static const FFAMediaCodec media_codec_ndk = {
.getBufferFlagEndOfStream = mediacodec_ndk_getBufferFlagEndOfStream,
.getBufferFlagKeyFrame = mediacodec_ndk_getBufferFlagKeyFrame,
+ .setParameters = mediacodec_ndk_setParameters,
+
.getConfigureFlagEncode = mediacodec_ndk_getConfigureFlagEncode,
.cleanOutputBuffers = mediacodec_ndk_cleanOutputBuffers,
.signalEndOfInputStream = mediacodec_ndk_signalEndOfInputStream,
diff --git a/libavcodec/mediacodec_wrapper.h b/libavcodec/mediacodec_wrapper.h
index 11a4260497..804349ea2c 100644
--- a/libavcodec/mediacodec_wrapper.h
+++ b/libavcodec/mediacodec_wrapper.h
@@ -217,6 +217,9 @@ struct FFAMediaCodec {
int (*cleanOutputBuffers)(FFAMediaCodec *codec);
+ // Introduced in Android API 26
+ int (*setParameters)(FFAMediaCodec* codec, const FFAMediaFormat* format);
+
// For encoder with FFANativeWindow as input.
int (*signalEndOfInputStream)(FFAMediaCodec *);
};
@@ -238,6 +241,12 @@ static inline int ff_AMediaCodec_configure(FFAMediaCodec *codec,
return codec->configure(codec, format, surface, crypto, flags);
}
+static inline int ff_AMediaCodec_setParameters(FFAMediaCodec *codec,
+ const FFAMediaFormat *format)
+{
+ return codec->setParameters(codec, format);
+}
+
static inline int ff_AMediaCodec_start(FFAMediaCodec* codec)
{
return codec->start(codec);