June 2012 - ffmpeg-cvslog - lists.ffmpeg.org

nutdec: set duration_estimation_method
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 18:58:52 2012 +0200| [ac2d3b0f6e475be8feeb6d39e880281ee8a7106b] | committer: Michael Niedermayer nutdec: set duration_estimation_method Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac2d3b0f6e475be8f… --- libavformat/nutdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 88eb3b8..f3da58a 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -568,6 +568,8 @@ static int64_t find_duration(NUTContext *nut, int64_t filesize) duration = FFMAX(duration, ts); pos++; } + if(duration > 0) + s->duration_estimation_method = AVFMT_DURATION_FROM_PTS; return duration; }

1 0

nutdec: estimate duration from last syncpoint
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 17:19:43 2012 +0200| [3233ad4b446396766065978c0933155dee8fbff4] | committer: Michael Niedermayer nutdec: estimate duration from last syncpoint Previously nut used the fallback of estimation by bitrate. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3233ad4b446396766… --- libavformat/nutdec.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 97f0b92..88eb3b8 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -31,6 +31,9 @@ #define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */ +static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index, + int64_t *pos_arg, int64_t pos_limit); + static int get_str(AVIOContext *bc, char *string, unsigned int maxlen) { unsigned int len = ffio_read_varlen(bc); @@ -551,6 +554,23 @@ static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr) return 0; } +//FIXME calculate exactly, this is just a good approximation. +static int64_t find_duration(NUTContext *nut, int64_t filesize) +{ + AVFormatContext *s = nut->avf; + int64_t duration = 0; + + int64_t pos = FFMAX(0, filesize - 2*nut->max_distance); + for(;;){ + int64_t ts = nut_read_timestamp(s, -1, &pos, INT64_MAX); + if(ts < 0) + break; + duration = FFMAX(duration, ts); + pos++; + } + return duration; +} + static int find_and_decode_index(NUTContext *nut) { AVFormatContext *s = nut->avf; @@ -569,6 +589,9 @@ static int find_and_decode_index(NUTContext *nut) avio_seek(bc, filesize - avio_rb64(bc), SEEK_SET); if (avio_rb64(bc) != INDEX_STARTCODE) { av_log(s, AV_LOG_ERROR, "no index at the end\n"); + + if(s->duration<=0) + s->duration = find_duration(nut, filesize); return -1; }

1 0

