August 2014 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/utils: add GBRP16 to avcodec_align_dimensions2()
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Sun Aug 24 23:33:40 2014 +0200| [0bf0de718524cb6025a6568c46f3296acdd4fd5a] | committer: Michael Niedermayer avcodec/utils: add GBRP16 to avcodec_align_dimensions2() Fixes Ticket3869 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 3fe9e7be4c70c8fccdcd56fd19276e668cfb7de8) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bf0de718524cb602… --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c25d641..4bf0392 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -234,6 +234,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, case AV_PIX_FMT_GBRP12BE: case AV_PIX_FMT_GBRP14LE: case AV_PIX_FMT_GBRP14BE: + case AV_PIX_FMT_GBRP16LE: + case AV_PIX_FMT_GBRP16BE: w_align = 16; //FIXME assume 16 pixel per macroblock h_align = 16 * 2; // interlaced needs 2 macroblocks height break;

1 0

avcodec/snow: check coeffs for validity
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 30 02:12:10 2014 +0200| [96d1a8f0145bd8d8e3b73d064afcb969376c3b5f] | committer: Michael Niedermayer avcodec/snow: check coeffs for validity Fixes deadlock Fixes integer overflow Fixes Ticket 3892 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 596636a474ab201badaae269f3a2cef4824b8c1f) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96d1a8f0145bd8d8e… --- libavcodec/snow.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/snow.h b/libavcodec/snow.h index a87d739..813fcba 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -650,7 +650,10 @@ static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, i if(v){ v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) + 1); v+=get_rac(&s->c, &b->state[0][16 + 1 + 3 + ff_quant3bA[l&0xFF] + 3*ff_quant3bA[t&0xFF]]); - + if ((uint16_t)v != v) { + av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); + v = 1; + } xc->x=x; (xc++)->coeff= v; } @@ -660,6 +663,10 @@ static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, i else run= INT_MAX; v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1); v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]); + if ((uint16_t)v != v) { + av_log(s->avctx, AV_LOG_ERROR, "Coefficient damaged\n"); + v = 1; + } xc->x=x; (xc++)->coeff= v;

1 0

avcodec: fix aac/ac3 parser bitstream buffer size
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Fri Aug 22 01:15:57 2014 +0200| [c58d7f9eb56abc4c90d98011c23a4a031077af4e] | committer: Michael Niedermayer avcodec: fix aac/ac3 parser bitstream buffer size Buffers containing copies of the AAC and AC3 header bits were not padded before parsing, violating init_get_bits() buffer padding requirement, leading to potential buffer read overflows. This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer for parsing the header in each of aac_parser.c and ac3_parser.c. Based on patch by: Matt Wolenetz <wolenetz(a)chromium.org> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit fccd85b9f30525f88692f53134eba41f1f2d90db) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c58d7f9eb56abc4c9… --- libavcodec/aac_parser.c | 2 +- libavcodec/ac3_parser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c index ab6ca4e..cb93ba9 100644 --- a/libavcodec/aac_parser.c +++ b/libavcodec/aac_parser.c @@ -34,7 +34,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info, int size; union { uint64_t u64; - uint8_t u8[8]; + uint8_t u8[8 + FF_INPUT_BUFFER_PADDING_SIZE]; } tmp; tmp.u64 = av_be2ne64(state); diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 8dc4c0d..acfbc2e 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -147,7 +147,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info, int err; union { uint64_t u64; - uint8_t u8[8]; + uint8_t u8[8 + FF_INPUT_BUFFER_PADDING_SIZE]; } tmp = { av_be2ne64(state) }; AC3HeaderInfo hdr; GetBitContext gbc;

1 0

