March 2017 - ffmpeg-cvslog - lists.ffmpeg.org

x86/hevc_add_res: merge last remaining changes from 3d6535983282bea542dac2e568ae50da5796be34
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Mar 31 20:42:16 2017 -0300| [6171f178e70ebe75e5964531f47ccc32455d5557] | committer: James Almer x86/hevc_add_res: merge last remaining changes from 3d6535983282bea542dac2e568ae50da5796be34 See https://lists.libav.org/pipermail/libav-devel/2016-October/079829.html > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6171f178e70ebe75e… --- doc/libav-merge.txt | 1 - libavcodec/x86/hevc_add_res.asm | 46 ++++++++++++++--------------------------- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 0cbd9f4..30518c0 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -97,7 +97,6 @@ Stuff that didn't reach the codebase: - VAAPI VP8 decode hwaccel (currently under review: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-February/thread.html#207348) - Removal of the custom atomic API (5cc0057f49, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html) - Use the new bitstream filter for extracting extradata (8e2ea69135 and 096a8effa3, see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209068.html) -- ADD_RES_MMX_4_8 in libavcodec/x86/hevc_add_res.asm probably needs updating (see 589880710) - Read aac_adtstoasc extradata updates from packet side data on Matroska once mov and the bsf in question are fixed (See 13a211e632 and 5ef1959080) Collateral damage that needs work locally: diff --git a/libavcodec/x86/hevc_add_res.asm b/libavcodec/x86/hevc_add_res.asm index d97e4ab..36d4d8e 100644 --- a/libavcodec/x86/hevc_add_res.asm +++ b/libavcodec/x86/hevc_add_res.asm @@ -28,25 +28,23 @@ cextern pw_1023 ; the add_res macros and functions were largely inspired by h264_idct.asm from the x264 project %macro ADD_RES_MMX_4_8 0 - mova m2, [r1] - mova m4, [r1+8] + mova m0, [r1] + mova m2, [r1+8] + pxor m1, m1 pxor m3, m3 + psubw m1, m0 psubw m3, m2 - packuswb m2, m2 - packuswb m3, m3 - pxor m5, m5 - psubw m5, m4 - packuswb m4, m4 - packuswb m5, m5 - - movh m0, [r0] - movh m1, [r0+r2] + packuswb m0, m2 + packuswb m1, m3 + + movd m2, [r0] + movd m3, [r0+r2] + punpckldq m2, m3 paddusb m0, m2 - paddusb m1, m4 - psubusb m0, m3 - psubusb m1, m5 - movh [r0], m0 - movh [r0+r2], m1 + psubusb m0, m1 + movd [r0], m0 + psrlq m0, 32 + movd [r0+r2], m0 %endmacro @@ -95,15 +93,8 @@ cglobal hevc_add_residual_4_8, 3, 3, 6 vinserti128 m2, m2, [r1+%1+32], 1 vinserti128 m6, m6, [r1+%1+48], 1 %endif -%if cpuflag(avx) psubw m1, m0, m2 psubw m5, m0, m6 -%else - mova m1, m0 - mova m5, m0 - psubw m1, m2 - psubw m5, m6 -%endif packuswb m2, m6 packuswb m1, m5 @@ -113,15 +104,8 @@ cglobal hevc_add_residual_4_8, 3, 3, 6 vinserti128 m4, m4, [r1+%1+96 ], 1 vinserti128 m6, m6, [r1+%1+112], 1 %endif -%if cpuflag(avx) psubw m3, m0, m4 psubw m5, m0, m6 -%else - mova m3, m0 - mova m5, m0 - psubw m3, m4 - psubw m5, m6 -%endif packuswb m4, m6 packuswb m3, m5 @@ -192,7 +176,7 @@ cglobal hevc_add_residual_32_8, 3, 5, 7 dec r4d jg .loop RET -%endif +%endif ;HAVE_AVX2_EXTERNAL %macro ADD_RES_SSE_8_10 4 mova m0, [%4]

