December 2016 - ffmpeg-cvslog

lavc/psd: Remove an uninitialized variable.
by git＠videolan.org 30 Dec '16

30 Dec '16

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Fri Dec 30 12:08:26 2016 +0100| [ec2f3b1f57fd5fc01c8ddb0c927112a18bcd7cba] | committer: Carl Eugen Hoyos lavc/psd: Remove an uninitialized variable. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec2f3b1f57fd5fc01… --- libavcodec/psd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/psd.c b/libavcodec/psd.c index d5a4f52..3181a41 100644 --- a/libavcodec/psd.c +++ b/libavcodec/psd.c @@ -64,7 +64,7 @@ typedef struct PSDContext { static int decode_header(PSDContext * s) { - int signature, version, color_mode, compression; + int signature, version, color_mode; int64_t len_section; int ret = 0; @@ -207,7 +207,7 @@ static int decode_header(PSDContext * s) return AVERROR_PATCHWELCOME; break; default: - av_log(s->avctx, AV_LOG_ERROR, "Unknown compression %d.\n", compression); + av_log(s->avctx, AV_LOG_ERROR, "Unknown compression %d.\n", s->compression); return AVERROR_INVALIDDATA; }

1 0

configure: make the check for stdatomic.h stricter
by git＠videolan.org 30 Dec '16

30 Dec '16

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Dec 27 21:54:55 2016 -0300| [6993bb4eb6c358c390f674a10f8a8ca69d9ee0fe] | committer: James Almer configure: make the check for stdatomic.h stricter Old ICC verions don't advertise having a full C11 implementation but may nonetheless include a feature-incomplete stdatomic.h header. Fixes ticket #6049 Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6993bb4eb6c358c39… --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index d723b8e..56a0b65 100755 --- a/configure +++ b/configure @@ -5623,7 +5623,7 @@ check_header asm/types.h # it seems there are versions of clang in some distros that try to use the # gcc headers, which explodes for stdatomic # so we also check that atomics actually work here -check_builtin stdatomic_h stdatomic.h "atomic_int foo; atomic_store(&foo, 0)" +check_builtin stdatomic_h stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0)" check_lib2 "windows.h shellapi.h" CommandLineToArgvW -lshell32 check_lib2 "windows.h wincrypt.h" CryptGenRandom -ladvapi32

1 0

avfilter/vf_pad: Add eval=frame support
by git＠videolan.org 30 Dec '16

30 Dec '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Dec 28 02:35:14 2016 +0100| [ffc3337e0b84ba83fb78382e89a24bb92733bb0d] | committer: Michael Niedermayer avfilter/vf_pad: Add eval=frame support Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffc3337e0b84ba83f… --- doc/filters.texi | 18 ++++++++++++++++++ libavfilter/vf_pad.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 6ad2db2..45a7569 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10422,6 +10422,24 @@ Specify the color of the padded area. For the syntax of this option, check the "Color" section in the ffmpeg-utils manual. The default value of @var{color} is "black". + +@item eval +Specify when to evaluate @var{width}, @var{height}, @var{x} and @var{y} expression. + +It accepts the following values: + +@table @samp +@item init +Only evaluate expressions once during the filter initialization or when +a command is processed. + +@item frame +Evaluate expressions for each incoming frame. + +@end table + +Default value is @samp{init}. + @end table The value for the @var{width}, @var{height}, @var{x}, and @var{y} diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index dfc873c..9739a0f 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -75,11 +75,18 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); } +enum EvalMode { + EVAL_MODE_INIT, + EVAL_MODE_FRAME, + EVAL_MODE_NB +}; + typedef struct PadContext { const AVClass *class; int w, h; ///< output dimensions, a value of 0 will result in the input size int x, y; ///< offsets of the input area with respect to the padded area int in_w, in_h; ///< width and height for the padded input video, which has to be aligned to the chroma values in order to avoid chroma issues + int inlink_w, inlink_h; char *w_expr; ///< width expression string char *h_expr; ///< height expression string @@ -88,6 +95,8 @@ typedef struct PadContext { uint8_t rgba_color[4]; ///< color for the padding area FFDrawContext draw; FFDrawColor color; + + int eval_mode; ///< expression evaluation mode } PadContext; static int config_input(AVFilterLink *inlink) @@ -163,6 +172,8 @@ static int config_input(AVFilterLink *inlink) s->y = ff_draw_round_to_sub(&s->draw, 1, -1, s->y); s->in_w = ff_draw_round_to_sub(&s->draw, 0, -1, inlink->w); s->in_h = ff_draw_round_to_sub(&s->draw, 1, -1, inlink->h); + s->inlink_w = inlink->w; + s->inlink_h = inlink->h; av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d -> w:%d h:%d x:%d y:%d color:0x%02X%02X%02X%02X\n", inlink->w, inlink->h, s->w, s->h, s->x, s->y, @@ -290,8 +301,35 @@ static int frame_needs_copy(PadContext *s, AVFrame *frame) static int filter_frame(AVFilterLink *inlink, AVFrame *in) { PadContext *s = inlink->dst->priv; + AVFilterLink *outlink = inlink->dst->outputs[0]; AVFrame *out; - int needs_copy = frame_needs_copy(s, in); + int needs_copy; + if(s->eval_mode == EVAL_MODE_FRAME && ( + in->width != s->inlink_w + || in->height != s->inlink_h + || in->format != outlink->format + || in->sample_aspect_ratio.den != outlink->sample_aspect_ratio.den || in->sample_aspect_ratio.num != outlink->sample_aspect_ratio.num)) { + int ret; + + inlink->dst->inputs[0]->format = in->format; + inlink->dst->inputs[0]->w = in->width; + inlink->dst->inputs[0]->h = in->height; + + inlink->dst->inputs[0]->sample_aspect_ratio.den = in->sample_aspect_ratio.den; + inlink->dst->inputs[0]->sample_aspect_ratio.num = in->sample_aspect_ratio.num; + + + if ((ret = config_input(inlink)) < 0) { + s->inlink_w = -1; + return ret; + } + if ((ret = config_output(outlink)) < 0) { + s->inlink_w = -1; + return ret; + } + } + + needs_copy = frame_needs_copy(s, in); if (needs_copy) { av_log(inlink->dst, AV_LOG_DEBUG, "Direct padding impossible allocating new frame\n"); @@ -364,6 +402,9 @@ static const AVOption pad_options[] = { { "x", "set the x offset expression for the input image position", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS }, { "y", "set the y offset expression for the input image position", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS }, { "color", "set the color of the padded area border", OFFSET(rgba_color), AV_OPT_TYPE_COLOR, {.str = "black"}, .flags = FLAGS }, + { "eval", "specify when to evaluate expressions", OFFSET(eval_mode), AV_OPT_TYPE_INT, {.i64 = EVAL_MODE_INIT}, 0, EVAL_MODE_NB-1, FLAGS, "eval" }, + { "init", "eval expressions once during initialization", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_INIT}, .flags = FLAGS, .unit = "eval" }, + { "frame", "eval expressions during initialization and per-frame", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_FRAME}, .flags = FLAGS, .unit = "eval" }, { NULL } };

1 0

lavf/utils.c Protect against accessing entries[nb_entries]
by git＠videolan.org 29 Dec '16

29 Dec '16

ffmpeg | branch: master | Matt Wolenetz <wolenetz(a)chromium.org> | Mon Nov 21 15:54:02 2016 -0800| [fe7547d69e6721d064c8604d0a6375a2d24b35ca] | committer: Michael Niedermayer lavf/utils.c Protect against accessing entries[nb_entries] In ff_index_search_timestamp(), if b == num_entries, m == num_entries - 1, and entries[m].flags & AVINDEX_DISCARD_FRAME is true, then the search for the next non-discarded packet could access entries[nb_entries], exceeding its bounds. This change adds a protection against that scenario. Reference: https://crbug.com/666770 Reviewed-by: Sasi Inguva <isasi(a)google.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe7547d69e6721d06… --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 50a30f6..d5dfca7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1981,7 +1981,7 @@ int ff_index_search_timestamp(const AVIndexEntry *entries, int nb_entries, m = (a + b) >> 1; // Search for the next non-discarded packet. - while ((entries[m].flags & AVINDEX_DISCARD_FRAME) && m < b) { + while ((entries[m].flags & AVINDEX_DISCARD_FRAME) && m < b && m < nb_entries - 1) { m++; if (m == b && entries[m].timestamp >= wanted_timestamp) { m = b - 1;

1 0

libavformat/hlsenc: fix delete_segments when use_localtime_mkdir
by git＠videolan.org 29 Dec '16

29 Dec '16

ffmpeg | branch: master | Bela Bodecs <bodecsb(a)vivanet.hu> | Thu Dec 29 12:00:20 2016 +0800| [9ec52a0a9b086d8a916a580ad594c126cd810a45] | committer: Bela Bodecs libavformat/hlsenc: fix delete_segments when use_localtime_mkdir When delete_segments hls_flag is specified, deleting old segments may fail in certain cases when use_localtime_mkdir is in effect and hls_segment_filename expression contains subdirs. This patch fixes this behaviour. Signed-off-by: Bela Bodecs <bodecsb(a)vivanet.hu> Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ec52a0a9b086d8a9… --- libavformat/hlsenc.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index cf4d4bd..c9d8e3c 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -194,7 +194,7 @@ static int hls_delete_old_segments(HLSContext *hls) { } } - if (segment) { + if (segment && !hls->use_localtime_mkdir) { if (hls->segment_filename) { dirname = av_strdup(hls->segment_filename); } else { @@ -211,15 +211,20 @@ static int hls_delete_old_segments(HLSContext *hls) { while (segment) { av_log(hls, AV_LOG_DEBUG, "deleting old segment %s\n", segment->filename); - path_size = strlen(dirname) + strlen(segment->filename) + 1; + path_size = (hls->use_localtime_mkdir ? 0 : strlen(dirname)) + strlen(segment->filename) + 1; path = av_malloc(path_size); if (!path) { ret = AVERROR(ENOMEM); goto fail; } - av_strlcpy(path, dirname, path_size); - av_strlcat(path, segment->filename, path_size); + if (hls->use_localtime_mkdir) + av_strlcpy(path, segment->filename, path_size); + else { // segment->filename contains basename only + av_strlcpy(path, dirname, path_size); + av_strlcat(path, segment->filename, path_size); + } + if (unlink(path) < 0) { av_log(hls, AV_LOG_ERROR, "failed to delete old segment %s: %s\n", path, strerror(errno));

1 0

ffmpeg: remove stop_encoding variable and related code, it is dead / unused code
by git＠videolan.org 28 Dec '16

28 Dec '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Dec 26 21:35:12 2016 +0100| [a830ab3f3b1dc06dcd565a2145eb6bcbd4fbf381] | committer: Michael Niedermayer ffmpeg: remove stop_encoding variable and related code, it is dead / unused code Fixes: CID1396243 Reviewed-by: compn <tempn(a)mi.rr.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a830ab3f3b1dc06dc… --- ffmpeg.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index ec9da3e..b85c314 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1797,7 +1797,6 @@ static void flush_encoders(void) OutputStream *ost = output_streams[i]; AVCodecContext *enc = ost->enc_ctx; OutputFile *of = output_files[ost->file_index]; - int stop_encoding = 0; if (!ost->encoding_needed) continue; @@ -1816,6 +1815,8 @@ static void flush_encoders(void) for (;;) { const char *desc = NULL; + AVPacket pkt; + int pkt_size; switch (enc->codec_type) { case AVMEDIA_TYPE_AUDIO: @@ -1828,9 +1829,6 @@ static void flush_encoders(void) av_assert0(0); } - if (1) { - AVPacket pkt; - int pkt_size; av_init_packet(&pkt); pkt.data = NULL; pkt.size = 0; @@ -1848,7 +1846,6 @@ static void flush_encoders(void) fprintf(ost->logfile, "%s", enc->stats_out); } if (ret == AVERROR_EOF) { - stop_encoding = 1; break; } if (ost->finished & MUXER_FINISHED) { @@ -1861,10 +1858,6 @@ static void flush_encoders(void) if (ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) { do_video_stats(ost, pkt_size); } - } - - if (stop_encoding) - break; } } }

1 0

libavformat/tee: Add fifo support for tee
by git＠videolan.org 28 Dec '16

28 Dec '16

ffmpeg | branch: master | Jan Sebechlebsky <sebechlebskyjan(a)gmail.com> | Sun Oct 30 19:18:21 2016 +0100| [7c91ee01cc8b9e952fede063be398f173d185c01] | committer: Jan Sebechlebsky libavformat/tee: Add fifo support for tee Signed-off-by: Jan Sebechlebsky <sebechlebskyjan(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c91ee01cc8b9e952… --- doc/muxers.texi | 20 +++++++++++++ libavformat/tee.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 1 deletion(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 3520120..c2598b2 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1494,6 +1494,7 @@ Specify whether to remove all fragments when finished. Default 0 (do not remove) @end table +@anchor{fifo} @section fifo The fifo pseudo-muxer allows the separation of encoding and muxing by using @@ -1601,6 +1602,18 @@ with the tee muxer; encoding can be a very expensive process. It is not useful when using the libavformat API directly because it is then possible to feed the same packets to several muxers directly. +@table @option + +@item use_fifo @var{bool} +If set to 1, slave outputs will be processed in separate thread using @ref{fifo} +muxer. This allows to compensate for different speed/latency/reliability of +outputs and setup transparent recovery. By default this feature is turned off. + +@item fifo_options +Options to pass to fifo pseudo-muxer instances. See @ref{fifo}. + +@end table + The slave outputs are specified in the file name given to the muxer, separated by '|'. If any of the slave name contains the '|' separator, leading or trailing spaces or any special character, it must be @@ -1622,6 +1635,13 @@ output name suffix. Specify a list of bitstream filters to apply to the specified output. +@item use_fifo @var{bool} +This allows to override tee muxer use_fifo option for individual slave muxer. + +@item fifo_options +This allows to override tee muxer fifo_options for individual slave muxer. +See @ref{fifo}. + It is possible to specify to which streams a given bitstream filter applies, by appending a stream specifier to the option separated by @code{/}. @var{spec} must be a stream specifier (see @ref{Format diff --git a/libavformat/tee.c b/libavformat/tee.c index d59ad4d..99259a7 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -40,6 +40,8 @@ typedef struct { AVBSFContext **bsfs; ///< bitstream filters per stream SlaveFailurePolicy on_fail; + int use_fifo; + AVDictionary *fifo_options; /** map from input to output streams indexes, * disabled output streams are set to -1 */ @@ -52,15 +54,28 @@ typedef struct TeeContext { unsigned nb_slaves; unsigned nb_alive; TeeSlave *slaves; + int use_fifo; + AVDictionary *fifo_options; + char *fifo_options_str; } TeeContext; static const char *const slave_delim = "|"; static const char *const slave_bsfs_spec_sep = "/"; static const char *const slave_select_sep = ","; +#define OFFSET(x) offsetof(TeeContext, x) +static const AVOption options[] = { + {"use_fifo", "Use fifo pseudo-muxer to separate actual muxers from encoder", + OFFSET(use_fifo), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, + {"fifo_options", "fifo pseudo-muxer options", OFFSET(fifo_options_str), + AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM}, + {NULL} +}; + static const AVClass tee_muxer_class = { .class_name = "Tee muxer", .item_name = av_default_item_name, + .option = options, .version = LIBAVUTIL_VERSION_INT, }; @@ -81,6 +96,29 @@ static inline int parse_slave_failure_policy_option(const char *opt, TeeSlave *t return AVERROR(EINVAL); } +static int parse_slave_fifo_options(const char *use_fifo, + const char *fifo_options, TeeSlave *tee_slave) +{ + int ret = 0; + + if (use_fifo) { + /*TODO - change this to use proper function for parsing boolean + * options when there is one */ + if (av_match_name(use_fifo, "true,y,yes,enable,enabled,on,1")) { + tee_slave->use_fifo = 1; + } else if (av_match_name(use_fifo, "false,n,no,disable,disabled,off,0")) { + tee_slave->use_fifo = 0; + } else { + return AVERROR(EINVAL); + } + } + + if (fifo_options) + ret = av_dict_parse_string(&tee_slave->fifo_options, fifo_options, "=", ":", 0); + + return ret; +} + static int close_slave(TeeSlave *tee_slave) { AVFormatContext *avf; @@ -125,6 +163,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) AVDictionaryEntry *entry; char *filename; char *format = NULL, *select = NULL, *on_fail = NULL; + char *use_fifo = NULL, *fifo_options_str = NULL; AVFormatContext *avf2 = NULL; AVStream *st, *st2; int stream_count; @@ -145,6 +184,8 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) STEAL_OPTION("f", format); STEAL_OPTION("select", select); STEAL_OPTION("onfail", on_fail); + STEAL_OPTION("use_fifo", use_fifo); + STEAL_OPTION("fifo_options", fifo_options_str); ret = parse_slave_failure_policy_option(on_fail, tee_slave); if (ret < 0) { @@ -153,7 +194,39 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) goto end; } - ret = avformat_alloc_output_context2(&avf2, NULL, format, filename); + ret = parse_slave_fifo_options(use_fifo, fifo_options_str, tee_slave); + if (ret < 0) { + av_log(avf, AV_LOG_ERROR, "Error parsing fifo options: %s\n", av_err2str(ret)); + goto end; + } + + if (tee_slave->use_fifo) { + + if (options) { + char *format_options_str = NULL; + ret = av_dict_get_string(options, &format_options_str, '=', ':'); + if (ret < 0) + goto end; + + ret = av_dict_set(&tee_slave->fifo_options, "format_options", format_options_str, + AV_DICT_DONT_STRDUP_VAL); + if (ret < 0) + goto end; + } + + if (format) { + ret = av_dict_set(&tee_slave->fifo_options, "fifo_format", format, + AV_DICT_DONT_STRDUP_VAL); + format = NULL; + if (ret < 0) + goto end; + } + + av_dict_free(&options); + options = tee_slave->fifo_options; + } + ret = avformat_alloc_output_context2(&avf2, NULL, + tee_slave->use_fifo ? "fifo" :format, filename); if (ret < 0) goto end; tee_slave->avf = avf2; @@ -394,6 +467,12 @@ static int tee_write_header(AVFormatContext *avf) filename++; } + if (tee->fifo_options_str) { + ret = av_dict_parse_string(&tee->fifo_options, tee->fifo_options_str, "=", ":", 0); + if (ret < 0) + goto fail; + } + if (!(tee->slaves = av_mallocz_array(nb_slaves, sizeof(*tee->slaves)))) { ret = AVERROR(ENOMEM); goto fail; @@ -401,6 +480,12 @@ static int tee_write_header(AVFormatContext *avf) tee->nb_slaves = tee->nb_alive = nb_slaves; for (i = 0; i < nb_slaves; i++) { + + tee->slaves[i].use_fifo = tee->use_fifo; + ret = av_dict_copy(&tee->slaves[i].fifo_options, tee->fifo_options, 0); + if (ret < 0) + goto fail; + if ((ret = open_slave(avf, slaves[i], &tee->slaves[i])) < 0) { ret = tee_process_slave_failure(avf, i, ret); if (ret < 0)

1 0

avcodec/libopenjpegdec: Set key frame metadata
by git＠videolan.org 28 Dec '16

28 Dec '16

ffmpeg | branch: master | Michael Bradshaw <mjbshaw(a)google.com> | Tue Dec 27 21:34:41 2016 -0800| [616513ef6e6d967bbda4543e548d8d3fd4e49c15] | committer: Michael Niedermayer avcodec/libopenjpegdec: Set key frame metadata Signed-off-by: Michael Bradshaw <mjbshaw(a)google.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=616513ef6e6d967bb… --- libavcodec/libopenjpegdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index b4ce834..f09f4ba 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -546,6 +546,8 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, } *got_frame = 1; + picture->pict_type = AV_PICTURE_TYPE_I; + picture->key_frame = 1; ret = buf_size; done:

1 0

avutil/tests/audio_fifo.c: Corrected test error messages
by git＠videolan.org 28 Dec '16

28 Dec '16

ffmpeg | branch: master | Thomas Turner <thomastdt(a)googlemail.com> | Tue Dec 27 18:43:20 2016 -0800| [d7a3c7427f95bd1ad7e6aa36e23d6d048596a717] | committer: Michael Niedermayer avutil/tests/audio_fifo.c: Corrected test error messages Signed-off-by: Thomas Turner <thomastdt(a)googlemail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7a3c7427f95bd1ad… --- libavutil/tests/audio_fifo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/tests/audio_fifo.c b/libavutil/tests/audio_fifo.c index 34c8573..381f709 100644 --- a/libavutil/tests/audio_fifo.c +++ b/libavutil/tests/audio_fifo.c @@ -140,7 +140,7 @@ static void test_function(const TestStruct test_sample) ret = read_samples_from_audio_fifo(afifo, &output_data, test_sample.nb_samples_pch); if (ret < 0){ - ERROR("ERROR: av_audio_fifo_write failed!"); + ERROR("ERROR: av_audio_fifo_read failed!"); } printf("read: %d\n", ret); print_audio_bytes(&test_sample, output_data, ret); @@ -160,7 +160,7 @@ static void test_function(const TestStruct test_sample) for (i = 0; i < afifo->nb_samples; ++i){ ret = av_audio_fifo_peek_at(afifo, output_data, 1, i); if (ret < 0){ - ERROR("ERROR: av_audio_fifo_peek failed!"); + ERROR("ERROR: av_audio_fifo_peek_at failed!"); } printf("%d:\n", i); print_audio_bytes(&test_sample, output_data, ret);

1 0

af_hdcd: more FATE tests
by git＠videolan.org 28 Dec '16

28 Dec '16

ffmpeg | branch: master | Burt P <pburt0(a)gmail.com> | Sun Dec 18 00:20:48 2016 -0600| [f31708002464c273b8f2c48a46e00437702afab9] | committer: Burt P af_hdcd: more FATE tests Additional/Modified FATE tests improve code coverage from 63.7% to 98.1%. Changed fate-suite sample files: * filter/hdcd-mix.flac (958K) added. It is a much better test than filter/hdcd.flac (910K), which is now unused, but can't be removed. * filter/hdcd-fake20bit.flac (168K) added. It is the first second of filter/hdcd.flac, with the 16-bit LSB copied into bit 20 of a 24-bit stream. There isn't an actual non-16-bit HDCD sample available to test. Signed-off-by: Burt P <pburt0(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f31708002464c273b… --- tests/fate/filter-audio.mak | 84 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 11 deletions(-) diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 9c6f7cd..6de3c46 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -255,17 +255,55 @@ fate-filter-volume: CMD = md5 -i $(SRC) -af aperms=random,volume=precision=fixed fate-filter-volume: CMP = oneline fate-filter-volume: REF = 4d6ba75ef3e32d305d066b9bc771d6f4 -FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd -fate-filter-hdcd: SRC = $(TARGET_SAMPLES)/filter/hdcd.flac -fate-filter-hdcd: CMD = md5 -i $(SRC) -af hdcd -f s24le -fate-filter-hdcd: CMP = oneline -fate-filter-hdcd: REF = 5db465a58d2fd0d06ca944b883b33476 - -FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze -fate-filter-hdcd-analyze: SRC = $(TARGET_SAMPLES)/filter/hdcd.flac -fate-filter-hdcd-analyze: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=pe -f s24le -fate-filter-hdcd-analyze: CMP = oneline -fate-filter-hdcd-analyze: REF = 6e39dc4629c1e84321c0d8bc069b42f6 +# hdcd-mix.flac is a mix of three different sources which are interesting for various reasons: +# first 5 seconds uses packet format A and max LLE of -7.0db +# second 5 seconds uses packet format B and has a gain mismatch between channels +# last 10 seconds is not HDCD but has a coincidental HDCD packet, it needs to be 10 seconds because it also tests the cdt expiration +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-mix +fate-filter-hdcd-mix: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac +fate-filter-hdcd-mix: CMD = md5 -i $(SRC) -af hdcd -f s24le +fate-filter-hdcd-mix: CMP = oneline +fate-filter-hdcd-mix: REF = e7079913e90c124460cdbc712df5b84c + +# output will be different because of the gain mismatch in the second and third parts +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-mix-psoff +fate-filter-hdcd-mix-psoff: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac +fate-filter-hdcd-mix-psoff: CMD = md5 -i $(SRC) -af hdcd=process_stereo=false -f s24le +fate-filter-hdcd-mix-psoff: CMP = oneline +fate-filter-hdcd-mix-psoff: REF = bd0e81fe17696b825ee3515ab928e6bb + +# test the different analyze modes +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-pe +fate-filter-hdcd-analyze-pe: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac +fate-filter-hdcd-analyze-pe: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=pe -f s24le +fate-filter-hdcd-analyze-pe: CMP = oneline +fate-filter-hdcd-analyze-pe: REF = bb83e97bbd0064b9b1c0ef2f2c8f0c77 +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-lle +fate-filter-hdcd-analyze-lle: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac +fate-filter-hdcd-analyze-lle: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=lle -f s24le +fate-filter-hdcd-analyze-lle: CMP = oneline +fate-filter-hdcd-analyze-lle: REF = 121cc4a681aa0caef5c664fece7a3ddc +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-cdt +fate-filter-hdcd-analyze-cdt: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac +fate-filter-hdcd-analyze-cdt: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=cdt -f s24le +fate-filter-hdcd-analyze-cdt: CMP = oneline +fate-filter-hdcd-analyze-cdt: REF = 12136e6a00dd532994f6edcc347af1d4 +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-tgm +fate-filter-hdcd-analyze-tgm: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac +fate-filter-hdcd-analyze-tgm: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=tgm -f s24le +fate-filter-hdcd-analyze-tgm: CMP = oneline +fate-filter-hdcd-analyze-tgm: REF = a3c39f62e9b9b42c9c440d0045d5fb2f +# the two additional analyze modes from libhdcd +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-ltgm +fate-filter-hdcd-analyze-ltgm: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac +fate-filter-hdcd-analyze-ltgm: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=lle:process_stereo=false -f s24le +fate-filter-hdcd-analyze-ltgm: CMP = oneline +fate-filter-hdcd-analyze-ltgm: REF = 76ffd86b762b5a93332039f27e4c0c0e +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-pel +fate-filter-hdcd-analyze-pel: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac +fate-filter-hdcd-analyze-pel: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=pe:force_pe=true -f s24le +fate-filter-hdcd-analyze-pel: CMP = oneline +fate-filter-hdcd-analyze-pel: REF = 8156c5a3658d789ab46447d62151f5e9 FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-false-positive fate-filter-hdcd-false-positive: SRC = $(TARGET_SAMPLES)/filter/hdcd-false-positive.flac @@ -279,6 +317,30 @@ fate-filter-hdcd-detect-errors: CMD = md5 -i $(SRC) -af hdcd -f s24le fate-filter-hdcd-detect-errors: CMP = grep fate-filter-hdcd-detect-errors: REF = detectable errors: [1-9] +# 20bit HDCD +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S32LE, PCM_S32LE) += fate-filter-hdcd-20bit +fate-filter-hdcd-20bit: SRC = $(TARGET_SAMPLES)/filter/hdcd-fake20bit.flac +fate-filter-hdcd-20bit: CMD = md5 -i $(SRC) -af hdcd=bits_per_sample=20 -f s32le +fate-filter-hdcd-20bit: CMP = oneline +fate-filter-hdcd-20bit: REF = 365ded883a4a92483b15b69babc81390 + +# non-hdcd tests of different input formats for code coverage +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, WAV, PCM_S16LE, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-mono +fate-filter-hdcd-mono: SRC = $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav +fate-filter-hdcd-mono: CMD = md5 -i $(SRC) -af hdcd -f s24le +fate-filter-hdcd-mono: CMP = oneline +fate-filter-hdcd-mono: REF = f51b114b20728e6a463a9491c643d166 +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, WV, WAVPACK, PCM_S32LE, PCM_S32LE) += fate-filter-hdcd-s16p +fate-filter-hdcd-s16p: SRC = $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv +fate-filter-hdcd-s16p: CMD = md5 -i $(SRC) -af hdcd -f s32le +fate-filter-hdcd-s16p: CMP = oneline +fate-filter-hdcd-s16p: REF = 4e767f436b891ac59810a8b2b1d7e96b +FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, WV, WAVPACK, PCM_S32LE, PCM_S32LE) += fate-filter-hdcd-s32p +fate-filter-hdcd-s32p: SRC = $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv +fate-filter-hdcd-s32p: CMD = md5 -i $(SRC) -af hdcd -f s32le +fate-filter-hdcd-s32p: CMP = oneline +fate-filter-hdcd-s32p: REF = 0c5513e83eedaa10ab6fac9ddc173cf5 + FATE_AFILTER-yes += fate-filter-formats fate-filter-formats: libavfilter/tests/formats$(EXESUF) fate-filter-formats: CMD = run libavfilter/tests/formats

1 0