February 2012 - ffmpeg-cvslog

mxfdec: detect uncomp pictures using essence container ul
by git＠videolan.org 28 Feb '12

28 Feb '12

ffmpeg | branch: master | Philip de Nier <philipn(a)rd.bbc.co.uk> | Tue Feb 28 14:16:38 2012 +0000| [c2d11a8b863fcc89104fd3b39ecdd940a6072904] | committer: Michael Niedermayer mxfdec: detect uncomp pictures using essence container ul This supports detection of uncompressed picture in files that didn't include a Picture Coding Label. The lables weren't available until SMPTE 377-1 and RP224v10 Reviewed-by: Baptiste Coudurier <baptiste.coudurier(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2d11a8b863fcc891… --- libavformat/mxfdec.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 26bd0ad..13d2638 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -872,6 +872,7 @@ static const MXFCodecUL mxf_picture_essence_container_uls[] = { // video essence container uls { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, 14, CODEC_ID_MPEG2VIDEO }, /* MPEG-ES Frame wrapped */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x02,0x41,0x01 }, 14, CODEC_ID_DVVIDEO }, /* DV 625 25mbps */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x03,0x01,0x02,0x05,0x00,0x00 }, 14, CODEC_ID_RAWVIDEO }, /* Uncompressed Picture */ { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, }; static const MXFCodecUL mxf_sound_essence_container_uls[] = {

1 0

mxf: add uncompressed 422 8-bit rawvideo label
by git＠videolan.org 28 Feb '12

28 Feb '12

ffmpeg | branch: master | Philip de Nier <philipn(a)rd.bbc.co.uk> | Tue Feb 28 14:16:37 2012 +0000| [51d632cc8f4c8fa1556d7d8c18c5488700eb6154] | committer: Michael Niedermayer mxf: add uncompressed 422 8-bit rawvideo label Reviewed-by: Baptiste Coudurier <baptiste.coudurier(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51d632cc8f4c8fa15… --- libavformat/mxf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 52fbc2b..c40197e 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -41,6 +41,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, 13, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, CODEC_ID_RAWVIDEO }, /* Uncompressed */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }, 15, CODEC_ID_RAWVIDEO }, /* Uncompressed 422 8-bit */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14, CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14, CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x01 }, 16, CODEC_ID_V210 }, /* V210 */

1 0

mxf: fix v210 label matching len
by git＠videolan.org 28 Feb '12

28 Feb '12

ffmpeg | branch: master | Philip de Nier <philipn(a)rd.bbc.co.uk> | Tue Feb 28 14:16:35 2012 +0000| [627cd3841bcacd477c07748df964738ed14d0b3e] | committer: Michael Niedermayer mxf: fix v210 label matching len Must check all 16 bytes because there is a planar 10-bit format label that has equal first 15 bytes Review-by: Baptiste Coudurier <baptiste.coudurier(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=627cd3841bcacd477… --- libavformat/mxf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/mxf.c b/libavformat/mxf.c index b39a9b6..52fbc2b 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -43,7 +43,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, CODEC_ID_RAWVIDEO }, /* Uncompressed */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14, CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14, CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra */ - { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x00 }, 15, CODEC_ID_V210 }, /* V210 */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x01 }, 16, CODEC_ID_V210 }, /* V210 */ /* SoundEssenceCompression */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, 13, CODEC_ID_PCM_S16LE }, /* Uncompressed */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, CODEC_ID_PCM_S16LE },

1 0

cook: add const to quant_index_table of categorize()
by git＠videolan.org 28 Feb '12

