avcodec/mediacodecdec: enable NDK mediacodec

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
pull/388/head
Zhao Zhili 2 years ago
parent 4df9cb918e
commit 040567965e
  1. 1
      Changelog
  2. 10
      libavcodec/mediacodecdec.c
  3. 23
      libavcodec/mediacodecdec_common.c
  4. 1
      libavcodec/mediacodecdec_common.h
  5. 4
      libavcodec/version.h

@ -20,6 +20,7 @@ version <next>:
- ViewQuest VQC decoder
- backgroundkey filter
- nvenc AV1 encoding support
- MediaCodec decoder via NDKMediaCodec
version 5.1:

@ -40,6 +40,7 @@
#include "hevc_parse.h"
#include "hwconfig.h"
#include "internal.h"
#include "jni.h"
#include "mediacodec_wrapper.h"
#include "mediacodecdec_common.h"
@ -54,6 +55,7 @@ typedef struct MediaCodecH264DecContext {
int delay_flush;
int amlogic_mpeg2_api23_workaround;
int use_ndk_codec;
} MediaCodecH264DecContext;
static av_cold int mediacodec_decode_close(AVCodecContext *avctx)
@ -310,7 +312,10 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
FFAMediaFormat *format = NULL;
MediaCodecH264DecContext *s = avctx->priv_data;
format = ff_AMediaFormat_new(0);
if (s->use_ndk_codec < 0)
s->use_ndk_codec = !av_jni_get_java_vm(avctx);
format = ff_AMediaFormat_new(s->use_ndk_codec);
if (!format) {
av_log(avctx, AV_LOG_ERROR, "Failed to create media format\n");
ret = AVERROR_EXTERNAL;
@ -388,6 +393,7 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
}
s->ctx->delay_flush = s->delay_flush;
s->ctx->use_ndk_codec = s->use_ndk_codec;
if ((ret = ff_mediacodec_dec_init(avctx, s->ctx, codec_mime, format)) < 0) {
s->ctx = NULL;
@ -528,6 +534,8 @@ static const AVCodecHWConfigInternal *const mediacodec_hw_configs[] = {
static const AVOption ff_mediacodec_vdec_options[] = {
{ "delay_flush", "Delay flush until hw output buffers are returned to the decoder",
OFFSET(delay_flush), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, VD },
{ "ndk_codec", "Use MediaCodec from NDK",
OFFSET(use_ndk_codec), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VD },
{ NULL }
};

@ -608,12 +608,27 @@ int ff_mediacodec_dec_init(AVCodecContext *avctx, MediaCodecDecContext *s,
s->codec_name = ff_AMediaCodecList_getCodecNameByType(mime, profile, 0, avctx);
if (!s->codec_name) {
ret = AVERROR_EXTERNAL;
goto fail;
// getCodecNameByType() can fail due to missing JVM, while NDK
// mediacodec can be used without JVM.
if (!s->use_ndk_codec) {
ret = AVERROR_EXTERNAL;
goto fail;
}
av_log(avctx, AV_LOG_INFO, "Failed to getCodecNameByType\n");
} else {
av_log(avctx, AV_LOG_DEBUG, "Found decoder %s\n", s->codec_name);
}
av_log(avctx, AV_LOG_DEBUG, "Found decoder %s\n", s->codec_name);
s->codec = ff_AMediaCodec_createCodecByName(s->codec_name, 0);
if (s->codec_name)
s->codec = ff_AMediaCodec_createCodecByName(s->codec_name, s->use_ndk_codec);
else {
s->codec = ff_AMediaCodec_createDecoderByType(mime, s->use_ndk_codec);
if (s->codec) {
s->codec_name = ff_AMediaCodec_getName(s->codec);
if (!s->codec_name)
s->codec_name = av_strdup(mime);
}
}
if (!s->codec) {
av_log(avctx, AV_LOG_ERROR, "Failed to create media decoder for type %s and name %s\n", mime, s->codec_name);
ret = AVERROR_EXTERNAL;

@ -70,6 +70,7 @@ typedef struct MediaCodecDecContext {
bool delay_flush;
atomic_int serial;
bool use_ndk_codec;
} MediaCodecDecContext;
int ff_mediacodec_dec_init(AVCodecContext *avctx,

@ -29,8 +29,8 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 52
#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_MINOR 53
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \

Loading…
Cancel
Save