May 2012 - ffmpeg-cvslog - lists.ffmpeg.org

aac: reference supported sample rates in encoders.
by git＠videolan.org 06 Nov '12

06 Nov '12

ffmpeg | branch: master | Clément Bœsch <clement.boesch(a)smartjog.com> | Mon Mar 26 22:32:17 2012 +0200| [29679f4a372eb208af31c57177ab49f67c698362] | committer: Clément Bœsch aac: reference supported sample rates in encoders. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29679f4a372eb208a… --- libavcodec/aacenc.c | 1 + libavcodec/libvo-aacenc.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index cf4aef9..fd72daf 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -816,6 +816,7 @@ AVCodec ff_aac_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_end, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c index 8f7c581..c5191ec 100644 --- a/libavcodec/libvo-aacenc.c +++ b/libavcodec/libvo-aacenc.c @@ -193,6 +193,7 @@ AVCodec ff_libvo_aacenc_encoder = { .init = aac_encode_init, .encode2 = aac_encode_frame, .close = aac_encode_close, + .supported_samplerates = avpriv_mpeg4audio_sample_rates, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),

3 2

qdm2: fix incorrect error spam
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Jun 1 00:35:06 2012 +0200| [8a0efa9cc075523b09b4a0585389df865996c214] | committer: Michael Niedermayer qdm2: fix incorrect error spam Fixes Ticket1375 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a0efa9cc075523b0… --- libavcodec/qdm2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 7a5d072..aa180fd 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1363,7 +1363,8 @@ static void qdm2_fft_decode_tones (QDM2Context *q, int duration, GetBitContext * if (q->superblocktype_2_3) { while ((n = qdm2_get_vlc(gb, &vlc_tab_fft_tone_offset[local_int_8], 1, 2)) < 2) { if (get_bits_left(gb)<0) { - av_log(0, AV_LOG_ERROR, "overread in qdm2_fft_decode_tones()\n"); + if(local_int_4 < q->group_size) + av_log(0, AV_LOG_ERROR, "overread in qdm2_fft_decode_tones()\n"); return; } offset = 1;

1 0

libmp3lame: add missing layout terminator
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Jun 1 00:07:36 2012 +0200| [e47e23698b4ba4388c00379e2b2443b2cfd0aa67] | committer: Michael Niedermayer libmp3lame: add missing layout terminator Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e47e23698b4ba4388… --- libavcodec/libmp3lame.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 1e50e0a..905d9a0 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -304,7 +304,8 @@ AVCodec ff_libmp3lame_encoder = { AV_SAMPLE_FMT_NONE }, .supported_samplerates = libmp3lame_sample_rates, .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, - AV_CH_LAYOUT_STEREO }, + AV_CH_LAYOUT_STEREO, + 0}, .long_name = NULL_IF_CONFIG_SMALL("libmp3lame MP3 (MPEG audio layer 3)"), .priv_class = &libmp3lame_class, .defaults = libmp3lame_defaults,

1 0

h264: Fail on DPC its not fully implemented
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 23:52:08 2012 +0200| [7cb86633622de22c8b6e43c9d608361e5adda740] | committer: Michael Niedermayer h264: Fail on DPC its not fully implemented Fixes part of Ticket1369 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cb86633622de22c8… --- libavcodec/h264.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 7ebe352..4e6d6a5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4399,6 +4399,9 @@ again: init_get_bits(&hx->inter_gb, ptr, bit_length); hx->inter_gb_ptr = &hx->inter_gb; + av_log(h->s.avctx, AV_LOG_ERROR, "Partitioned H.264 support is incomplete\n"); + return AVERROR_PATCHWELCOME; + if (hx->redundant_pic_count == 0 && hx->intra_gb_ptr && hx->s.data_partitioning &&

1 0

dv-demux: dont mess with codec values
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 23:50:08 2012 +0200| [3c276ac0f8936745543d14674842647c502bdd2e] | committer: Michael Niedermayer dv-demux: dont mess with codec values Fixes part of Ticket1369 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c276ac0f89367455… --- libavformat/dv.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/dv.c b/libavformat/dv.c index 2ce928f..75b42b0 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -273,9 +273,6 @@ static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame) avpriv_set_pts_info(c->vst, 64, c->sys->time_base.num, c->sys->time_base.den); avctx->time_base= c->sys->time_base; - if (!avctx->width) - avcodec_set_dimensions(avctx, c->sys->width, c->sys->height); - avctx->pix_fmt = c->sys->pix_fmt; /* finding out SAR is a little bit messy */ vsc_pack = dv_extract_pack(frame, dv_video_control);

1 0

jacosub_probe: slightly increase the score to limit misdetection.
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Thu May 31 22:12:46 2012 +0200| [303619d3ca9efa0031f6fede7dedeb27fcfb1756] | committer: Clément Bœsch jacosub_probe: slightly increase the score to limit misdetection. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=303619d3ca9efa003… --- libavformat/jacosubdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index 615191e..67f4c37 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -67,7 +67,7 @@ static int jacosub_probe(AVProbeData *p) ptr++; if (*ptr != '#' && *ptr != '\n') { if (timed_line(ptr)) - return AVPROBE_SCORE_MAX / 2; + return AVPROBE_SCORE_MAX/2 + 1; return 0; } ptr += strcspn(ptr, "\n") + 1;

1 0

jacosub_probe: speedup by making only one call to sscanf
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Clément Bœsch <ubitux(a)gmail.com> | Thu May 31 21:12:25 2012 +0200| [908293d1bcaa0e059561bec8ae0b3ad1fde2d196] | committer: Clément Bœsch jacosub_probe: speedup by making only one call to sscanf > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=908293d1bcaa0e059… --- libavformat/jacosubdec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index 30c4f63..615191e 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -63,10 +63,13 @@ static int jacosub_probe(AVProbeData *p) ptr += 3; /* skip UTF-8 BOM */ while (ptr < ptr_end) { - if (timed_line(ptr)) - return AVPROBE_SCORE_MAX / 2; while (jss_whitespace(*ptr)) ptr++; + if (*ptr != '#' && *ptr != '\n') { + if (timed_line(ptr)) + return AVPROBE_SCORE_MAX / 2; + return 0; + } ptr += strcspn(ptr, "\n") + 1; } return 0;

1 0

Merge remote-tracking branch 'qatar/master'
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu May 31 21:27:42 2012 +0200| [5afdb3e6b1a06a897ec6d4fe5da1619ae8bef6be] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines http: Pass the proper return code of net IO operations http: Add 'post_data', a new option which sets custom HTTP post data lavfi: amix: check active input count before calling request_samples vp8: move block coeff arithcoder on stack. mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3. Conflicts: libavformat/ac3dec.c libavformat/mp3dec.c tests/fate/ac3.mak Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5afdb3e6b1a06a897… ---

1 0

fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed May 30 12:54:22 2012 +0200| [0fcf3013c4aa4f70c39899b7b3bd8c451fe2e493] | committer: Martin Storsjö fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines The default mmxext and sse implementations of apply_window_int16 aren't bitexact. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fcf3013c4aa4f70c… --- tests/fate/ac3.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 4fafb05..6abda80 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -49,7 +49,7 @@ fate-eac3-encode: FUZZ = 3 FATE_AC3 += fate-ac3-fixed-encode fate-ac3-fixed-encode: tests/data/asynth-44100-2.wav fate-ac3-fixed-encode: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav -fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -b 128k -f ac3 +fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -b 128k -f ac3 -flags bitexact fate-ac3-fixed-encode: CMP = oneline fate-ac3-fixed-encode: REF = a1d1fc116463b771abf5aef7ed37d7b1

1 0

http: Pass the proper return code of net IO operations
by git＠videolan.org 31 May '12

31 May '12

ffmpeg | branch: master | Samuel Pitoiset <samuel.pitoiset(a)gmail.com> | Wed May 30 11:52:11 2012 +0200| [9613240f72651018734c14517b679ff5fe50bc99] | committer: Martin Storsjö http: Pass the proper return code of net IO operations Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9613240f726510187… --- libavformat/http.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index bcb1227..22600b4 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -227,7 +227,7 @@ static int http_getc(HTTPContext *s) if (s->buf_ptr >= s->buf_end) { len = ffurl_read(s->hd, s->buffer, BUFFER_SIZE); if (len < 0) { - return AVERROR(EIO); + return len; } else if (len == 0) { return -1; } else { @@ -247,7 +247,7 @@ static int http_get_line(HTTPContext *s, char *line, int line_size) for(;;) { ch = http_getc(s); if (ch < 0) - return AVERROR(EIO); + return ch; if (ch == '\n') { /* process line */ if (q > line && q[-1] == '\r') @@ -354,8 +354,8 @@ static int http_read_header(URLContext *h, int *new_location) int err = 0; for (;;) { - if (http_get_line(s, line, sizeof(line)) < 0) - return AVERROR(EIO); + if ((err = http_get_line(s, line, sizeof(line))) < 0) + return err; av_dlog(NULL, "header='%s'\n", line); @@ -447,8 +447,8 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, av_freep(&authstr); av_freep(&proxyauthstr); - if (ffurl_write(s->hd, s->buffer, strlen(s->buffer)) < 0) - return AVERROR(EIO); + if ((err = ffurl_write(s->hd, s->buffer, strlen(s->buffer))) < 0) + return err; if (s->post_data) if ((err = ffurl_write(s->hd, s->post_data, s->post_datalen)) < 0) @@ -526,8 +526,8 @@ static int http_read(URLContext *h, uint8_t *buf, int size) for(;;) { do { - if (http_get_line(s, line, sizeof(line)) < 0) - return AVERROR(EIO); + if ((err = http_get_line(s, line, sizeof(line))) < 0) + return err; } while (!*line); /* skip CR LF from last chunk */ s->chunksize = strtoll(line, NULL, 16);

1 0