August 2015 - ffmpeg-cvslog - lists.ffmpeg.org

avconv_opt: Add an option that lists all supported hwaccels
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Timothy Gu <timothygu99(a)gmail.com> | Tue Aug 25 16:45:21 2015 -0700| [c23999be134bde0a0554261a9043be7dbc01de0c] | committer: Luca Barbato avconv_opt: Add an option that lists all supported hwaccels Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c23999be134bde0a0… --- avconv_opt.c | 14 ++++++++++++++ doc/avconv.texi | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/avconv_opt.c b/avconv_opt.c index b527335..5bdd7d9 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -177,6 +177,18 @@ static double parse_frame_aspect_ratio(const char *arg) return ar; } +static int show_hwaccels(void *optctx, const char *opt, const char *arg) +{ + int i; + + printf("Supported hardware acceleration:\n"); + for (i = 0; i < FF_ARRAY_ELEMS(hwaccels) - 1; i++) { + printf("%s\n", hwaccels[i].name); + } + printf("\n"); + return 0; +} + static int opt_audio_codec(void *optctx, const char *opt, const char *arg) { OptionsContext *o = optctx; @@ -2446,6 +2458,8 @@ const OptionDef options[] = { { "hwaccel_device", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_INPUT, { .off = OFFSET(hwaccel_devices) }, "select a device for HW acceleration", "devicename" }, + { "hwaccels", OPT_EXIT, { .func_arg = show_hwaccels }, + "show available HW acceleration methods" }, { "autorotate", HAS_ARG | OPT_BOOL | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(autorotate) }, "automatically insert correct rotate filters" }, diff --git a/doc/avconv.texi b/doc/avconv.texi index 504b8ed..2433ede 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -626,6 +626,10 @@ is not specified, the value of the @var{DISPLAY} environment variable is used For DXVA2, this option should contain the number of the display adapter to use. If this option is not specified, the default adapter is used. @end table + +@item -hwaccels +List all hardware acceleration methods supported in this build of avconv. + @end table @section Audio Options

1 0

Merge commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3'
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Mon Aug 31 10:00:07 2015 +0200| [ad79fa471b6fc9b5d39d0ce4b5bb28cb616940bc] | committer: Hendrik Leppkes Merge commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3' * commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3': avconv_opt: Add missing comma Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad79fa471b6fc9b5d… ---

1 0

avconv_opt: Add missing comma
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Timothy Gu <timothygu99(a)gmail.com> | Tue Aug 25 16:49:07 2015 -0700| [629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3] | committer: Luca Barbato avconv_opt: Add missing comma Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=629d4c5b4deee08bf… --- avconv_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avconv_opt.c b/avconv_opt.c index 9775416..b527335 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -2445,7 +2445,7 @@ const OptionDef options[] = { "use HW accelerated decoding", "hwaccel name" }, { "hwaccel_device", OPT_VIDEO | OPT_STRING | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_INPUT, { .off = OFFSET(hwaccel_devices) }, - "select a device for HW acceleration" "devicename" }, + "select a device for HW acceleration", "devicename" }, { "autorotate", HAS_ARG | OPT_BOOL | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(autorotate) }, "automatically insert correct rotate filters" },

1 0

avfilter/vf_scale: If no output color matrix is specified, use the input
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Aug 31 00:17:50 2015 +0200| [58a0b7f1143511b712741af91d5f4bcbbe9d1488] | committer: Michael Niedermayer avfilter/vf_scale: If no output color matrix is specified, use the input This should only affect yuv->yuv, and not change behavior Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58a0b7f1143511b71… --- libavfilter/vf_scale.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 01f0020..89a80ee 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -535,6 +535,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) inv_table = parse_yuv_type(scale->in_color_matrix, av_frame_get_colorspace(in)); if (scale->out_color_matrix) table = parse_yuv_type(scale->out_color_matrix, AVCOL_SPC_UNSPECIFIED); + else if (scale->in_color_matrix) + table = inv_table; if (scale-> in_range != AVCOL_RANGE_UNSPECIFIED) in_full = (scale-> in_range == AVCOL_RANGE_JPEG);

1 0