1 0

doc/libav-merge: link to the relevant ml thread in the extract_extradata line
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Mar 31 20:35:16 2017 -0300| [b62a87591ebe57923bc9aabf487dbce0a7af2627] | committer: James Almer doc/libav-merge: link to the relevant ml thread in the extract_extradata line > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b62a87591ebe57923… --- doc/libav-merge.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 34d512b..0cbd9f4 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -96,7 +96,7 @@ Stuff that didn't reach the codebase: - e7078e842 hevcdsp: add x86 SIMD for MC - VAAPI VP8 decode hwaccel (currently under review: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-February/thread.html#207348) - Removal of the custom atomic API (5cc0057f49, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html) -- Use the new bitstream filter for extracting extradata (see 8e2ea69135 and 096a8effa3) +- Use the new bitstream filter for extracting extradata (8e2ea69135 and 096a8effa3, see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209068.html) - ADD_RES_MMX_4_8 in libavcodec/x86/hevc_add_res.asm probably needs updating (see 589880710) - Read aac_adtstoasc extradata updates from packet side data on Matroska once mov and the bsf in question are fixed (See 13a211e632 and 5ef1959080)

1 0

fate/exr : add test for uint32 data
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | Martin Vignali <martin.vignali(a)gmail.com> | Sat Mar 18 13:45:06 2017 +0100| [6426f74272c33a47cffd0ab0cc7b7a6b286af0ce] | committer: Michael Niedermayer fate/exr : add test for uint32 data Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6426f74272c33a47c… --- tests/fate/image.mak | 6 ++++++ tests/ref/fate/exr-rgb-scanline-b44-uint32 | 6 ++++++ tests/ref/fate/exr-rgb-scanline-pxr24-uint32 | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index b299ea6..ef04955 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -247,6 +247,12 @@ fate-exr-rgb-scanline-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr FATE_EXR += fate-exr-rgb-scanline-raw-half-float-l2 fate-exr-rgb-scanline-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -pix_fmt rgba64le +FATE_EXR += fate-exr-rgb-scanline-b44-uint32 +fate-exr-rgb-scanline-b44-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_uint32.exr -pix_fmt rgb48le + +FATE_EXR += fate-exr-rgb-scanline-pxr24-uint32 +fate-exr-rgb-scanline-pxr24-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_uint32.exr -pix_fmt rgb48le + FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR) FATE_IMAGE += $(FATE_EXR-yes) diff --git a/tests/ref/fate/exr-rgb-scanline-b44-uint32 b/tests/ref/fate/exr-rgb-scanline-b44-uint32 new file mode 100644 index 0000000..abe41b8 --- /dev/null +++ b/tests/ref/fate/exr-rgb-scanline-b44-uint32 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 12x8 +#sar 0: 1/1 +0, 0, 0, 1, 576, 0x6b950ce3 diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-uint32 b/tests/ref/fate/exr-rgb-scanline-pxr24-uint32 new file mode 100644 index 0000000..abe41b8 --- /dev/null +++ b/tests/ref/fate/exr-rgb-scanline-pxr24-uint32 @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 12x8 +#sar 0: 1/1 +0, 0, 0, 1, 576, 0x6b950ce3

1 0

Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | James Almer <jamrial(a)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 <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=678ab33861d1061d2… --- 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 },

1 0