nutdec: remove assert that is wrong for some new duration code.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 17:18:46 2012 +0200| [e2c95e6bd8e89b4f8b4105ef521f8ac03a23ce8f] | committer: Michael Niedermayer nutdec: remove assert that is wrong for some new duration code. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2c95e6bd8e89b4f8… --- libavformat/nutdec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index d19127c..97f0b92 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -898,7 +898,6 @@ static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index, do { pos = find_startcode(bc, SYNCPOINT_STARTCODE, pos) + 1; if (pos < 1) { - av_assert0(nut->next_startcode == 0); av_log(s, AV_LOG_ERROR, "read_timestamp failed.\n"); return AV_NOPTS_VALUE; }

1 0

nutdec: check that filesize is valid before using it.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sat Jun 30 17:01:59 2012 +0200| [9d230ba924c907ebb9fd0ea3fa5fe98ba7153454] | committer: Michael Niedermayer nutdec: check that filesize is valid before using it. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d230ba924c907ebb… --- libavformat/nutdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index cd0dd94..d19127c 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -562,6 +562,9 @@ static int find_and_decode_index(NUTContext *nut) int8_t *has_keyframe; int ret = -1; + if(filesize <= 0) + return -1; + avio_seek(bc, filesize - 12, SEEK_SET); avio_seek(bc, filesize - avio_rb64(bc), SEEK_SET); if (avio_rb64(bc) != INDEX_STARTCODE) {

1 0

ffplay: factorize expression in audio_decode_frame()
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Stefano Sabatini <stefasab(a)gmail.com> | Sat Jun 30 00:02:58 2012 +0200| [b12e61ac7f3f1fdf47e5a5083242d2ba4096a1da] | committer: Stefano Sabatini ffplay: factorize expression in audio_decode_frame() Possibly improve readability. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b12e61ac7f3f1fdf4… --- ffplay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ffplay.c b/ffplay.c index df66a2e..c01740a 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1985,6 +1985,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) if (is->swr_ctx) { const uint8_t *in[] = { is->frame->data[0] }; uint8_t *out[] = {is->audio_buf2}; + int out_count = sizeof(is->audio_buf2) / is->audio_tgt.channels / av_get_bytes_per_sample(is->audio_tgt.fmt); if (wanted_nb_samples != is->frame->nb_samples) { if (swr_set_compensation(is->swr_ctx, (wanted_nb_samples - is->frame->nb_samples) * is->audio_tgt.freq / dec->sample_rate, wanted_nb_samples * is->audio_tgt.freq / dec->sample_rate) < 0) { @@ -1992,13 +1993,12 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) break; } } - len2 = swr_convert(is->swr_ctx, out, sizeof(is->audio_buf2) / is->audio_tgt.channels / av_get_bytes_per_sample(is->audio_tgt.fmt), - in, is->frame->nb_samples); + len2 = swr_convert(is->swr_ctx, out, out_count, in, is->frame->nb_samples); if (len2 < 0) { fprintf(stderr, "swr_convert() failed\n"); break; } - if (len2 == sizeof(is->audio_buf2) / is->audio_tgt.channels / av_get_bytes_per_sample(is->audio_tgt.fmt)) { + if (len2 == out_count) { fprintf(stderr, "warning: audio buffer is probably too small\n"); swr_init(is->swr_ctx); }

1 0

ffmpeg: use the more powerful version of abuffersink.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Mon Jun 25 00:32:49 2012 +0200| [6f5e7e8690c9bfd0f4cf9581319adfb7c0983a9f] | committer: Nicolas George ffmpeg: use the more powerful version of abuffersink. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f5e7e8690c9bfd0f… --- ffmpeg.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index dea93e5..b7f712e 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -882,7 +882,7 @@ static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, snprintf(name, sizeof(name), "output stream %d:%d", ost->file_index, ost->index); ret = avfilter_graph_create_filter(&ofilter->filter, - avfilter_get_by_name("abuffersink_old"), + avfilter_get_by_name("abuffersink"), name, NULL, NULL, fg->graph); if (ret < 0) return ret; @@ -1939,15 +1939,8 @@ static int poll_filters(void) filtered_frame = ost->filtered_frame; while (!ost->is_past_recording_time) { - if (ost->enc->type == AVMEDIA_TYPE_AUDIO && - !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) - ret = av_buffersink_read_samples(ost->filter->filter, &picref, - ost->st->codec->frame_size); - else if(ost->enc->type == AVMEDIA_TYPE_AUDIO) - ret = av_buffersink_read(ost->filter->filter, &picref); - else - ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref, - AV_BUFFERSINK_FLAG_NO_REQUEST); + ret = av_buffersink_get_buffer_ref(ost->filter->filter, &picref, + AV_BUFFERSINK_FLAG_NO_REQUEST); if (ret < 0) { if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) { char buf[256]; @@ -3108,6 +3101,10 @@ static int transcode_init(void) ret = AVERROR(EINVAL); goto dump_format; } + if (ost->enc->type == AVMEDIA_TYPE_AUDIO && + !(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) + av_buffersink_set_frame_size(ost->filter->filter, + ost->st->codec->frame_size); assert_codec_experimental(ost->st->codec, 1); assert_avoptions(ost->opts); if (ost->st->codec->bit_rate && ost->st->codec->bit_rate < 1000)

1 0

sink_buffer: implement fixed frame size.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Mon Jun 25 00:30:15 2012 +0200| [1f5c1333a733a7cba1803c9f9eab86da5f010bd5] | committer: Nicolas George sink_buffer: implement fixed frame size. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f5c1333a733a7cba… --- libavfilter/buffersink.h | 9 +++++++++ libavfilter/sink_buffer.c | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h index e9148f7..808c0c7 100644 --- a/libavfilter/buffersink.h +++ b/libavfilter/buffersink.h @@ -56,6 +56,15 @@ typedef struct { AVABufferSinkParams *av_abuffersink_params_alloc(void); /** + * Set the frame size for an audio buffer sink. + * + * All calls to av_buffersink_get_buffer_ref will return a buffer with + * exactly the specified number of samples, or AVERROR(EAGAIN) if there is + * not enough. The last buffer at EOF will be padded with 0. + */ +void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size); + +/** * Tell av_buffersink_get_buffer_ref() to read video/samples buffer * reference, but not remove it from the buffer. This is useful if you * need only to read a video/samples buffer, without to fetch it. diff --git a/libavfilter/sink_buffer.c b/libavfilter/sink_buffer.c index 4db874f..2f3dff8 100644 --- a/libavfilter/sink_buffer.c +++ b/libavfilter/sink_buffer.c @@ -125,6 +125,14 @@ static void end_frame(AVFilterLink *inlink) } } +void av_buffersink_set_frame_size(AVFilterContext *ctx, unsigned frame_size) +{ + AVFilterLink *inlink = ctx->inputs[0]; + + inlink->min_samples = inlink->max_samples = + inlink->partial_buf_size = frame_size; +} + int av_buffersink_get_buffer_ref(AVFilterContext *ctx, AVFilterBufferRef **bufref, int flags) {

1 0

lavfi: implement samples framing on links.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Sat Jun 30 10:11:22 2012 +0200| [0689d5e17ac0a3269c604b4df2c01140be328647] | committer: Nicolas George lavfi: implement samples framing on links. Links can be set up to group samples into buffers of specified minimum and maximum size. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0689d5e17ac0a3269… --- libavfilter/audio.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- libavfilter/audio.h | 7 +++++++ libavfilter/avfilter.c | 14 +++++++++++--- libavfilter/avfilter.h | 26 ++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 4 deletions(-) diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 6a86597..0ebec3c 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -156,7 +156,8 @@ static void default_filter_samples(AVFilterLink *link, ff_filter_samples(link->dst->outputs[0], samplesref); } -void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref) +void ff_filter_samples_framed(AVFilterLink *link, + AVFilterBufferRef *samplesref) { void (*filter_samples)(AVFilterLink *, AVFilterBufferRef *); AVFilterPad *dst = link->dstpad; @@ -195,3 +196,48 @@ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref) filter_samples(link, buf_out); ff_update_link_current_pts(link, pts); } + +void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref) +{ + int insamples = samplesref->audio->nb_samples, inpos = 0, nb_samples; + AVFilterBufferRef *pbuf = link->partial_buf; + int nb_channels = av_get_channel_layout_nb_channels(link->channel_layout); + + if (!link->min_samples || + (!pbuf && + insamples >= link->min_samples && insamples <= link->max_samples)) { + ff_filter_samples_framed(link, samplesref); + return; + } + /* Handle framing (min_samples, max_samples) */ + while (insamples) { + if (!pbuf) { + AVRational samples_tb = { 1, link->sample_rate }; + int perms = link->dstpad->min_perms | AV_PERM_WRITE; + pbuf = ff_get_audio_buffer(link, perms, link->partial_buf_size); + if (!pbuf) { + av_log(link->dst, AV_LOG_WARNING, + "Samples dropped due to memory allocation failure.\n"); + return; + } + avfilter_copy_buffer_ref_props(pbuf, samplesref); + pbuf->pts = samplesref->pts + + av_rescale_q(inpos, samples_tb, link->time_base); + pbuf->audio->nb_samples = 0; + } + nb_samples = FFMIN(insamples, + link->partial_buf_size - pbuf->audio->nb_samples); + av_samples_copy(pbuf->extended_data, samplesref->extended_data, + pbuf->audio->nb_samples, inpos, + nb_samples, nb_channels, link->format); + inpos += nb_samples; + insamples -= nb_samples; + pbuf->audio->nb_samples += nb_samples; + if (pbuf->audio->nb_samples >= link->min_samples) { + ff_filter_samples_framed(link, pbuf); + pbuf = NULL; + } + } + avfilter_unref_buffer(samplesref); + link->partial_buf = pbuf; +} diff --git a/libavfilter/audio.h b/libavfilter/audio.h index d4282b5..cab1a6c 100644 --- a/libavfilter/audio.h +++ b/libavfilter/audio.h @@ -73,4 +73,11 @@ AVFilterBufferRef *ff_get_audio_buffer(AVFilterLink *link, int perms, */ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref); +/** + * Send a buffer of audio samples to the next link, without checking + * min_samples. + */ +void ff_filter_samples_framed(AVFilterLink *link, + AVFilterBufferRef *samplesref); + #endif /* AVFILTER_AUDIO_H */ diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 0474192..01f3442 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -28,6 +28,7 @@ #include "avfilter.h" #include "formats.h" #include "internal.h" +#include "audio.h" char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms) { @@ -320,13 +321,20 @@ void ff_tlog_link(void *ctx, AVFilterLink *link, int end) int ff_request_frame(AVFilterLink *link) { + int ret = -1; FF_TPRINTF_START(NULL, request_frame); ff_tlog_link(NULL, link, 1); if (link->srcpad->request_frame) - return link->srcpad->request_frame(link); + ret = link->srcpad->request_frame(link); else if (link->src->inputs[0]) - return ff_request_frame(link->src->inputs[0]); - else return -1; + ret = ff_request_frame(link->src->inputs[0]); + if (ret == AVERROR_EOF && link->partial_buf) { + AVFilterBufferRef *pbuf = link->partial_buf; + link->partial_buf = NULL; + ff_filter_samples_framed(link, pbuf); + return 0; + } + return ret; } int ff_poll_frame(AVFilterLink *link) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index b679635..e08a389 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -590,6 +590,32 @@ struct AVFilterLink { * It is similar to the r_frae_rate field in AVStream. */ AVRational frame_rate; + + /** + * Buffer partially filled with samples to achieve a fixed/minimum size. + */ + AVFilterBufferRef *partial_buf; + + /** + * Size of the partial buffer to allocate. + * Must be between min_samples and max_samples. + */ + int partial_buf_size; + + /** + * Minimum number of samples to filter at once. If filter_samples() is + * called with fewer samples, it will accumulate them in partial_buf. + * This field and the related ones must not be changed after filtering + * has started. + * If 0, all related fields are ignored. + */ + int min_samples; + + /** + * Maximum number of samples to filter at once. If filter_samples() is + * called with more samples, it will split them. + */ + int max_samples; }; /**

1 0

fate: add a test for the -force_key_frames option.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Sat Jun 30 12:15:54 2012 +0200| [c9c4835f5164b86510591d4ba604bfb448c7a356] | committer: Nicolas George fate: add a test for the -force_key_frames option. It broke twice in the last three months due to other changes. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9c4835f5164b8651… --- tests/Makefile | 1 + tests/fate/options.mak | 9 +++++++++ tests/ref/fate/options-force_key_frames | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index 266901c..eda938a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -65,6 +65,7 @@ include $(SRC_PATH)/tests/fate/lossless-video.mak include $(SRC_PATH)/tests/fate/microsoft.mak include $(SRC_PATH)/tests/fate/mp3.mak include $(SRC_PATH)/tests/fate/mpc.mak +include $(SRC_PATH)/tests/fate/options.mak include $(SRC_PATH)/tests/fate/pcm.mak include $(SRC_PATH)/tests/fate/probe.mak include $(SRC_PATH)/tests/fate/prores.mak diff --git a/tests/fate/options.mak b/tests/fate/options.mak new file mode 100644 index 0000000..940d454 --- /dev/null +++ b/tests/fate/options.mak @@ -0,0 +1,9 @@ +FATE_OPTIONS += fate-options-force_key_frames +fate-options-force_key_frames: tests/data/vsynth2.yuv +fate-options-force_key_frames: CMD = enc_dec \ + "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \ + avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \ + framecrc "" "" "-skip_frame nokey" + +FATE_FFMPEG += $(FATE_OPTIONS) +fate-options: $(FATE_OPTIONS) diff --git a/tests/ref/fate/options-force_key_frames b/tests/ref/fate/options-force_key_frames new file mode 100644 index 0000000..205296c --- /dev/null +++ b/tests/ref/fate/options-force_key_frames @@ -0,0 +1,4 @@ +654970e7a09ff4869596c2a47e698007 *tests/data/fate/options-force_key_frames.avi +113320 tests/data/fate/options-force_key_frames.avi +8f68ad2e602ecd87a3e0c097ba99d773 *tests/data/fate/options-force_key_frames.out.framecrc +stddev:34363.01 PSNR: 5.61 MAXDIFF:56305 bytes: 7603200/ 186

1 0

ffmpeg: fix parsing of -force_key_frames option.
by git＠videolan.org 30 Jun '12

30 Jun '12

ffmpeg | branch: master | Nicolas George <nicolas.george(a)normalesup.org> | Sat Jun 30 12:09:24 2012 +0200| [20a8dca57fc579dbb0641ccd6dec2686d0ffdf1b] | committer: Nicolas George ffmpeg: fix parsing of -force_key_frames option. Identical to commit 4f6a1c9 by Reimar Döffinger, that was lost after the merge of 19ad567. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20a8dca57fc579dbb… --- ffmpeg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index e3ed179..dea93e5 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2792,10 +2792,13 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost, av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n"); exit_program(1); } + p = kf; for (i = 0; i < n; i++) { - p = i ? strchr(p, ',') + 1 : kf; + char *next = strchr(p, ','); + if (next) *next++ = 0; t = parse_time_or_die("force_key_frames", p, 1); ost->forced_kf_pts[i] = av_rescale_q(t, AV_TIME_BASE_Q, avctx->time_base); + p = next; } }

1 0