swscale/utils: If cascaded contexts are used forward sws_setColorspaceDetails() to the first context
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Aug 31 00:34:55 2015 +0200| [1acd6311a100859f3ef4119790da9d5cb5546979] | committer: Michael Niedermayer swscale/utils: If cascaded contexts are used forward sws_setColorspaceDetails() to the first context Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1acd6311a100859f3… --- libswscale/utils.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 53f68db..4664de4 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -855,6 +855,12 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], if (need_reinit && (c->srcBpc == 8 || !isYUV(c->srcFormat))) ff_sws_init_range_convert(c); + c->dstFormatBpp = av_get_bits_per_pixel(desc_dst); + c->srcFormatBpp = av_get_bits_per_pixel(desc_src); + + if (c->cascaded_context[0]) + return sws_setColorspaceDetails(c->cascaded_context[0],inv_table, srcRange,table, dstRange, brightness, contrast, saturation); + if ((isYUV(c->dstFormat) || isGray(c->dstFormat)) && (isYUV(c->srcFormat) || isGray(c->srcFormat))) { if (!c->cascaded_context[0] && memcmp(c->dstColorspaceTable, c->srcColorspaceTable, sizeof(int) * 4) && @@ -923,9 +929,6 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], return -1; } - c->dstFormatBpp = av_get_bits_per_pixel(desc_dst); - c->srcFormatBpp = av_get_bits_per_pixel(desc_src); - if (!isYUV(c->dstFormat) && !isGray(c->dstFormat)) { ff_yuv2rgb_c_init_tables(c, inv_table, srcRange, brightness, contrast, saturation);

1 0

swscale/utils: Split scaling if possible and yuv-> yuv with different matrixes is requested
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Aug 30 23:58:37 2015 +0200| [8e05f9217ae567a26ea71dd29acd79b1631ae593] | committer: Michael Niedermayer swscale/utils: Split scaling if possible and yuv->yuv with different matrixes is requested This uses a RGB intermediate, a more optimal solution would be to perform the rematrixing directly in subsampled YUV, this is quite a bit more complicated though Fixes Ticket4805 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8e05f9217ae567a26… --- libswscale/utils.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 181a48a..53f68db 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -855,8 +855,73 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], if (need_reinit && (c->srcBpc == 8 || !isYUV(c->srcFormat))) ff_sws_init_range_convert(c); - if ((isYUV(c->dstFormat) || isGray(c->dstFormat)) && (isYUV(c->srcFormat) || isGray(c->srcFormat))) + if ((isYUV(c->dstFormat) || isGray(c->dstFormat)) && (isYUV(c->srcFormat) || isGray(c->srcFormat))) { + if (!c->cascaded_context[0] && + memcmp(c->dstColorspaceTable, c->srcColorspaceTable, sizeof(int) * 4) && + c->srcW && c->srcH && c->dstW && c->dstH) { + enum AVPixelFormat tmp_format; + int tmp_width, tmp_height; + int srcW = c->srcW; + int srcH = c->srcH; + int dstW = c->dstW; + int dstH = c->dstH; + int ret; + av_log(c, AV_LOG_VERBOSE, "YUV color matrix differs for YUV->YUV, using intermediate RGB to convert\n"); + + if (isNBPS(c->dstFormat) || is16BPS(c->dstFormat)) { + if (isALPHA(c->srcFormat) && isALPHA(c->dstFormat)) { + tmp_format = AV_PIX_FMT_BGRA64; + } else { + tmp_format = AV_PIX_FMT_BGR48; + } + } else { + if (isALPHA(c->srcFormat) && isALPHA(c->dstFormat)) { + tmp_format = AV_PIX_FMT_BGRA; + } else { + tmp_format = AV_PIX_FMT_BGR24; + } + } + + if (srcW*srcH > dstW*dstH) { + tmp_width = dstW; + tmp_height = dstH; + } else { + tmp_width = srcW; + tmp_height = srcH; + } + + ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, + tmp_width, tmp_height, tmp_format, 64); + if (ret < 0) + return ret; + + c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, c->srcFormat, + tmp_width, tmp_height, tmp_format, + c->flags, c->param); + if (!c->cascaded_context[0]) + return -1; + + c->cascaded_context[0]->alphablend = c->alphablend; + ret = sws_init_context(c->cascaded_context[0], NULL , NULL); + if (ret < 0) + return ret; + //we set both src and dst depending on that the RGB side will be ignored + sws_setColorspaceDetails(c->cascaded_context[0], inv_table, + srcRange, table, dstRange, + brightness, contrast, saturation); + + c->cascaded_context[1] = sws_getContext(tmp_width, tmp_height, tmp_format, + dstW, dstH, c->dstFormat, + c->flags, NULL, NULL, c->param); + if (!c->cascaded_context[1]) + return -1; + sws_setColorspaceDetails(c->cascaded_context[1], inv_table, + srcRange, table, dstRange, + 0, 1 << 16, 1 << 16); + return 0; + } return -1; + } c->dstFormatBpp = av_get_bits_per_pixel(desc_dst); c->srcFormatBpp = av_get_bits_per_pixel(desc_src);