qsv: Add VC-1 decoder
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Wed Oct 26 21:29:08 2016 +0100| [b6582b29277e00e5d49f400e58beefa5a21d83b8] | committer: Mark Thompson qsv: Add VC-1 decoder It uses the same code as the MPEG-2 decoder, so the file is renamed to contain all "other" (that is, not H.26[45]) codecs. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6582b29277e00e5d… --- configure | 3 ++ libavcodec/Makefile | 3 +- libavcodec/allcodecs.c | 2 + libavcodec/{qsvdec_mpeg2.c => qsvdec_other.c} | 75 ++++++++++++++++++++------- 4 files changed, 64 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 7ced8fa..e9615fc 100755 --- a/configure +++ b/configure @@ -2184,6 +2184,7 @@ vc1_dxva2_hwaccel_select="vc1_decoder" vc1_mmal_decoder_deps="mmal" vc1_mmal_decoder_select="mmal" vc1_mmal_hwaccel_deps="mmal" +vc1_qsv_hwaccel_deps="libmfx" vc1_vaapi_hwaccel_deps="vaapi" vc1_vaapi_hwaccel_select="vc1_decoder" vc1_vdpau_hwaccel_deps="vdpau" @@ -2226,6 +2227,8 @@ mpeg2_qsv_decoder_deps="libmfx" mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel mpegvideo_parser" mpeg2_qsv_encoder_deps="libmfx" mpeg2_qsv_encoder_select="qsvenc" +vc1_qsv_decoder_deps="libmfx" +vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel vc1_parser" nvenc_h264_encoder_deps="nvenc" nvenc_hevc_encoder_deps="nvenc" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 66a6c66..08b510a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -328,7 +328,7 @@ OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.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 @@ -461,6 +461,7 @@ OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o msmpeg4dec.o msmpeg4.o msmpeg4data.o \ wmv2data.o OBJS-$(CONFIG_VC1_MMAL_DECODER) += mmaldec.o +OBJS-$(CONFIG_VC1_QSV_DECODER) += qsvdec_other.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdvideo.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 41af38e..a66403a 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -91,6 +91,7 @@ void avcodec_register_all(void) REGISTER_HWACCEL(MPEG4_VDPAU, mpeg4_vdpau); REGISTER_HWACCEL(VC1_D3D11VA, vc1_d3d11va); REGISTER_HWACCEL(VC1_DXVA2, vc1_dxva2); + REGISTER_HWACCEL(VC1_QSV, vc1_qsv); REGISTER_HWACCEL(VC1_VAAPI, vc1_vaapi); REGISTER_HWACCEL(VC1_VDPAU, vc1_vdpau); REGISTER_HWACCEL(VC1_MMAL, vc1_mmal); @@ -280,6 +281,7 @@ void avcodec_register_all(void) REGISTER_DECODER(VC1, vc1); REGISTER_DECODER(VC1IMAGE, vc1image); REGISTER_DECODER(VC1_MMAL, vc1_mmal); + REGISTER_DECODER(VC1_QSV, vc1_qsv); REGISTER_DECODER(VCR1, vcr1); REGISTER_DECODER(VMDVIDEO, vmdvideo); REGISTER_DECODER(VMNC, vmnc); 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 2daad56..53a1bc8 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, - .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, + .priv_class = &vc1_qsv_class, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, AV_PIX_FMT_QSV, AV_PIX_FMT_NONE }, }; +#endif

1 0

Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Mar 31 17:18:37 2017 -0300| [99fa2fc5db06f842fdf91008fcc1e352cbe9e9dc] | committer: James Almer Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c' * commit 'fea4dc05b41f5465bedc786b67966f204ec6150c': vc1: Return stream format information from parser This commit is a noop, see 4df6605da7e351116c99f19b8a98e1f236932600 Merged-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99fa2fc5db06f842f… ---

1 0

