March 2014 - ffmpeg-devel - lists.ffmpeg.org

debuggin ffmpeg
by Wolfgang Haupt 01 Mar '14

01 Mar '14

Hi ffmpeg-devs, I'm quite new to ffmpeg just trying to figure out how the mpegts demuxer works in detail. Therefore I started debugging into ffprobe (-show_frames). However I wonder how you guys do debugging because every second variable is optimized out. I guess optimizing is rather important in ffmpeg, so I'd like to ask if it's safe to disable optimizing for debug builds? Kind Regards, Wolfgang

5 9

FFmpeg 2.2
by Michael Niedermayer 01 Mar '14

01 Mar '14

Hi the FFmpeg 2.1 release is already 1.5 month ago. So its getting time to look at making a new one as the release dates tend to get delayed anyway, also wm4 asked about if we will make a new release (as libav 10 might get released soon too). My plan is to make the release within the next 4-8 weeks or so If you want something in, dont hesitate to work on getting it in The name of the release will be "Muybridge" which was suggested by Lou unless theres another suggestion that people prefer -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB What does censorship reveal? It reveals fear. -- Julian Assange

4 7

[PATCH] avformat/options_table: add named constants for avoid_negative_ts
by Michael Niedermayer 01 Mar '14

01 Mar '14

Idea-by: ubitux Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> --- libavformat/options_table.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 2e08682..bd3feb5 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -73,7 +73,11 @@ static const AVOption avformat_options[] = { {"compliant", "consider all spec non compliancies as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT }, INT_MIN, INT_MAX, D, "err_detect"}, {"aggressive", "consider things that a sane encoder shouldn't do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE }, INT_MIN, INT_MAX, D, "err_detect"}, {"use_wallclock_as_timestamps", "use wallclock as timestamps", OFFSET(use_wallclock_as_timestamps), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, D}, -{"avoid_negative_ts", "shift timestamps so they start at 0. 1 enable if negative ts, 2 enable, 0 disables, default of -1 enables when required by target format.", OFFSET(avoid_negative_ts), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, E}, +{"avoid_negative_ts", "shift timestamps so they start at 0. 1 enable if negative ts, 2 enable, 0 disables, default of -1 enables when required by target format.", OFFSET(avoid_negative_ts), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, E, "avoid_negative_ts"}, +{"auto", "enabled when required by target format", 0, AV_OPT_TYPE_CONST, {.i64 = -1 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"}, +{"disabled", "do not change timestamps", 0, AV_OPT_TYPE_CONST, {.i64 = 0 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"}, +{"make_zero", "shift timestamps so they start at 0", 0, AV_OPT_TYPE_CONST, {.i64 = 2 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"}, +{"make_non_negative", "shift timestamps so they are non negative", 0, AV_OPT_TYPE_CONST, {.i64 = 1 }, INT_MIN, INT_MAX, E, "avoid_negative_ts"}, {"skip_initial_bytes", "set number of bytes to skip before reading header and frames", OFFSET(skip_initial_bytes), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, D}, {"correct_ts_overflow", "correct single timestamp overflows", OFFSET(correct_ts_overflow), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, D}, {"flush_packets", "enable flushing of the I/O context after each packet", OFFSET(flush_packets), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, E}, -- 1.7.9.5

3 3

[PATCH 1/2] lavf/http: return error on seeking to negative postion
by Lukasz Marek 01 Mar '14

01 Mar '14

Signed-off-by: Lukasz Marek <lukasz.m.luki(a)gmail.com> --- libavformat/http.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index 69c4d6d..08832bd 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -955,16 +955,19 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence) else if ((s->filesize == -1 && whence == SEEK_END) || h->is_streamed) return -1; - /* we save the old context in case the seek fails */ - old_buf_size = s->buf_end - s->buf_ptr; - memcpy(old_buf, s->buf_ptr, old_buf_size); - s->hd = NULL; if (whence == SEEK_CUR) off += s->off; else if (whence == SEEK_END) off += s->filesize; + if (off < 0) + return AVERROR(EINVAL); s->off = off; + /* we save the old context in case the seek fails */ + old_buf_size = s->buf_end - s->buf_ptr; + memcpy(old_buf, s->buf_ptr, old_buf_size); + s->hd = NULL; + /* if it fails, continue on old connection */ av_dict_copy(&options, s->chained_options, 0); if (http_open_cnx(h, &options) < 0) { -- 1.8.3.2

2 2

[PATCH] Fix for hls bug when hls_list_size=0.
by Senthil 01 Mar '14

01 Mar '14

HLS: Handle the case when hls_list_size=0. Play list file should contain all the segments. Fixes bug #3376. Signed-off-by: Senthilnathan M <senthil.codr(a)gmail.com> --- libavformat/hlsenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 3b50397..1b5ef0e 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -102,7 +102,7 @@ static int append_entry(HLSContext *hls, uint hls->end_list = en; - if (hls->nb_entries >= hls->size) { + if (hls->size && hls->nb_entries >= hls->size) { en = hls->list; hls->list = en->next; av_free(en); @@ -145,7 +145,7 @@ static int hls_window(AVFormatContext *s, int avio_printf(hls->pb, "#EXT-X-VERSION:3\n"); avio_printf(hls->pb, "#EXT-X-TARGETDURATION:%d\n", target_du avio_printf(hls->pb, "#EXT-X-MEDIA-SEQUENCE:%"PRId64"\n", - FFMAX(0, hls->sequence - hls->size)); + FFMAX(0, hls->sequence - hls->nb_entries)); for (en = hls->list; en; en = en->next) { avio_printf(hls->pb, "#EXTINF:%d,\n", en->duration); -- 1.7.9.5

2 2

Re: [FFmpeg-devel] [FFmpeg-cvslog] parser: Remove commented-out cruft
by Clément Bœsch 01 Mar '14

01 Mar '14

On Tue, Feb 25, 2014 at 07:08:59PM +0100, Diego Biurrun wrote: > ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Tue Feb 25 11:59:05 2014 +0100| [ed61f3ca8a0664a697782253b354055136c5d303] | committer: Diego Biurrun > > parser: Remove commented-out cruft > > > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed61f3ca8a0664a69… > --- > > libavcodec/parser.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/libavcodec/parser.c b/libavcodec/parser.c > index 511f1f3..e6743eb 100644 > --- a/libavcodec/parser.c > +++ b/libavcodec/parser.c > @@ -97,8 +97,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){ > if ( s->cur_offset + off >= s->cur_frame_offset[i] > && (s->frame_offset < s->cur_frame_offset[i] || > (!s->frame_offset && !s->next_frame_offset)) // first field/frame > - // check disabled since MPEG-TS does not send complete PES packets > - && /*s->next_frame_offset + off <*/ s->cur_frame_end[i]){ > + && s->cur_frame_end[i]) { Wasn't this "cruft" actually informative? > s->dts= s->cur_frame_dts[i]; > s->pts= s->cur_frame_pts[i]; > s->pos= s->cur_frame_pos[i]; [...] Also, in the next commit (yet another K&R cosmetics crap), I see that the "first field/frame" comment was discreetly discarded. I'm not a maintainer of that file so I can't tell whether those comments were justified or not, but I'd suggest that everyone who get its code "prettified" by one of these apparently innocent looking commits has a closer cautious look at every such diff. It's definitely not the first time this is happening. -- Clément B.

2 1

[PATCH] Reduce default FDK decoder delay by one frame
by Omer Osman 01 Mar '14

01 Mar '14

The default concealment method in the FDK decoder is Energy Interpolation. This method requires one frame delay to the output. To reduce the default output delay, use Noise Substitution as the default concealment method. Signed-off-by: Omer Osman <omer.osman(a)iis.fraunhofer.de> --- libavcodec/libfdk-aacdec.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index c833a98..c848aaa 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -1,18 +1,20 @@ /* * AAC decoder wrapper * Copyright (c) 2012 Martin Storsjo + * Copyright (c) 2014 Fraunhofer IIS (Authors: Conrad Benndorf, Omer Osman) * * This file is part of FFmpeg. + * Do not use non-GPL-compatible AAC decoders if you also use FFmpeg + * together with GPL-licensed modules, such as the FFmpeg GPL modules. * * 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. + * License, version 2.1 (only) as published by the Free Software Foundation. * * 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. + * Lesser General Public License, version 2.1, 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 @@ -45,8 +47,7 @@ typedef struct FDKAACDecContext { #define OFFSET(x) offsetof(FDKAACDecContext, x) #define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption fdk_aac_dec_options[] = { - { "conceal", "Error concealment method", OFFSET(conceal_method), AV_OPT_TYPE_INT, { .i64 = CONCEAL_METHOD_DEFAULT }, CONCEAL_METHOD_DEFAULT, CONCEAL_METHOD_NB - 1, AD, "conceal" }, - { "default", "Default", 0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_DEFAULT }, INT_MIN, INT_MAX, AD, "conceal" }, + { "conceal", "Error concealment method", OFFSET(conceal_method), AV_OPT_TYPE_INT, { .i64 = CONCEAL_METHOD_NOISE_SUBSTITUTION }, CONCEAL_METHOD_DEFAULT, CONCEAL_METHOD_NB - 1, AD, "conceal" }, { "spectral", "Spectral muting", 0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_SPECTRAL_MUTING }, INT_MIN, INT_MAX, AD, "conceal" }, { "noise", "Noise Substitution", 0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_NOISE_SUBSTITUTION }, INT_MIN, INT_MAX, AD, "conceal" }, { "energy", "Energy Interpolation", 0, AV_OPT_TYPE_CONST, { .i64 = CONCEAL_METHOD_ENERGY_INTERPOLATION }, INT_MIN, INT_MAX, AD, "conceal" }, @@ -220,12 +221,15 @@ static int fdk_aac_decode_frame(AVCodecContext *avctx, void *data, UINT valid = avpkt->size; uint8_t *buf, *tmpptr = NULL; int buf_size; + int decode_flag = avpkt->flags & AV_PKT_FLAG_CORRUPT ? AACDEC_CONCEAL : 0 ; + if (decode_flag != AACDEC_CONCEAL){ err = aacDecoder_Fill(s->handle, &avpkt->data, &avpkt->size, &valid); if (err != AAC_DEC_OK) { av_log(avctx, AV_LOG_ERROR, "aacDecoder_Fill() failed: %x\n", err); return AVERROR_INVALIDDATA; } + } if (s->initialized) { frame->nb_samples = avctx->frame_size; @@ -241,7 +245,7 @@ static int fdk_aac_decode_frame(AVCodecContext *avctx, void *data, return AVERROR(ENOMEM); } - err = aacDecoder_DecodeFrame(s->handle, (INT_PCM *) buf, buf_size, 0); + err = aacDecoder_DecodeFrame(s->handle, (INT_PCM *) buf, buf_size, decode_flag); if (err == AAC_DEC_NOT_ENOUGH_BITS) { ret = avpkt->size - valid; goto end; -- 1.7.10.4

7 12