[FFmpeg-devel] [PATCH v2 5/6] lavc/qsvdec: Add mjpeg decoder support

[Rogozhkin, Dmitry V]

On Wed, 2019-02-20 at 10:58 +0800, Zhong Li wrote:
> Signed-off-by: Zhong Li <zhong.li at intel.com>
> ---
>  Changelog                 |  1 +
>  configure                 |  1 +
>  libavcodec/Makefile       |  1 +
>  libavcodec/allcodecs.c    |  1 +
>  libavcodec/qsvdec_other.c | 28 +++++++++++++++++++++++++++-
>  5 files changed, 31 insertions(+), 1 deletion(-)
> 
> diff --git a/Changelog b/Changelog
> index 4d80e5b54f..f289812bfc 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -19,6 +19,7 @@ version <next>:
>  - ARBC decoder
>  - libaribb24 based ARIB STD-B24 caption support (profiles A and C)
>  - Support decoding of HEVC 4:4:4 content in nvdec and cuviddec
> +- Intel QSV-accelerated MJPEG decoding
>  
>  
>  version 4.1:
> diff --git a/configure b/configure
> index eaa56c07cf..de994673a0 100755
> --- a/configure
> +++ b/configure
> @@ -2997,6 +2997,7 @@ hevc_v4l2m2m_decoder_deps="v4l2_m2m
> hevc_v4l2_m2m"
>  hevc_v4l2m2m_decoder_select="hevc_mp4toannexb_bsf"
>  hevc_v4l2m2m_encoder_deps="v4l2_m2m hevc_v4l2_m2m"
>  mjpeg_cuvid_decoder_deps="cuvid"
> +mjpeg_qsv_decoder_select="qsvdec"
>  mjpeg_qsv_encoder_deps="libmfx"
>  mjpeg_qsv_encoder_select="qsvenc"
>  mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG"
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 15c43a8a6a..fed4a13fe5 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -423,6 +423,7 @@ OBJS-$(CONFIG_METASOUND_DECODER)       +=
> metasound.o metasound_data.o \
>  OBJS-$(CONFIG_MICRODVD_DECODER)        += microdvddec.o ass.o
>  OBJS-$(CONFIG_MIMIC_DECODER)           += mimic.o
>  OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.o
> +OBJS-$(CONFIG_MJPEG_QSV_DECODER)       += qsvdec_other.o
>  OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.o
> mjpegenc_common.o \
>                                            mjpegenc_huffman.o
>  OBJS-$(CONFIG_MJPEGB_DECODER)          += mjpegbdec.o
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index b26aeca239..391619c38c 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -759,6 +759,7 @@ extern AVCodec ff_hevc_videotoolbox_encoder;
>  extern AVCodec ff_libkvazaar_encoder;
>  extern AVCodec ff_mjpeg_cuvid_decoder;
>  extern AVCodec ff_mjpeg_qsv_encoder;
> +extern AVCodec ff_mjpeg_qsv_decoder;
>  extern AVCodec ff_mjpeg_vaapi_encoder;
>  extern AVCodec ff_mpeg1_cuvid_decoder;
>  extern AVCodec ff_mpeg2_cuvid_decoder;
> diff --git a/libavcodec/qsvdec_other.c b/libavcodec/qsvdec_other.c
> index 03251d2c85..8c9c1e6b13 100644
> --- a/libavcodec/qsvdec_other.c
> +++ b/libavcodec/qsvdec_other.c
> @@ -1,5 +1,5 @@
>  /*
> - * Intel MediaSDK QSV based MPEG-2, VC-1 and VP8 decoders
> + * Intel MediaSDK QSV based MPEG-2, VC-1, VP8 and MJPEG decoders
>   *
>   * copyright (c) 2015 Anton Khirnov
>   *
> @@ -255,3 +255,29 @@ AVCodec ff_vp8_qsv_decoder = {
>      .wrapper_name   = "qsv",
>  };
>  #endif
> +
> +#if CONFIG_MJPEG_QSV_DECODER
> +static const AVClass mjpeg_qsv_class = {
> +    .class_name = "mjpeg_qsv",
> +    .item_name  = av_default_item_name,
> +    .option     = options,
> +    .version    = LIBAVUTIL_VERSION_INT,
> +};
> +
> +AVCodec ff_mjpeg_qsv_decoder = {
> +    .name           = "mjpeg_qsv",
> +    .long_name      = NULL_IF_CONFIG_SMALL("MJPEG video (Intel Quick
> Sync Video acceleration)"),
> +    .priv_data_size = sizeof(QSVOtherContext),
> +    .type           = AVMEDIA_TYPE_VIDEO,
> +    .id             = AV_CODEC_ID_MJPEG,
> +    .init           = qsv_decode_init,
> +    .decode         = qsv_decode_frame,
> +    .flush          = qsv_decode_flush,
> +    .close          = qsv_decode_close,
> +    .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 |
> AV_CODEC_CAP_AVOID_PROBING,
> +    .priv_class     = &mjpeg_qsv_class,
> +    .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12,
> +                                                    AV_PIX_FMT_QSV,
> +                                                    AV_PIX_FMT_NONE 

hm. If codec (each codec) declares list of formats here, why we have
some pix_fmts array declaration in one of the decoding functions? See
discussion for patch #3 in this series.

> },
> +};
> +#endif