#include "libavutil/opt.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/pixfmt.h"
+#include "libavutil/internal.h"
#include "avcodec.h"
#include "decode.h"
typedef struct MediaCodecH264DecContext {
+ AVClass *avclass;
+
MediaCodecDecContext *ctx;
AVPacket buffered_pkt;
+ int delay_flush;
+
} MediaCodecH264DecContext;
static av_cold int mediacodec_decode_close(AVCodecContext *avctx)
}
#endif
-#if CONFIG_MPEG2_MEDIACODEC_DECODER
-static int mpeg2_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
-{
- int ret = 0;
-
- if (avctx->extradata) {
- ff_AMediaFormat_setBuffer(format, "csd-0", avctx->extradata, avctx->extradata_size);
- }
-
- return ret;
-}
-#endif
-
-#if CONFIG_MPEG4_MEDIACODEC_DECODER
-static int mpeg4_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
-{
- int ret = 0;
-
- if (avctx->extradata) {
- ff_AMediaFormat_setBuffer(format, "csd-0", avctx->extradata, avctx->extradata_size);
- }
-
- return ret;
-}
-#endif
-
-#if CONFIG_VP8_MEDIACODEC_DECODER || CONFIG_VP9_MEDIACODEC_DECODER
-static int vpx_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
+#if CONFIG_MPEG2_MEDIACODEC_DECODER || \
+ CONFIG_MPEG4_MEDIACODEC_DECODER || \
+ CONFIG_VP8_MEDIACODEC_DECODER || \
+ CONFIG_VP9_MEDIACODEC_DECODER
+static int common_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format)
{
int ret = 0;
case AV_CODEC_ID_MPEG2VIDEO:
codec_mime = "video/mpeg2";
- ret = mpeg2_set_extradata(avctx, format);
+ ret = common_set_extradata(avctx, format);
if (ret < 0)
goto done;
break;
case AV_CODEC_ID_MPEG4:
codec_mime = "video/mp4v-es",
- ret = mpeg4_set_extradata(avctx, format);
+ ret = common_set_extradata(avctx, format);
if (ret < 0)
goto done;
break;
case AV_CODEC_ID_VP8:
codec_mime = "video/x-vnd.on2.vp8";
- ret = vpx_set_extradata(avctx, format);
+ ret = common_set_extradata(avctx, format);
if (ret < 0)
goto done;
break;
case AV_CODEC_ID_VP9:
codec_mime = "video/x-vnd.on2.vp9";
- ret = vpx_set_extradata(avctx, format);
+ ret = common_set_extradata(avctx, format);
if (ret < 0)
goto done;
break;
goto done;
}
+ s->ctx->delay_flush = s->delay_flush;
+
if ((ret = ff_mediacodec_dec_init(avctx, s->ctx, codec_mime, format)) < 0) {
s->ctx = NULL;
goto done;
/* skip fetching new packet if we still have one buffered */
if (s->buffered_pkt.size > 0)
- return AVERROR(EAGAIN);
+ return mediacodec_send_receive(avctx, s, frame, true);
/* fetch new packet or eof */
ret = ff_decode_get_packet(avctx, &s->buffered_pkt);
NULL
};
-#if CONFIG_H264_MEDIACODEC_DECODER
-AVCodec ff_h264_mediacodec_decoder = {
- .name = "h264_mediacodec",
- .long_name = NULL_IF_CONFIG_SMALL("H.264 Android MediaCodec decoder"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_H264,
- .priv_data_size = sizeof(MediaCodecH264DecContext),
- .init = mediacodec_decode_init,
- .receive_frame = mediacodec_receive_frame,
- .flush = mediacodec_decode_flush,
- .close = mediacodec_decode_close,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE,
- .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
- .bsfs = "h264_mp4toannexb",
- .hw_configs = mediacodec_hw_configs,
- .wrapper_name = "mediacodec",
+#define OFFSET(x) offsetof(MediaCodecH264DecContext, x)
+#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
+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 },
+ { NULL }
};
+
+#define DECLARE_MEDIACODEC_VCLASS(short_name) \
+static const AVClass ff_##short_name##_mediacodec_dec_class = { \
+ .class_name = #short_name "_mediacodec", \
+ .item_name = av_default_item_name, \
+ .option = ff_mediacodec_vdec_options, \
+ .version = LIBAVUTIL_VERSION_INT, \
+};
+
+#define DECLARE_MEDIACODEC_VDEC(short_name, full_name, codec_id, bsf) \
+DECLARE_MEDIACODEC_VCLASS(short_name) \
+AVCodec ff_##short_name##_mediacodec_decoder = { \
+ .name = #short_name "_mediacodec", \
+ .long_name = NULL_IF_CONFIG_SMALL(full_name " Android MediaCodec decoder"), \
+ .type = AVMEDIA_TYPE_VIDEO, \
+ .id = codec_id, \
+ .priv_class = &ff_##short_name##_mediacodec_dec_class, \
+ .priv_data_size = sizeof(MediaCodecH264DecContext), \
+ .init = mediacodec_decode_init, \
+ .receive_frame = mediacodec_receive_frame, \
+ .flush = mediacodec_decode_flush, \
+ .close = mediacodec_decode_close, \
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE, \
+ .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, \
+ .bsfs = bsf, \
+ .hw_configs = mediacodec_hw_configs, \
+ .wrapper_name = "mediacodec", \
+}; \
+
+#if CONFIG_H264_MEDIACODEC_DECODER
+DECLARE_MEDIACODEC_VDEC(h264, "H.264", AV_CODEC_ID_H264, "h264_mp4toannexb")
#endif
#if CONFIG_HEVC_MEDIACODEC_DECODER
-AVCodec ff_hevc_mediacodec_decoder = {
- .name = "hevc_mediacodec",
- .long_name = NULL_IF_CONFIG_SMALL("H.265 Android MediaCodec decoder"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_HEVC,
- .priv_data_size = sizeof(MediaCodecH264DecContext),
- .init = mediacodec_decode_init,
- .receive_frame = mediacodec_receive_frame,
- .flush = mediacodec_decode_flush,
- .close = mediacodec_decode_close,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE,
- .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
- .bsfs = "hevc_mp4toannexb",
- .hw_configs = mediacodec_hw_configs,
- .wrapper_name = "mediacodec",
-};
+DECLARE_MEDIACODEC_VDEC(hevc, "H.265", AV_CODEC_ID_HEVC, "hevc_mp4toannexb")
#endif
#if CONFIG_MPEG2_MEDIACODEC_DECODER
-AVCodec ff_mpeg2_mediacodec_decoder = {
- .name = "mpeg2_mediacodec",
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 Android MediaCodec decoder"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MPEG2VIDEO,
- .priv_data_size = sizeof(MediaCodecH264DecContext),
- .init = mediacodec_decode_init,
- .receive_frame = mediacodec_receive_frame,
- .flush = mediacodec_decode_flush,
- .close = mediacodec_decode_close,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE,
- .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
- .hw_configs = mediacodec_hw_configs,
- .wrapper_name = "mediacodec",
-};
+DECLARE_MEDIACODEC_VDEC(mpeg2, "MPEG-2", AV_CODEC_ID_MPEG2VIDEO, NULL)
#endif
#if CONFIG_MPEG4_MEDIACODEC_DECODER
-AVCodec ff_mpeg4_mediacodec_decoder = {
- .name = "mpeg4_mediacodec",
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Android MediaCodec decoder"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MPEG4,
- .priv_data_size = sizeof(MediaCodecH264DecContext),
- .init = mediacodec_decode_init,
- .receive_frame = mediacodec_receive_frame,
- .flush = mediacodec_decode_flush,
- .close = mediacodec_decode_close,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE,
- .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
- .hw_configs = mediacodec_hw_configs,
- .wrapper_name = "mediacodec",
-};
+DECLARE_MEDIACODEC_VDEC(mpeg4, "MPEG-4", AV_CODEC_ID_MPEG4, NULL)
#endif
#if CONFIG_VP8_MEDIACODEC_DECODER
-AVCodec ff_vp8_mediacodec_decoder = {
- .name = "vp8_mediacodec",
- .long_name = NULL_IF_CONFIG_SMALL("VP8 Android MediaCodec decoder"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_VP8,
- .priv_data_size = sizeof(MediaCodecH264DecContext),
- .init = mediacodec_decode_init,
- .receive_frame = mediacodec_receive_frame,
- .flush = mediacodec_decode_flush,
- .close = mediacodec_decode_close,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE,
- .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
- .hw_configs = mediacodec_hw_configs,
- .wrapper_name = "mediacodec",
-};
+DECLARE_MEDIACODEC_VDEC(vp8, "VP8", AV_CODEC_ID_VP8, NULL)
#endif
#if CONFIG_VP9_MEDIACODEC_DECODER
-AVCodec ff_vp9_mediacodec_decoder = {
- .name = "vp9_mediacodec",
- .long_name = NULL_IF_CONFIG_SMALL("VP9 Android MediaCodec decoder"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_VP9,
- .priv_data_size = sizeof(MediaCodecH264DecContext),
- .init = mediacodec_decode_init,
- .receive_frame = mediacodec_receive_frame,
- .flush = mediacodec_decode_flush,
- .close = mediacodec_decode_close,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE,
- .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
- .hw_configs = mediacodec_hw_configs,
- .wrapper_name = "mediacodec",
-};
+DECLARE_MEDIACODEC_VDEC(vp9, "VP9", AV_CODEC_ID_VP9, NULL)
#endif
projects / ffmpeg / blobdiff