proresenc_kostya: report buffer overflow
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Christophe Gisquet <christophe.gisquet(a)gmail.com> | Mon Aug 11 22:06:08 2014 +0000| [11a61dd0e2b51bdb610a80e322667c3284f6d761] | committer: Michael Niedermayer proresenc_kostya: report buffer overflow If the allocated size, despite best efforts, is too small, exit with the appropriate error. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 52b81ff4635c077b2bc8b8d3637d933b6629d803) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11a61dd0e2b51bdb6… --- libavcodec/proresenc_kostya.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 0462c74..9f2aa58 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -455,6 +455,11 @@ static int encode_slice(AVCodecContext *avctx, const AVFrame *pic, num_cblocks, plane_factor, qmat); total_size += sizes[i]; + if (put_bits_left(pb) < 0) { + av_log(avctx, AV_LOG_ERROR, "Serious underevaluation of" + "required buffer size"); + return AVERROR_BUFFER_TOO_SMALL; + } } return total_size; } @@ -753,9 +758,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->key_frame = 1; - pkt_size = ctx->frame_size_upper_bound + FF_MIN_BUFFER_SIZE; + pkt_size = ctx->frame_size_upper_bound; - if ((ret = ff_alloc_packet2(avctx, pkt, pkt_size)) < 0) + if ((ret = ff_alloc_packet2(avctx, pkt, pkt_size + FF_MIN_BUFFER_SIZE)) < 0) return ret; orig_buf = pkt->data; @@ -832,7 +837,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, slice_hdr = buf; buf += slice_hdr_size - 1; init_put_bits(&pb, buf, (pkt_size - (buf - orig_buf)) * 8); - encode_slice(avctx, pic, &pb, sizes, x, y, q, mbs_per_slice); + ret = encode_slice(avctx, pic, &pb, sizes, x, y, q, mbs_per_slice); + if (ret < 0) + return ret; bytestream_put_byte(&slice_hdr, q); slice_size = slice_hdr_size + sizes[ctx->num_planes - 1];

1 0

