ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Mar 31 17:39:25 2017 -0300| [678ab33861d1061d2b730ffccccab188c22faadd] | committer: James Almer
Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8' * commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8': qsv: Add VC-1 decoder See fb57bc6c34b979bec995e714162fdfb4caf6db1a. Merged for cosmetic purposes to reduce differences with libav. Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=678ab33861d1061d2b730ffccccab188c22faadd --- configure | 2 +- libavcodec/Makefile | 4 +- libavcodec/{qsvdec_mpeg2.c => qsvdec_other.c} | 75 ++++++++--- libavcodec/qsvdec_vc1.c | 176 -------------------------- 4 files changed, 60 insertions(+), 197 deletions(-) diff --git a/configure b/configure index 8ec2afd..8b4921b 100755 --- a/configure +++ b/configure @@ -2550,7 +2550,7 @@ utvideo_encoder_select="bswapdsp huffman llvidencdsp" vble_decoder_select="llviddsp" vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideo vc1dsp" vc1_qsv_decoder_deps="libmfx" -vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel" +vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 876a69e..c12db91 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -414,7 +414,7 @@ OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o OBJS-$(CONFIG_MPEG2_MMAL_DECODER) += mmaldec.o -OBJS-$(CONFIG_MPEG2_QSV_DECODER) += qsvdec_mpeg2.o +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 @@ -591,7 +591,7 @@ OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o wmv2dsp.o wmv2data.o OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuvid.o OBJS-$(CONFIG_VC1_MMAL_DECODER) += mmaldec.o -OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec_vc1.o +OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec_other.o OBJS-$(CONFIG_VC2_ENCODER) += vc2enc.o vc2enc_dwt.o diractab.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o diff --git a/libavcodec/qsvdec_mpeg2.c b/libavcodec/qsvdec_other.c similarity index 72% rename from libavcodec/qsvdec_mpeg2.c rename to libavcodec/qsvdec_other.c index e558ca0..7c2f4f0 100644 --- a/libavcodec/qsvdec_mpeg2.c +++ b/libavcodec/qsvdec_other.c @@ -1,5 +1,5 @@ /* - * Intel MediaSDK QSV based MPEG-2 decoder + * Intel MediaSDK QSV based MPEG-2 and VC-1 decoders * * copyright (c) 2015 Anton Khirnov * @@ -36,16 +36,16 @@ #include "qsvdec.h" #include "qsv.h" -typedef struct QSVMPEG2Context { +typedef struct QSVOtherContext { AVClass *class; QSVContext qsv; AVFifoBuffer *packet_fifo; AVPacket input_ref; -} QSVMPEG2Context; +} QSVOtherContext; -static void qsv_clear_buffers(QSVMPEG2Context *s) +static void qsv_clear_buffers(QSVOtherContext *s) { AVPacket pkt; while (av_fifo_size(s->packet_fifo) >= sizeof(pkt)) { @@ -58,7 +58,7 @@ static void qsv_clear_buffers(QSVMPEG2Context *s) static av_cold int qsv_decode_close(AVCodecContext *avctx) { - QSVMPEG2Context *s = avctx->priv_data; + QSVOtherContext *s = avctx->priv_data; ff_qsv_decode_close(&s->qsv); @@ -71,7 +71,7 @@ static av_cold int qsv_decode_close(AVCodecContext *avctx) static av_cold int qsv_decode_init(AVCodecContext *avctx) { - QSVMPEG2Context *s = avctx->priv_data; + QSVOtherContext *s = avctx->priv_data; int ret; s->packet_fifo = av_fifo_alloc(sizeof(AVPacket)); @@ -89,7 +89,7 @@ fail: static int qsv_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - QSVMPEG2Context *s = avctx->priv_data; + QSVOtherContext *s = avctx->priv_data; AVFrame *frame = data; int ret; @@ -134,27 +134,30 @@ static int qsv_decode_frame(AVCodecContext *avctx, void *data, static void qsv_decode_flush(AVCodecContext *avctx) { - QSVMPEG2Context *s = avctx->priv_data; + QSVOtherContext *s = avctx->priv_data; qsv_clear_buffers(s); ff_qsv_decode_flush(avctx, &s->qsv); } +#define OFFSET(x) offsetof(QSVOtherContext, 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 }, +}; + +#if CONFIG_MPEG2_QSV_HWACCEL AVHWAccel ff_mpeg2_qsv_hwaccel = { .name = "mpeg2_qsv", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO, .pix_fmt = AV_PIX_FMT_QSV, }; +#endif -#define OFFSET(x) offsetof(QSVMPEG2Context, 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 = { +#if CONFIG_MPEG2_QSV_DECODER +static const AVClass mpeg2_qsv_class = { .class_name = "mpeg2_qsv", .item_name = av_default_item_name, .option = options, @@ -164,7 +167,7 @@ static const AVClass class = { AVCodec ff_mpeg2_qsv_decoder = { .name = "mpeg2_qsv", .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video (Intel Quick Sync Video acceleration)"), - .priv_data_size = sizeof(QSVMPEG2Context), + .priv_data_size = sizeof(QSVOtherContext), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO, .init = qsv_decode_init, @@ -172,8 +175,44 @@ AVCodec ff_mpeg2_qsv_decoder = { .flush = qsv_decode_flush, .close = qsv_decode_close, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING, - .priv_class = &class, + .priv_class = &mpeg2_qsv_class, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, + AV_PIX_FMT_QSV, + AV_PIX_FMT_NONE }, +}; +#endif + +#if CONFIG_VC1_QSV_HWACCEL +AVHWAccel ff_vc1_qsv_hwaccel = { + .name = "vc1_qsv", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VC1, + .pix_fmt = AV_PIX_FMT_QSV, +}; +#endif + +#if CONFIG_VC1_QSV_DECODER +static const AVClass vc1_qsv_class = { + .class_name = "vc1_qsv", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVCodec ff_vc1_qsv_decoder = { + .name = "vc1_qsv", + .long_name = NULL_IF_CONFIG_SMALL("VC-1 video (Intel Quick Sync Video acceleration)"), + .priv_data_size = sizeof(QSVOtherContext), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VC1, + .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 = &vc1_qsv_class, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, AV_PIX_FMT_QSV, AV_PIX_FMT_NONE }, }; +#endif diff --git a/libavcodec/qsvdec_vc1.c b/libavcodec/qsvdec_vc1.c deleted file mode 100644 index 70a47b1..0000000 --- a/libavcodec/qsvdec_vc1.c +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Intel MediaSDK QSV based VC-1 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 <stdint.h> -#include <string.h> - -#include <mfx/mfxvideo.h> - -#include "libavutil/common.h" -#include "libavutil/fifo.h" -#include "libavutil/opt.h" - -#include "avcodec.h" -#include "internal.h" -#include "qsv_internal.h" -#include "qsvdec.h" -#include "qsv.h" - -typedef struct QSVVC1Context { - AVClass *class; - QSVContext qsv; - - AVFifoBuffer *packet_fifo; - - AVPacket input_ref; -} QSVVC1Context; - -static void qsv_clear_buffers(QSVVC1Context *s) -{ - AVPacket pkt; - while (av_fifo_size(s->packet_fifo) >= sizeof(pkt)) { - av_fifo_generic_read(s->packet_fifo, &pkt, sizeof(pkt), NULL); - av_packet_unref(&pkt); - } - - av_packet_unref(&s->input_ref); -} - -static av_cold int qsv_decode_close(AVCodecContext *avctx) -{ - QSVVC1Context *s = avctx->priv_data; - - ff_qsv_decode_close(&s->qsv); - - qsv_clear_buffers(s); - - av_fifo_free(s->packet_fifo); - - return 0; -} - -static av_cold int qsv_decode_init(AVCodecContext *avctx) -{ - QSVVC1Context *s = avctx->priv_data; - int ret; - - s->packet_fifo = av_fifo_alloc(sizeof(AVPacket)); - if (!s->packet_fifo) { - ret = AVERROR(ENOMEM); - goto fail; - } - - return 0; -fail: - qsv_decode_close(avctx); - return ret; -} - -static int qsv_decode_frame(AVCodecContext *avctx, void *data, - int *got_frame, AVPacket *avpkt) -{ - QSVVC1Context *s = avctx->priv_data; - AVFrame *frame = data; - int ret; - - /* buffer the input packet */ - if (avpkt->size) { - AVPacket input_ref = { 0 }; - - if (av_fifo_space(s->packet_fifo) < sizeof(input_ref)) { - ret = av_fifo_realloc2(s->packet_fifo, - av_fifo_size(s->packet_fifo) + sizeof(input_ref)); - if (ret < 0) - return ret; - } - - ret = av_packet_ref(&input_ref, avpkt); - if (ret < 0) - return ret; - av_fifo_generic_write(s->packet_fifo, &input_ref, sizeof(input_ref), NULL); - } - - /* process buffered data */ - while (!*got_frame) { - if (s->input_ref.size <= 0) { - /* no more data */ - if (av_fifo_size(s->packet_fifo) < sizeof(AVPacket)) - return avpkt->size ? avpkt->size : ff_qsv_process_data(avctx, &s->qsv, frame, got_frame, avpkt); - - av_packet_unref(&s->input_ref); - av_fifo_generic_read(s->packet_fifo, &s->input_ref, sizeof(s->input_ref), NULL); - } - - ret = ff_qsv_process_data(avctx, &s->qsv, frame, got_frame, &s->input_ref); - if (ret < 0) - return ret; - - s->input_ref.size -= ret; - s->input_ref.data += ret; - } - - return avpkt->size; -} - -static void qsv_decode_flush(AVCodecContext *avctx) -{ - QSVVC1Context *s = avctx->priv_data; - - qsv_clear_buffers(s); - ff_qsv_decode_flush(avctx, &s->qsv); -} - -AVHWAccel ff_vc1_qsv_hwaccel = { - .name = "vc1_qsv", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_VC1, - .pix_fmt = AV_PIX_FMT_QSV, -}; - -#define OFFSET(x) offsetof(QSVVC1Context, 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 = "vc1_qsv", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - -AVCodec ff_vc1_qsv_decoder = { - .name = "vc1_qsv", - .long_name = NULL_IF_CONFIG_SMALL("VC-1 video (Intel Quick Sync Video acceleration)"), - .priv_data_size = sizeof(QSVVC1Context), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_VC1, - .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 = &class, - .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, - AV_PIX_FMT_QSV, - AV_PIX_FMT_NONE }, -}; ====================================================================== diff --cc configure index 8ec2afd,e9615fc..8b4921b --- a/configure +++ b/configure @@@ -2534,23 -2078,22 +2534,23 @@@ svq1_encoder_select="aandcttables hpeld svq3_decoder_select="golomb h264dsp h264parse h264pred hpeldsp tpeldsp videodsp" svq3_decoder_suggest="zlib" tak_decoder_select="audiodsp" -tdsc_decoder_deps="zlib" -tdsc_decoder_select="mjpeg_decoder" +tdsc_decoder_select="zlib mjpeg_decoder" theora_decoder_select="vp3_decoder" thp_decoder_select="mjpeg_decoder" -tiff_decoder_suggest="zlib" +tiff_decoder_suggest="zlib lzma" tiff_encoder_suggest="zlib" -truehd_decoder_select="mlp_decoder" +truehd_decoder_select="mlp_parser" truemotion2_decoder_select="bswapdsp" truespeech_decoder_select="bswapdsp" -tscc_decoder_deps="zlib" -txd_decoder_select="texturedsp" +tscc_decoder_select="zlib" twinvq_decoder_select="mdct lsp sinewin" -utvideo_decoder_select="bswapdsp" -utvideo_encoder_select="bswapdsp huffman huffyuvencdsp" -vble_decoder_select="huffyuvdsp" -vc1_decoder_select="blockdsp error_resilience h263_decoder h264qpel intrax8 mpeg_er mpegvideo vc1dsp" +txd_decoder_select="texturedsp" +utvideo_decoder_select="bswapdsp llviddsp" +utvideo_encoder_select="bswapdsp huffman llvidencdsp" +vble_decoder_select="llviddsp" +vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideo vc1dsp" +vc1_qsv_decoder_deps="libmfx" - vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel" ++vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" diff --cc libavcodec/Makefile index 876a69e,08b510a..c12db91 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@@ -410,11 -325,10 +410,11 @@@ OBJS-$(CONFIG_MP3ON4_DECODER) OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) += mpegaudiodec_float.o mpeg4audio.o OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o -OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o +OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o +OBJS-$(CONFIG_MPEG2_MMAL_DECODER) += mmaldec.o - OBJS-$(CONFIG_MPEG2_QSV_DECODER) += qsvdec_mpeg2.o + 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 @@@ -588,11 -459,9 +588,11 @@@ OBJS-$(CONFIG_VBLE_DECODER) OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o \ vc1_mc.o vc1_pred.o vc1.o vc1data.o \ msmpeg4dec.o msmpeg4.o msmpeg4data.o \ - wmv2data.o + wmv2dsp.o wmv2data.o +OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuvid.o OBJS-$(CONFIG_VC1_MMAL_DECODER) += mmaldec.o - OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec_vc1.o + OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec_other.o +OBJS-$(CONFIG_VC2_ENCODER) += vc2enc.o vc2enc_dwt.o diractab.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdvideo.o diff --cc libavcodec/qsvdec_other.c index e558ca0,53a1bc8..7c2f4f0 --- a/libavcodec/qsvdec_other.c +++ b/libavcodec/qsvdec_other.c @@@ -171,8 -174,43 +174,43 @@@ AVCodec ff_mpeg2_qsv_decoder = .decode = qsv_decode_frame, .flush = qsv_decode_flush, .close = qsv_decode_close, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING, - .priv_class = &class, + .priv_class = &mpeg2_qsv_class, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, + AV_PIX_FMT_QSV, + AV_PIX_FMT_NONE }, + }; + #endif + + #if CONFIG_VC1_QSV_HWACCEL + AVHWAccel ff_vc1_qsv_hwaccel = { + .name = "vc1_qsv", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VC1, + .pix_fmt = AV_PIX_FMT_QSV, + }; + #endif + + #if CONFIG_VC1_QSV_DECODER + static const AVClass vc1_qsv_class = { + .class_name = "vc1_qsv", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, + }; + + AVCodec ff_vc1_qsv_decoder = { + .name = "vc1_qsv", + .long_name = NULL_IF_CONFIG_SMALL("VC-1 video (Intel Quick Sync Video acceleration)"), + .priv_data_size = sizeof(QSVOtherContext), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_VC1, + .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, ++ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING, + .priv_class = &vc1_qsv_class, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, AV_PIX_FMT_QSV, AV_PIX_FMT_NONE }, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