28 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Feb 28 20:07:26 2012 +0100| [bf72c0410d90ccbf9ac1eea27e12d7fdda594dd2] | committer: Michael Niedermayer cook: add const to quant_index_table of categorize() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf72c0410d90ccbf9… --- libavcodec/cook.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 6598790..08b51d8 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -399,7 +399,7 @@ static void decode_envelope(COOKContext *q, COOKSubpacket *p, * @param category pointer to the category array * @param category_index pointer to the category_index array */ -static void categorize(COOKContext *q, COOKSubpacket *p, int *quant_index_table, +static void categorize(COOKContext *q, COOKSubpacket *p, const int *quant_index_table, int *category, int *category_index) { int exp_idx, bias, tmpbias1, tmpbias2, bits_left, num_bits, index, v, i, j;

1 0

omadec: Fix wrong number of array elements.
by git＠videolan.org 28 Feb '12

28 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Feb 28 18:41:44 2012 +0100| [4f5d1468f55eb87bce84845c4e62242c791268f5] | committer: Michael Niedermayer omadec: Fix wrong number of array elements. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f5d1468f55eb87bc… --- libavformat/omadec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/omadec.c b/libavformat/omadec.c index adf08a6..97aaf17 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -234,7 +234,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header) rprobe(s, gdata, oc->r_val) < 0 && nprobe(s, gdata, geob->datasize, oc->n_val) < 0) { int i; - for (i = 0; i < sizeof(leaf_table); i += 2) { + for (i = 0; i < FF_ARRAY_ELEMS(leaf_table); i += 2) { uint8_t buf[16]; AV_WL64(buf, leaf_table[i]); AV_WL64(&buf[8], leaf_table[i+1]); @@ -242,7 +242,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header) if (!rprobe(s, gdata, oc->r_val) || !nprobe(s, gdata, geob->datasize, oc->n_val)) break; } - if (i >= sizeof(leaf_table)) { + if (i >= FF_ARRAY_ELEMS(leaf_table)) { av_log(s, AV_LOG_ERROR, "Invalid key\n"); return -1; }

1 0

ffmpeg: Fix division by 0 due to invalid timebase
by git＠videolan.org 28 Feb '12

28 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Feb 28 18:41:01 2012 +0100| [ddd86a2924b9bc67c406cd66ebb1fc8915cd60f7] | committer: Michael Niedermayer ffmpeg: Fix division by 0 due to invalid timebase Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddd86a2924b9bc67c… --- ffmpeg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 4bdca88..06fb253 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2269,7 +2269,7 @@ static int output_packet(InputStream *ist, ret = transcode_video (ist, &avpkt, &got_output, &pkt_pts); if (avpkt.duration) { duration = av_rescale_q(avpkt.duration, ist->st->time_base, AV_TIME_BASE_Q); - } else if(ist->st->codec->time_base.num != 0) { + } else if(ist->st->codec->time_base.num != 0 && ist->st->codec->time_base.den != 0) { int ticks= ist->st->parser ? ist->st->parser->repeat_pict+1 : ist->st->codec->ticks_per_frame; duration = ((int64_t)AV_TIME_BASE * ist->st->codec->time_base.num * ticks) /

1 0

add v210 to intra only list to allow "-vcodec copy"
by git＠videolan.org 28 Feb '12

28 Feb '12

ffmpeg | branch: master | Philip de Nier <philipn(a)rd.bbc.co.uk> | Tue Feb 28 14:16:41 2012 +0000| [539a8469ae77cae0018409408457b9da2fd5a170] | committer: Michael Niedermayer add v210 to intra only list to allow "-vcodec copy" Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=539a8469ae77cae00… --- libavformat/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 51a37bd..44cef9e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -820,6 +820,7 @@ static int is_intra_only(AVCodecContext *enc){ case CODEC_ID_LJPEG: case CODEC_ID_PRORES: case CODEC_ID_RAWVIDEO: + case CODEC_ID_V210: case CODEC_ID_DVVIDEO: case CODEC_ID_HUFFYUV: case CODEC_ID_FFVHUFF:

1 0

pmpdec: Check for zero audio packets.
by git＠videolan.org 28 Feb '12

28 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Feb 28 07:19:37 2012 +0100| [8b1cd25ca7e64e6128fa2902d78e48bfeeec9786] | committer: Michael Niedermayer pmpdec: Check for zero audio packets. This fixes a division by 0. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b1cd25ca7e64e612… --- libavformat/pmpdec.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libavformat/pmpdec.c b/libavformat/pmpdec.c index 4ef8ca3..315e58c 100644 --- a/libavformat/pmpdec.c +++ b/libavformat/pmpdec.c @@ -124,6 +124,10 @@ static int pmp_packet(AVFormatContext *s, AVPacket *pkt) if (pmp->cur_stream == 0) { int num_packets; pmp->audio_packets = avio_r8(pb); + if (!pmp->audio_packets) { + av_log_ask_for_sample(s, "0 audio packets\n"); + return AVERROR_PATCHWELCOME; + } num_packets = (pmp->num_streams - 1) * pmp->audio_packets + 1; avio_skip(pb, 8); pmp->current_packet = 0;

1 0

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

28 Feb '12

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Feb 28 03:38:58 2012 +0100| [e3822886ebb3ae97bdae9be264d891f1d35c960b] | committer: Michael Niedermayer Merge remote-tracking branch 'qatar/master' * qatar/master: avcodec_default_reget_buffer(): fix compilation in DEBUG mode fate: Overhaul WavPack coverage h264: fix mmxext chroma deblock to use correct TC values. flvdec: Remove the now redundant check for known broken metadata creator flvdec: Validate index entries added from metadata while reading rtsp: Handle requests from server to client movenc: use timestamps instead of frame_size for samples-per-packet movenc: use the first cluster duration as the tfhd default duration movenc: factorize calculation of cluster duration into a separate function doc/APIchanges: fill in missing dates and hashes. lavc: reorder AVCodecContext fields. lavc: reorder AVFrame fields. Conflicts: doc/APIchanges libavcodec/avcodec.h libavformat/flvdec.c libavformat/movenc.c tests/fate/lossless-audio.mak Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3822886ebb3ae97b… ---

1 0

avcodec_default_reget_buffer(): fix compilation in DEBUG mode
by git＠videolan.org 28 Feb '12

28 Feb '12

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Mon Feb 27 20:52:06 2012 +0100| [d10319d87f7f408dc69e1540498e87e2860e945d] | committer: Diego Biurrun avcodec_default_reget_buffer(): fix compilation in DEBUG mode > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d10319d87f7f408dc… --- libavcodec/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e57f7ef..2d79f66 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -553,7 +553,7 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){ return s->get_buffer(s, pic); } - assert(s->pix_fmt == pic->pix_fmt); + assert(s->pix_fmt == pic->format); /* If internal buffer type return the same buffer */ if(pic->type == FF_BUFFER_TYPE_INTERNAL) {

1 0