| Message ID | 20170602082341.78956-1-ffmpeg@tmm1.net |
|---|---|
| State | Superseded |
| Headers | show |
Hi, On Fri, Jun 02, 2017 at 04:23:41AM -0400, Aman Gupta wrote: > From: Aman Gupta <aman@tmm1.net> > > Android TV and FireOS hardware supports mpeg2 hardware decoding via MediaCodec. > --- > configure | 2 ++ > libavcodec/Makefile | 1 + > libavcodec/allcodecs.c | 2 ++ > libavcodec/mediacodecdec.c | 23 ++++++++++++++++++++++- > 4 files changed, 27 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > index 72060ef0e9..5816de2398 100755 > --- a/configure > +++ b/configure > @@ -2656,6 +2656,7 @@ mpeg2_d3d11va_hwaccel_deps="d3d11va" > mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder" > mpeg2_dxva2_hwaccel_deps="dxva2" > mpeg2_dxva2_hwaccel_select="mpeg2video_decoder" > +mpeg2_mediacodec_hwaccel_deps="mediacodec" > mpeg2_mmal_hwaccel_deps="mmal" > mpeg2_qsv_hwaccel_deps="libmfx" > mpeg2_qsv_hwaccel_select="qsvdec_mpeg2" > @@ -2762,6 +2763,7 @@ mpeg1_vdpau_decoder_select="mpeg1video_decoder" > mpeg2_crystalhd_decoder_select="crystalhd" > mpeg2_cuvid_decoder_deps="cuda cuvid" > mpeg2_mmal_decoder_deps="mmal" > +mpeg2_mediacodec_decoder_deps="mediacodec" > mpeg2_qsv_decoder_deps="libmfx" > mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel" > mpeg2_qsv_encoder_deps="libmfx" > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 0818950ad9..a752f87ef5 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -423,6 +423,7 @@ OBJS-$(CONFIG_MPEG2_QSV_DECODER) += qsvdec_other.o > OBJS-$(CONFIG_MPEG2_QSV_ENCODER) += qsvenc_mpeg2.o > OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o > OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o > +OBJS-$(CONFIG_MPEG2_MEDIACODEC_DECODER) += mediacodecdec.o > OBJS-$(CONFIG_MPEG2_VAAPI_ENCODER) += vaapi_encode_mpeg2.o > OBJS-$(CONFIG_MPEG4_DECODER) += xvididct.o > OBJS-$(CONFIG_MPEG4_MEDIACODEC_DECODER) += mediacodecdec.o > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index 89fadcd2fa..4373ebd975 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -96,6 +96,7 @@ static void register_all(void) > REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi); > REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau); > REGISTER_HWACCEL(MPEG2_VIDEOTOOLBOX, mpeg2_videotoolbox); > + REGISTER_HWACCEL(MPEG2_MEDIACODEC, mpeg2_mediacodec); > REGISTER_HWACCEL(MPEG4_CUVID, mpeg4_cuvid); > REGISTER_HWACCEL(MPEG4_MEDIACODEC, mpeg4_mediacodec); > REGISTER_HWACCEL(MPEG4_MMAL, mpeg4_mmal); > @@ -257,6 +258,7 @@ static void register_all(void) > REGISTER_DECODER(MPEG2_MMAL, mpeg2_mmal); > REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd); > REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv); > + REGISTER_DECODER(MPEG2_MEDIACODEC, mpeg2_mediacodec); > REGISTER_DECODER(MSA1, msa1); > REGISTER_DECODER(MSCC, mscc); > REGISTER_DECODER(MSMPEG4V1, msmpeg4v1); > diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c > index ccfcb4b9ce..f3f6155392 100644 > --- a/libavcodec/mediacodecdec.c > +++ b/libavcodec/mediacodecdec.c > @@ -1,5 +1,5 @@ > /* > - * Android MediaCodec H.264 / H.265 / MPEG-4 / VP8 / VP9 decoders > + * Android MediaCodec MPEG-2 / H.264 / H.265 / MPEG-4 / VP8 / VP9 decoders > * > * Copyright (c) 2015-2016 Matthieu Bouron <matthieu.bouron stupeflix.com> > * > @@ -333,6 +333,11 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx) > goto done; > break; > #endif > +#if CONFIG_MPEG2_MEDIACODEC_DECODER > + case AV_CODEC_ID_MPEG2VIDEO: > + codec_mime = "video/mpeg2", This line should end with a ; > + break; > +#endif > #if CONFIG_MPEG4_MEDIACODEC_DECODER > case AV_CODEC_ID_MPEG4: > codec_mime = "video/mp4v-es", > @@ -575,6 +580,22 @@ AVCodec ff_hevc_mediacodec_decoder = { > }; > #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, > + .decode = mediacodec_decode_frame, > + .flush = mediacodec_decode_flush, > + .close = mediacodec_decode_close, > + .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, > + .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, > +}; > +#endif > + > #if CONFIG_MPEG4_MEDIACODEC_DECODER > AVCodec ff_mpeg4_mediacodec_decoder = { > .name = "mpeg4_mediacodec", You should also add the relevant hwaccel in mediacodecdec_common.c, something like: AVHWAccel ff_mpeg2_mediacodec_hwaccel = { .name = "mediacodec", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO, .pix_fmt = AV_PIX_FMT_MEDIACODEC, }; Thanks for the patch. Note: I will test the patch on a few devices next week. > -- > 2.11.0 (Apple Git-81) > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On Fri, Jun 2, 2017 at 6:16 AM, Matthieu Bouron <matthieu.bouron@gmail.com> wrote: > Hi, > > On Fri, Jun 02, 2017 at 04:23:41AM -0400, Aman Gupta wrote: > > From: Aman Gupta <aman@tmm1.net> > > > > Android TV and FireOS hardware supports mpeg2 hardware decoding via > MediaCodec. > > --- > > configure | 2 ++ > > libavcodec/Makefile | 1 + > > libavcodec/allcodecs.c | 2 ++ > > libavcodec/mediacodecdec.c | 23 ++++++++++++++++++++++- > > 4 files changed, 27 insertions(+), 1 deletion(-) > > > > diff --git a/configure b/configure > > index 72060ef0e9..5816de2398 100755 > > --- a/configure > > +++ b/configure > > @@ -2656,6 +2656,7 @@ mpeg2_d3d11va_hwaccel_deps="d3d11va" > > mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder" > > mpeg2_dxva2_hwaccel_deps="dxva2" > > mpeg2_dxva2_hwaccel_select="mpeg2video_decoder" > > +mpeg2_mediacodec_hwaccel_deps="mediacodec" > > mpeg2_mmal_hwaccel_deps="mmal" > > mpeg2_qsv_hwaccel_deps="libmfx" > > mpeg2_qsv_hwaccel_select="qsvdec_mpeg2" > > @@ -2762,6 +2763,7 @@ mpeg1_vdpau_decoder_select="mpeg1video_decoder" > > mpeg2_crystalhd_decoder_select="crystalhd" > > mpeg2_cuvid_decoder_deps="cuda cuvid" > > mpeg2_mmal_decoder_deps="mmal" > > +mpeg2_mediacodec_decoder_deps="mediacodec" > > mpeg2_qsv_decoder_deps="libmfx" > > mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel" > > mpeg2_qsv_encoder_deps="libmfx" > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > > index 0818950ad9..a752f87ef5 100644 > > --- a/libavcodec/Makefile > > +++ b/libavcodec/Makefile > > @@ -423,6 +423,7 @@ OBJS-$(CONFIG_MPEG2_QSV_DECODER) += > qsvdec_other.o > > OBJS-$(CONFIG_MPEG2_QSV_ENCODER) += qsvenc_mpeg2.o > > OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o > mpeg12data.o > > OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o > > +OBJS-$(CONFIG_MPEG2_MEDIACODEC_DECODER) += mediacodecdec.o > > OBJS-$(CONFIG_MPEG2_VAAPI_ENCODER) += vaapi_encode_mpeg2.o > > OBJS-$(CONFIG_MPEG4_DECODER) += xvididct.o > > OBJS-$(CONFIG_MPEG4_MEDIACODEC_DECODER) += mediacodecdec.o > > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > > index 89fadcd2fa..4373ebd975 100644 > > --- a/libavcodec/allcodecs.c > > +++ b/libavcodec/allcodecs.c > > @@ -96,6 +96,7 @@ static void register_all(void) > > REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi); > > REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau); > > REGISTER_HWACCEL(MPEG2_VIDEOTOOLBOX, mpeg2_videotoolbox); > > + REGISTER_HWACCEL(MPEG2_MEDIACODEC, mpeg2_mediacodec); > > REGISTER_HWACCEL(MPEG4_CUVID, mpeg4_cuvid); > > REGISTER_HWACCEL(MPEG4_MEDIACODEC, mpeg4_mediacodec); > > REGISTER_HWACCEL(MPEG4_MMAL, mpeg4_mmal); > > @@ -257,6 +258,7 @@ static void register_all(void) > > REGISTER_DECODER(MPEG2_MMAL, mpeg2_mmal); > > REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd); > > REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv); > > + REGISTER_DECODER(MPEG2_MEDIACODEC, mpeg2_mediacodec); > > REGISTER_DECODER(MSA1, msa1); > > REGISTER_DECODER(MSCC, mscc); > > REGISTER_DECODER(MSMPEG4V1, msmpeg4v1); > > diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c > > index ccfcb4b9ce..f3f6155392 100644 > > --- a/libavcodec/mediacodecdec.c > > +++ b/libavcodec/mediacodecdec.c > > @@ -1,5 +1,5 @@ > > /* > > - * Android MediaCodec H.264 / H.265 / MPEG-4 / VP8 / VP9 decoders > > + * Android MediaCodec MPEG-2 / H.264 / H.265 / MPEG-4 / VP8 / VP9 > decoders > > * > > * Copyright (c) 2015-2016 Matthieu Bouron <matthieu.bouron > stupeflix.com> > > * > > @@ -333,6 +333,11 @@ static av_cold int mediacodec_decode_init(AVCodecContext > *avctx) > > goto done; > > break; > > #endif > > +#if CONFIG_MPEG2_MEDIACODEC_DECODER > > + case AV_CODEC_ID_MPEG2VIDEO: > > + codec_mime = "video/mpeg2", > > This line should end with a ; > > > + break; > > +#endif > > #if CONFIG_MPEG4_MEDIACODEC_DECODER > > case AV_CODEC_ID_MPEG4: > > codec_mime = "video/mp4v-es", > > @@ -575,6 +580,22 @@ AVCodec ff_hevc_mediacodec_decoder = { > > }; > > #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, > > + .decode = mediacodec_decode_frame, > > + .flush = mediacodec_decode_flush, > > + .close = mediacodec_decode_close, > > + .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, > > + .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, > > +}; > > +#endif > > + > > #if CONFIG_MPEG4_MEDIACODEC_DECODER > > AVCodec ff_mpeg4_mediacodec_decoder = { > > .name = "mpeg4_mediacodec", > > You should also add the relevant hwaccel in mediacodecdec_common.c, > something like: > > AVHWAccel ff_mpeg2_mediacodec_hwaccel = { > .name = "mediacodec", > .type = AVMEDIA_TYPE_VIDEO, > .id = AV_CODEC_ID_MPEG2VIDEO, > .pix_fmt = AV_PIX_FMT_MEDIACODEC, > }; > > Thanks for the patch. > Thanks for the review. Submitted new patch with the requested changes. > > Note: I will test the patch on a few devices next week. > Let me know how your testing goes. I will be tested on a variety of devices this week as well. Aman > > > -- > > 2.11.0 (Apple Git-81) > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > -- > Matthieu B. >
diff --git a/configure b/configure index 72060ef0e9..5816de2398 100755 --- a/configure +++ b/configure @@ -2656,6 +2656,7 @@ mpeg2_d3d11va_hwaccel_deps="d3d11va" mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder" mpeg2_dxva2_hwaccel_deps="dxva2" mpeg2_dxva2_hwaccel_select="mpeg2video_decoder" +mpeg2_mediacodec_hwaccel_deps="mediacodec" mpeg2_mmal_hwaccel_deps="mmal" mpeg2_qsv_hwaccel_deps="libmfx" mpeg2_qsv_hwaccel_select="qsvdec_mpeg2" @@ -2762,6 +2763,7 @@ mpeg1_vdpau_decoder_select="mpeg1video_decoder" mpeg2_crystalhd_decoder_select="crystalhd" mpeg2_cuvid_decoder_deps="cuda cuvid" mpeg2_mmal_decoder_deps="mmal" +mpeg2_mediacodec_decoder_deps="mediacodec" mpeg2_qsv_decoder_deps="libmfx" mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel" mpeg2_qsv_encoder_deps="libmfx" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0818950ad9..a752f87ef5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -423,6 +423,7 @@ OBJS-$(CONFIG_MPEG2_QSV_DECODER) += qsvdec_other.o OBJS-$(CONFIG_MPEG2_QSV_ENCODER) += qsvenc_mpeg2.o OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o +OBJS-$(CONFIG_MPEG2_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_MPEG2_VAAPI_ENCODER) += vaapi_encode_mpeg2.o OBJS-$(CONFIG_MPEG4_DECODER) += xvididct.o OBJS-$(CONFIG_MPEG4_MEDIACODEC_DECODER) += mediacodecdec.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 89fadcd2fa..4373ebd975 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -96,6 +96,7 @@ static void register_all(void) REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi); REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau); REGISTER_HWACCEL(MPEG2_VIDEOTOOLBOX, mpeg2_videotoolbox); + REGISTER_HWACCEL(MPEG2_MEDIACODEC, mpeg2_mediacodec); REGISTER_HWACCEL(MPEG4_CUVID, mpeg4_cuvid); REGISTER_HWACCEL(MPEG4_MEDIACODEC, mpeg4_mediacodec); REGISTER_HWACCEL(MPEG4_MMAL, mpeg4_mmal); @@ -257,6 +258,7 @@ static void register_all(void) REGISTER_DECODER(MPEG2_MMAL, mpeg2_mmal); REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd); REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv); + REGISTER_DECODER(MPEG2_MEDIACODEC, mpeg2_mediacodec); REGISTER_DECODER(MSA1, msa1); REGISTER_DECODER(MSCC, mscc); REGISTER_DECODER(MSMPEG4V1, msmpeg4v1); diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index ccfcb4b9ce..f3f6155392 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -1,5 +1,5 @@ /* - * Android MediaCodec H.264 / H.265 / MPEG-4 / VP8 / VP9 decoders + * Android MediaCodec MPEG-2 / H.264 / H.265 / MPEG-4 / VP8 / VP9 decoders * * Copyright (c) 2015-2016 Matthieu Bouron <matthieu.bouron stupeflix.com> * @@ -333,6 +333,11 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx) goto done; break; #endif +#if CONFIG_MPEG2_MEDIACODEC_DECODER + case AV_CODEC_ID_MPEG2VIDEO: + codec_mime = "video/mpeg2", + break; +#endif #if CONFIG_MPEG4_MEDIACODEC_DECODER case AV_CODEC_ID_MPEG4: codec_mime = "video/mp4v-es", @@ -575,6 +580,22 @@ AVCodec ff_hevc_mediacodec_decoder = { }; #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, + .decode = mediacodec_decode_frame, + .flush = mediacodec_decode_flush, + .close = mediacodec_decode_close, + .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING, + .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS, +}; +#endif + #if CONFIG_MPEG4_MEDIACODEC_DECODER AVCodec ff_mpeg4_mediacodec_decoder = { .name = "mpeg4_mediacodec",
From: Aman Gupta <aman@tmm1.net> Android TV and FireOS hardware supports mpeg2 hardware decoding via MediaCodec. --- configure | 2 ++ libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 2 ++ libavcodec/mediacodecdec.c | 23 ++++++++++++++++++++++- 4 files changed, 27 insertions(+), 1 deletion(-)