1 0

avfilter/vf_scale: Do not skip scale if the color matrix mismatches
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Aug 30 23:49:04 2015 +0200| [5a00c30041a47f49c070b36939d64bcd3c811fe0] | committer: Michael Niedermayer avfilter/vf_scale: Do not skip scale if the color matrix mismatches Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a00c30041a47f49c… --- libavfilter/vf_scale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index be061e2..01f0020 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -350,6 +350,7 @@ static int config_props(AVFilterLink *outlink) scale->isws[0] = scale->isws[1] = scale->sws = NULL; if (inlink0->w == outlink->w && inlink0->h == outlink->h && + !scale->out_color_matrix && scale->in_range == scale->out_range && inlink0->format == outlink->format) ;

1 0

avfilter/vf_scale: Do not skip scale if range mismatches
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Sun Aug 30 23:46:11 2015 +0200| [75d9006475a1b07544ca3c116c02689c8cc1a90c] | committer: Michael Niedermayer avfilter/vf_scale: Do not skip scale if range mismatches Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75d9006475a1b0754… --- libavfilter/vf_scale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 9698bfb..be061e2 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -350,6 +350,7 @@ static int config_props(AVFilterLink *outlink) scale->isws[0] = scale->isws[1] = scale->sws = NULL; if (inlink0->w == outlink->w && inlink0->h == outlink->h && + scale->in_range == scale->out_range && inlink0->format == outlink->format) ; else {

1 0

fate: add -fflags +bitexact to the relevant targets
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Sat Aug 22 15:34:28 2015 +0200| [c64060d56a049feb4537a50db6aa31307264f893] | committer: Andreas Cadhalpun fate: add -fflags +bitexact to the relevant targets This fixes fate with FF_API_LAVF_BITEXACT disabled. Reviewed-by: Ronald S. Bultje <rsbultje(a)gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c64060d56a049feb4… --- tests/Makefile | 2 +- tests/fate-run.sh | 18 +++++++++--------- tests/fate/mpeg4.mak | 2 +- tests/fate/subtitles.mak | 4 ++-- tests/fate/vqf.mak | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 06ed011..4791ade 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -48,7 +48,7 @@ tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) tests/test_copy.ffmeta $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -f lavfi -i "aevalsrc=sin(400*PI*2*t):d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \ -f ffmetadata -i $(TARGET_PATH)/tests/test_copy.ffmeta \ - -flags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \ + -flags +bitexact -fflags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \ -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \ -vcodec rawvideo -acodec pcm_s16le \ -y $(TARGET_PATH)/$@ 2>/dev/null diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 7aa5df2..c55609d 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -102,11 +102,11 @@ ffmpeg(){ } framecrc(){ - ffmpeg "$@" -flags +bitexact -f framecrc - + ffmpeg "$@" -flags +bitexact -fflags +bitexact -f framecrc - } framemd5(){ - ffmpeg "$@" -flags +bitexact -f framemd5 - + ffmpeg "$@" -flags +bitexact -fflags +bitexact -f framemd5 - } crc(){ @@ -124,7 +124,7 @@ pcm(){ fmtstdout(){ fmt=$1 shift 1 - ffmpeg -flags +bitexact "$@" -f $fmt - + ffmpeg -flags +bitexact -fflags +bitexact "$@" -f $fmt - } enc_dec_pcm(){ @@ -137,7 +137,7 @@ enc_dec_pcm(){ cleanfiles=$encfile encfile=$(target_path ${encfile}) ffmpeg -i $src_file "$@" -f $out_fmt -y ${encfile} || return - ffmpeg -flags +bitexact -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} - + ffmpeg -flags +bitexact -fflags +bitexact -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} - } FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact -fflags +bitexact" @@ -231,16 +231,16 @@ gapless(){ cleanfiles="$cleanfiles $decfile1 $decfile2 $decfile3" # test packet data - ffmpeg $extra_args -i "$sample" -flags +bitexact -c:a copy -f framecrc -y $decfile1 + ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile1 do_md5sum $decfile1 # test decoded (and cut) data - ffmpeg $extra_args -i "$sample" -flags +bitexact -f wav md5: + ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -f wav md5: # the same as above again, with seeking to the start - ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -c:a copy -f framecrc -y $decfile2 + ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile2 do_md5sum $decfile2 - ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -f wav md5: + ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -f wav md5: # test packet data, with seeking to a specific position - ffmpeg $extra_args -ss 5 -seek_timestamp 1 -i "$sample" -flags +bitexact -c:a copy -f framecrc -y $decfile3 + ffmpeg $extra_args -ss 5 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile3 do_md5sum $decfile3 } diff --git a/tests/fate/mpeg4.mak b/tests/fate/mpeg4.mak index b24d21a..47dfb7f 100644 --- a/tests/fate/mpeg4.mak +++ b/tests/fate/mpeg4.mak @@ -5,7 +5,7 @@ fate-mpeg4-resolution-change-%: CMD = framemd5 -flags +bitexact -idct simple -i FATE_MPEG4-$(call DEMDEC, H263, H263) := $(addprefix fate-mpeg4-resolution-change-, $(MPEG4_RESOLUTION_CHANGE)) -fate-mpeg4-bsf-unpack-bframes: CMD = md5 -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -c:v copy -bsf mpeg4_unpack_bframes -f avi +fate-mpeg4-bsf-unpack-bframes: CMD = md5 -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -c:v copy -bsf mpeg4_unpack_bframes -f avi FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_UNPACK_BFRAMES_BSF AVI_MUXER) += fate-mpeg4-bsf-unpack-bframes FATE_SAMPLES_AVCONV += $(FATE_MPEG4-yes) diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index d8b2034..a656d5a 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -11,7 +11,7 @@ FATE_SUBTITLES_ASS-$(CONFIG_ASS_DEMUXER) += fate-sub-ssa-to-ass-remux fate-sub-ssa-to-ass-remux: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/a9-misc.ssa -c copy FATE_SUBTITLES-$(call ALLYES, ASS_DEMUXER, MATROSKA_MUXER) += fate-binsub-mksenc -fate-binsub-mksenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/1ededcbd7b.ass -c copy -f matroska -flags +bitexact +fate-binsub-mksenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/1ededcbd7b.ass -c copy -f matroska -flags +bitexact -fflags +bitexact FATE_SUBTITLES_ASS-$(call DEMDEC, JACOSUB, JACOSUB) += fate-sub-jacosub fate-sub-jacosub: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/JACOsub_capability_tester.jss @@ -26,7 +26,7 @@ FATE_SUBTITLES_ASS-$(call DEMDEC, MOV, MOVTEXT) += fate-sub-movtext fate-sub-movtext: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc -fate-binsub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -movflags frag_keyframe+empty_moov +fate-binsub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2 fate-sub-mpl2: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPL2_capability_tester.txt diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak index ac18ebd..40e7021 100644 --- a/tests/fate/vqf.mak +++ b/tests/fate/vqf.mak @@ -4,7 +4,7 @@ fate-twinvq: CMP = oneoff fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm FATE_VQF-$(CONFIG_VQF_DEMUXER) += fate-vqf-demux -fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -acodec copy -flags bitexact -f framecrc +fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -acodec copy -flags bitexact -fflags +bitexact -f framecrc FATE_VQF += $(FATE_VQF-yes)

1 0

avfilter: add missing FF_API_AVFILTERBUFFER guards
by git＠videolan.org 30 Aug '15

30 Aug '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Mon Aug 17 00:34:58 2015 +0200| [e6c20e214efd21cac56309c1548cf5dbdf1edf38] | committer: Andreas Cadhalpun avfilter: add missing FF_API_AVFILTERBUFFER guards Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6c20e214efd21cac… --- libavfilter/audio.c | 4 ++++ libavfilter/avfilter.h | 6 +++++- libavfilter/buffersink.c | 4 ++++ libavfilter/buffersrc.h | 3 +++ libavfilter/internal.h | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libavfilter/audio.c b/libavfilter/audio.c index a49bcf4..e322298 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -28,10 +28,14 @@ #include "avfilter.h" #include "internal.h" +#if FF_API_AVFILTERBUFFER +FF_DISABLE_DEPRECATION_WARNINGS int avfilter_ref_get_channels(AVFilterBufferRef *ref) { return ref->audio ? ref->audio->channels : 0; } +FF_ENABLE_DEPRECATION_WARNINGS +#endif AVFrame *ff_null_get_audio_buffer(AVFilterLink *link, int nb_samples) { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 296f2d3..584623f 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -234,13 +234,13 @@ void avfilter_unref_buffer(AVFilterBufferRef *ref); */ attribute_deprecated void avfilter_unref_bufferp(AVFilterBufferRef **ref); -#endif /** * Get the number of channels of a buffer reference. */ attribute_deprecated int avfilter_ref_get_channels(AVFilterBufferRef *ref); +#endif #if FF_API_AVFILTERPAD_PUBLIC /** @@ -763,7 +763,9 @@ struct AVFilterLink { AVLINK_INIT ///< complete } init_state; +#if FF_API_AVFILTERBUFFER struct AVFilterPool *pool; +#endif /** * Graph the filter belongs to. @@ -819,6 +821,7 @@ struct AVFilterLink { */ int max_samples; +#if FF_API_AVFILTERBUFFER /** * The buffer reference currently being received across the link by the * destination filter. This is used internally by the filter system to @@ -827,6 +830,7 @@ struct AVFilterLink { * by the filters. */ AVFilterBufferRef *cur_buf_copy; +#endif /** * True if the link is closed. diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 36b9e42..8d2e7d7 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -363,6 +363,8 @@ AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx) return ctx->inputs[0]->frame_rate; } +#if FF_API_AVFILTERBUFFER +FF_DISABLE_DEPRECATION_WARNINGS int attribute_align_arg av_buffersink_poll_frame(AVFilterContext *ctx) { BufferSinkContext *buf = ctx->priv; @@ -375,6 +377,8 @@ int attribute_align_arg av_buffersink_poll_frame(AVFilterContext *ctx) return av_fifo_size(buf->fifo)/FIFO_INIT_ELEMENT_SIZE + ff_poll_frame(inlink); } +FF_ENABLE_DEPRECATION_WARNINGS +#endif static av_cold int vsink_init(AVFilterContext *ctx, void *opaque) { diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h index ea34c04..4eff77b 100644 --- a/libavfilter/buffersrc.h +++ b/libavfilter/buffersrc.h @@ -63,6 +63,7 @@ enum { }; +#if FF_API_AVFILTERBUFFER /** * Add buffer data in picref to buffer_src. * @@ -72,8 +73,10 @@ enum { * @return >= 0 in case of success, a negative AVERROR code * in case of failure */ +attribute_deprecated int av_buffersrc_add_ref(AVFilterContext *buffer_src, AVFilterBufferRef *picref, int flags); +#endif /** * Get the number of failed requests. diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 797c884..7dde2e1 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -33,6 +33,7 @@ #include "video.h" #include "libavcodec/avcodec.h" +#if FF_API_AVFILTERBUFFER #define POOL_SIZE 32 typedef struct AVFilterPool { AVFilterBufferRef *pic[POOL_SIZE]; @@ -40,6 +41,7 @@ typedef struct AVFilterPool { int refcount; int draining; } AVFilterPool; +#endif typedef struct AVFilterCommand { double time; ///< time expressed in seconds

1 0