avcodec/iff: check pixfmt for rgb8 / rgbn
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Sun Aug 10 21:59:33 2014 +0200| [5865d599c38850b2a1fd33fe197eb8fcc6c970a4] | committer: Michael Niedermayer avcodec/iff: check pixfmt for rgb8 / rgbn Fixes out of array access Found-by: Piotr Bandurski <ami_stuff(a)o2.pl> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 3539d6c63a16e1b2874bb037a86f317449c58770) Conflicts: libavcodec/iff.c (cherry picked from commit 656f930160db48e0b7b25069c62abc340e7f0628) Conflicts: libavcodec/iff.c (cherry picked from commit abc1fa7c5a1dca1345b9471b81cfcda00c56220d) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5865d599c38850b2a… --- libavcodec/iff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/iff.c b/libavcodec/iff.c index bebf6a5..37b7f25 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -832,9 +832,9 @@ static int decode_frame(AVCodecContext *avctx, break; case 4: bytestream2_init(&gb, buf, buf_size); - if (avctx->codec_tag == MKTAG('R','G','B','8')) + if (avctx->codec_tag == MKTAG('R','G','B','8') && avctx->pix_fmt == AV_PIX_FMT_RGB32) decode_rgb8(&gb, s->frame.data[0], avctx->width, avctx->height, s->frame.linesize[0]); - else if (avctx->codec_tag == MKTAG('R','G','B','N')) + else if (avctx->codec_tag == MKTAG('R','G','B','N') && avctx->pix_fmt == AV_PIX_FMT_RGB444) decode_rgbn(&gb, s->frame.data[0], avctx->width, avctx->height, s->frame.linesize[0]); else return unsupported(avctx);

1 0

[ffmpeg-web] branch master updated. f3e7874 web/rss: Include content of the news article
by ffmpeg-cvslog＠ffmpeg.org 30 Aug '14

30 Aug '14

The branch, master has been updated via f3e787400b0351d08183df183b6497db53ff6a8d (commit) from b3d5da4914ddf248e7097d8d0a399f156f667b3a (commit) - Log ----------------------------------------------------------------- commit f3e787400b0351d08183df183b6497db53ff6a8d Author: Alexander Strasser <eclipse7(a)gmx.net> AuthorDate: Thu May 1 22:34:46 2014 +0200 Commit: Alexander Strasser <eclipse7(a)gmx.net> CommitDate: Sat Aug 30 21:35:28 2014 +0200 web/rss: Include content of the news article Fixes Trac ticket #844 Inspired-by-patch-from: Gerion Entrup Signed-off-by: Alexander Strasser <eclipse7(a)gmx.net> diff --git a/Makefile b/Makefile index bbd9d51..5c376eb 100644 --- a/Makefile +++ b/Makefile @@ -38,19 +38,24 @@ htdocs/%.html: src/% src/%_title src/%_js $(DEPS) $(RSS_TARGET): htdocs/index.html echo '<?xml version="1.0" encoding="UTF-8" ?>' > $@ - echo '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">' >> $@ + echo '<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/">' >> $@ echo '<channel>' >> $@ echo ' <title>FFmpeg RSS</title>' >> $@ echo ' <link>http://ffmpeg.org</link>' >> $@ echo ' <description>FFmpeg RSS</description>' >> $@ echo ' <atom:link href="http://ffmpeg.org/main.rss" rel="self" type="application/rss+xml" />' >> $@ - grep '<a *id=".*" *></a><h3>.*20..,.*</h3>' $< | sed 'sX<a *id="$.*$" *> *</a> *<h3>$.*20..$, *$.*$</h3>X\ + awk '/<a *id=".*" *> *<\/a> *<h3>.*20.., *.*<\/h3>/ { p = 1 } /<h1>Older entries are in the .*news archive/ { p = 0 } p' $< \ + | sed 'sX<a *id="$.*$" *> *</a> *<h3>$.*20..$, *$.*$</h3>X\ + ]]></content:encoded>\ + </item>\ <item>\ <title>\2, \3</title>\ <link>http://ffmpeg.org/index.html#\1</link>\ <guid>http://ffmpeg.org/index.html#\1</guid>\ - </item>\ -X' >> $@ + <content:encoded><![CDATA[X' \ + | awk 'NR > 3' >> $@ + echo ' ]]></content:encoded>' >> $@ + echo ' </item>' >> $@ echo '</channel>' >> $@ echo '</rss>' >> $@ ----------------------------------------------------------------------- Summary of changes: Makefile | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive --

1 0

Merge commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86' into release/1.1
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 30 21:07:32 2014 +0200| [d03fd2c8052ee80e7221ab02ab0fcb5220e92698] | committer: Michael Niedermayer Merge commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86' into release/1.1 * commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86': pulse: Add a wallclock option to be compatible with other other captures Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d03fd2c8052ee80e7… ---

1 0

pulse: Add a wallclock option to be compatible with other other captures
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero(a)gentoo.org> | Sat Aug 23 19:03:21 2014 +0200| [124ec8b1303d4f29b833099ce9008e31ac6d7c86] | committer: Luca Barbato pulse: Add a wallclock option to be compatible with other other captures alsa and x11grab use av_gettime() to report timestamps. Have it on by default. Bug-Id: 647 (cherry picked from commit 424b929b5cb9ca4094099f25179829260d4b0fa3) (cherry picked from commit 404731bd20e1df5880e6fe381e975ba48afc75b2) Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=124ec8b1303d4f29b… --- libavdevice/pulse.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavdevice/pulse.c b/libavdevice/pulse.c index a8e710d..2136ee3 100644 --- a/libavdevice/pulse.c +++ b/libavdevice/pulse.c @@ -31,6 +31,7 @@ #include "libavformat/avformat.h" #include "libavformat/internal.h" +#include "libavutil/time.h" #include "libavutil/opt.h" #define DEFAULT_CODEC_ID AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE) @@ -47,6 +48,7 @@ typedef struct PulseData { pa_simple *s; int64_t pts; int64_t frame_duration; + int wallclock; } PulseData; static pa_sample_format_t codec_id_to_pulse_format(int codec_id) { @@ -141,6 +143,8 @@ static int pulse_read_packet(AVFormatContext *s, AVPacket *pkt) if (pd->pts == AV_NOPTS_VALUE) { pd->pts = -latency; + if (pd->wallclock) + pd->pts += av_gettime(); } pkt->pts = pd->pts; @@ -168,6 +172,7 @@ static const AVOption options[] = { { "channels", "number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = 2}, 1, INT_MAX, D }, { "frame_size", "number of bytes per frame", OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = 1024}, 1, INT_MAX, D }, { "fragment_size", "buffering size, affects latency and cpu usage", OFFSET(fragment_size), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D }, + { "wallclock", "set the initial pts using the current time", OFFSET(wallclock), AV_OPT_TYPE_INT, {.i64 = 1}, -1, 1, D }, { NULL }, };

1 0

Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 30 20:58:46 2014 +0200| [946a106995bca70a360f5bd03fa503e8beb09cc5] | committer: Michael Niedermayer Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1 * commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649': avconv: fix parsing the AVOptions for -target Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=946a106995bca70a3… ---

1 0

Merge commit '8d7839fc7c52574dfc22db0181b1cef9cb929910' into release/1.1
by git＠videolan.org 30 Aug '14

30 Aug '14

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni(a)gmx.at> | Sat Aug 30 20:58:25 2014 +0200| [fed28fe054de573643ae3fee50ad7ae09d78e738] | committer: Michael Niedermayer Merge commit '8d7839fc7c52574dfc22db0181b1cef9cb929910' into release/1.1 * commit '8d7839fc7c52574dfc22db0181b1cef9cb929910': avconv: fix the muxrate values for -target Conflicts: ffmpeg_opt.c No change, as ffmpegs muxrate is in bits/sec Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fed28fe054de57364… ---

1 0