From a9fef261b1498a8945c1f81e08f226ead4e176fd Mon Sep 17 00:00:00 2001 From: Ivan Uskov Date: Sun, 2 Aug 2015 08:19:28 -0400 Subject: [PATCH] QSV MJPEG video decoder has been added. --- Changelog | 1 + configure | 4 +++ libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 2 ++ libavcodec/qsv.c | 10 +++++- libavcodec/qsvdec_mjpeg.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 4 +-- 7 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 libavcodec/qsvdec_mjpeg.c diff --git a/Changelog b/Changelog index f41d837..0002281 100644 --- a/Changelog +++ b/Changelog @@ -17,6 +17,7 @@ version : - Intel QSV-accelerated MPEG-2 video and HEVC encoding - Intel QSV-accelerated MPEG-2 video and HEVC decoding - Intel QSV-accelerated VC-1 video decoding +- Intel QSV-accelerated MJPEG video decoding - libkvazaar HEVC encoder - erosion, dilation, deflate and inflate video filters - Dynamic Audio Normalizer as dynaudnorm filter diff --git a/configure b/configure index f3550a0..6f5d3c8 100755 --- a/configure +++ b/configure @@ -2254,6 +2254,8 @@ mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" mjpeg_decoder_select="blockdsp hpeldsp exif idctdsp jpegtables" mjpeg_encoder_select="aandcttables jpegtables mpegvideoenc" mjpegb_decoder_select="mjpeg_decoder" +mjpeg_qsv_decoder_deps="libmfx" +mjpeg_qsv_decoder_select="qsvdec mjpeg_qsv_hwaccel" mlp_decoder_select="mlp_parser" motionpixels_decoder_select="bswapdsp" mp1_decoder_select="mpegaudio" @@ -2417,6 +2419,8 @@ hevc_dxva2_hwaccel_select="hevc_decoder" hevc_qsv_hwaccel_deps="libmfx" hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC" hevc_vdpau_hwaccel_select="hevc_decoder" +mjpeg_qsv_hwaccel_deps="libmfx" +mjpeg_qsv_hwaccel_select="qsvdec_mjpeg" mpeg_vdpau_decoder_deps="vdpau" mpeg_vdpau_decoder_select="mpeg2video_decoder" mpeg_xvmc_hwaccel_deps="xvmc" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7cf2403..00cfca7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -338,6 +338,7 @@ OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpegenc_common.o OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o +OBJS-$(CONFIG_MJPEG_QSV_DECODER) += qsvdec_mjpeg.o OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 417f824..6177933 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -88,6 +88,7 @@ void avcodec_register_all(void) REGISTER_HWACCEL(HEVC_DXVA2, hevc_dxva2); REGISTER_HWACCEL(HEVC_QSV, hevc_qsv); REGISTER_HWACCEL(HEVC_VDPAU, hevc_vdpau); + REGISTER_HWACCEL(MJPEG_QSV, mjpeg_qsv); REGISTER_HWACCEL(MPEG1_XVMC, mpeg1_xvmc); REGISTER_HWACCEL(MPEG1_VDPAU, mpeg1_vdpau); REGISTER_HWACCEL(MPEG2_XVMC, mpeg2_xvmc); @@ -213,6 +214,7 @@ void avcodec_register_all(void) REGISTER_DECODER(MIMIC, mimic); REGISTER_ENCDEC (MJPEG, mjpeg); REGISTER_DECODER(MJPEGB, mjpegb); + REGISTER_DECODER(MJPEG_QSV, mjpeg_qsv); REGISTER_DECODER(MMVIDEO, mmvideo); REGISTER_DECODER(MOTIONPIXELS, motionpixels); #if FF_API_XVMC diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 4c8e6b0..0f5c9ce 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -20,7 +20,6 @@ #include #include - #include #include @@ -30,6 +29,11 @@ #include "avcodec.h" #include "qsv_internal.h" +#if QSV_VERSION_ATLEAST(1, 3) +#include +#endif + + int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) { switch (codec_id) { @@ -44,6 +48,10 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) return MFX_CODEC_MPEG2; case AV_CODEC_ID_VC1: return MFX_CODEC_VC1; +#if QSV_VERSION_ATLEAST(1, 3) + case AV_CODEC_ID_MJPEG: + return MFX_CODEC_JPEG; +#endif default: break; } diff --git a/libavcodec/qsvdec_mjpeg.c b/libavcodec/qsvdec_mjpeg.c new file mode 100644 index 0000000..537c908 --- /dev/null +++ b/libavcodec/qsvdec_mjpeg.c @@ -0,0 +1,88 @@ +/* + * Intel MediaSDK QSV based MJPEG video decoder + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +#include "libavutil/common.h" +#include "libavutil/fifo.h" +#include "libavutil/opt.h" + +#include "avcodec.h" +#include "qsvdec.h" + +typedef struct QSVMJPEGContext { + AVClass *class; + QSVContext qsv; +} QSVMJPEGContext; + + +static av_cold int qsv_decode_close(AVCodecContext *avctx) +{ + QSVMJPEGContext *s = avctx->priv_data; + + ff_qsv_decode_close(&s->qsv); + + return 0; +} + +static int qsv_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) +{ + QSVMJPEGContext *s = avctx->priv_data; + AVFrame *frame = data; + + return ff_qsv_decode(avctx, &s->qsv, frame, got_frame, avpkt); +} + +AVHWAccel ff_mjpeg_qsv_hwaccel = { + .name = "mjpeg_qsv", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MJPEG, + .pix_fmt = AV_PIX_FMT_QSV, +}; + +#define OFFSET(x) offsetof(QSVMJPEGContext, x) +#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM +static const AVOption options[] = { + { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD }, + { NULL }, +}; + +static const AVClass 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(QSVMJPEGContext), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MJPEG, + .init = NULL, + .decode = qsv_decode_frame, + .flush = NULL, + .close = qsv_decode_close, + .capabilities = AV_CODEC_CAP_DELAY, + .priv_class = &class, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index c6efd03..1b37a9e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 56 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 57 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ -- 1.8.3.1