Merge commit '0940b748bdba36c4894fc8ea6be631d821fdf578'
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Mar 31 17:14:10 2017 -0300| [4fe9d6964830f0eec94165da02c95cc2669fdfe1] | committer: James Almer Merge commit '0940b748bdba36c4894fc8ea6be631d821fdf578' * commit '0940b748bdba36c4894fc8ea6be631d821fdf578': qsvdec: Only warn about unconsumed data if it happens more than once Merged-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fe9d6964830f0eec… --- libavcodec/qsvdec.c | 6 +++++- libavcodec/qsvdec.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 5f6ea5a..d6adcdc 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -330,8 +330,12 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, /* make sure we do not enter an infinite loop if the SDK * did not consume any data and did not return anything */ if (!*sync && !bs.DataOffset) { - ff_qsv_print_warning(avctx, ret, "A decode call did not consume any data"); bs.DataOffset = avpkt->size; + ++q->zero_consume_run; + if (q->zero_consume_run > 1) + ff_qsv_print_warning(avctx, ret, "A decode call did not consume any data"); + } else { + q->zero_consume_run = 0; } if (*sync) { diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index 41fb716..4e86e4b 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -51,6 +51,7 @@ typedef struct QSVContext { QSVFrame *work_frames; AVFifoBuffer *async_fifo; + int zero_consume_run; // the internal parser and codec context for parsing the data AVCodecParserContext *parser; ======================================================================

1 0

vc1: Return stream format information from parser
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Wed Oct 26 21:13:45 2016 +0100| [fea4dc05b41f5465bedc786b67966f204ec6150c] | committer: Mark Thompson vc1: Return stream format information from parser > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fea4dc05b41f5465b… --- libavcodec/vc1_parser.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 38b62f7..7234db6 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -108,6 +108,14 @@ static void vc1_extract_header(AVCodecParserContext *s, AVCodecContext *avctx, break; } + s->format = vpc->v.chromaformat == 1 ? AV_PIX_FMT_YUV420P + : AV_PIX_FMT_NONE; + if (avctx->width && avctx->height) { + s->width = avctx->width; + s->height = avctx->height; + s->coded_width = FFALIGN(avctx->coded_width, 16); + s->coded_height = FFALIGN(avctx->coded_height, 16); + } } static int vc1_parse(AVCodecParserContext *s,

1 0

qsvdec: Only warn about unconsumed data if it happens more than once
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Sun Oct 30 16:58:23 2016 +0000| [0940b748bdba36c4894fc8ea6be631d821fdf578] | committer: Mark Thompson qsvdec: Only warn about unconsumed data if it happens more than once > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0940b748bdba36c48… --- libavcodec/qsvdec.c | 6 +++++- libavcodec/qsvdec.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index d61ec7d..9e5b1b3 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -328,8 +328,12 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, /* make sure we do not enter an infinite loop if the SDK * did not consume any data and did not return anything */ if (!*sync && !bs.DataOffset) { - ff_qsv_print_warning(avctx, ret, "A decode call did not consume any data"); bs.DataOffset = avpkt->size; + ++q->zero_consume_run; + if (q->zero_consume_run > 1) + ff_qsv_print_warning(avctx, ret, "A decode call did not consume any data"); + } else { + q->zero_consume_run = 0; } if (*sync) { diff --git a/libavcodec/qsvdec.h b/libavcodec/qsvdec.h index d807864..c6ec99a 100644 --- a/libavcodec/qsvdec.h +++ b/libavcodec/qsvdec.h @@ -51,6 +51,7 @@ typedef struct QSVContext { QSVFrame *work_frames; AVFifoBuffer *async_fifo; + int zero_consume_run; // the internal parser and codec context for parsing the data AVCodecParserContext *parser;

1 0

Merge commit '030d84fa2e35af0e77516735de35bf1a52371c86'
by git＠videolan.org 31 Mar '17

31 Mar '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Mar 31 17:12:09 2017 -0300| [1fb2c697d5d1cb9b25430390803cd4a24cbcf407] | committer: James Almer Merge commit '030d84fa2e35af0e77516735de35bf1a52371c86' * commit '030d84fa2e35af0e77516735de35bf1a52371c86': qsvdec: Pass field order information to libmfx qsvdec: Pass the correct profile to libmfx These commits are a noop, see 1f26a231bb065276cd80ce02957c759f3197edfa Merged-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fb2c697d5d1cb9b2… ---

1 0