April 2011 - ffmpeg-cvslog - lists.ffmpeg.org

tests: Remove disabled code.
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Tue Apr 26 14:26:23 2011 +0200| [03acaa4a43432d76d048986076f3aa725b64ab3d] | committer: Diego Biurrun tests: Remove disabled code. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03acaa4a43432d76d… --- tests/rotozoom.c | 8 -------- tests/tiny_psnr.c | 15 --------------- 2 files changed, 0 insertions(+), 23 deletions(-) diff --git a/tests/rotozoom.c b/tests/rotozoom.c index 25f0e02..505072c 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -222,15 +222,7 @@ static void gen_image(int num, int w, int h) for ( i=0 ; i<w ; i++ ) { x += c; y -= s; -#if 1 put_pixel(i, j, ipol(tab_r, x, y), ipol(tab_g, x, y), ipol(tab_b, x, y)); -#else - { - unsigned dep; - dep = ((x>>16)&255) + (((y>>16)&255)<<8); - put_pixel(i, j, tab_r[dep], tab_g[dep], tab_b[dep]); - } -#endif } } } diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c index efa5e01..2bdb439 100644 --- a/tests/tiny_psnr.c +++ b/tests/tiny_psnr.c @@ -52,21 +52,6 @@ uint64_t exp16_table[21]={ 582360139072LL, }; -#if 0 -// 16.16 fixpoint exp() -static unsigned int exp16(unsigned int a){ - int i; - int out= 1<<16; - - for(i=19;i>=0;i--){ - if(a&(1<<i)) - out= (out*exp16_table[i] + (1<<15))>>16; - } - - return out; -} -#endif - // 16.16 fixpoint log() static int64_t log16(uint64_t a){ int i;

1 0

vorbisdec: Replace some sizeof(type) by sizeof(*variable).
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Thu Apr 28 11:09:35 2011 +0200| [d1be646e906487b395190af1d6dd8d33c22bf25f] | committer: Diego Biurrun vorbisdec: Replace some sizeof(type) by sizeof(*variable). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1be646e906487b39… --- libavcodec/vorbisdec.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index a9ddc7d..c70bd75 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -247,9 +247,9 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) AV_DEBUG(" Codebooks: %d \n", vc->codebook_count); - vc->codebooks = av_mallocz(vc->codebook_count * sizeof(vorbis_codebook)); - tmp_vlc_bits = av_mallocz(V_MAX_VLCS * sizeof(uint8_t)); - tmp_vlc_codes = av_mallocz(V_MAX_VLCS * sizeof(uint32_t)); + vc->codebooks = av_mallocz(vc->codebook_count * sizeof(*vc->codebooks)); + tmp_vlc_bits = av_mallocz(V_MAX_VLCS * sizeof(*tmp_vlc_bits)); + tmp_vlc_codes = av_mallocz(V_MAX_VLCS * sizeof(*tmp_vlc_codes)); codebook_multiplicands = av_malloc(V_MAX_VLCS * sizeof(*codebook_multiplicands)); for (cb = 0; cb < vc->codebook_count; ++cb) { @@ -360,7 +360,10 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) } // Weed out unused vlcs and build codevector vector - codebook_setup->codevectors = used_entries ? av_mallocz(used_entries*codebook_setup->dimensions * sizeof(float)) : NULL; + codebook_setup->codevectors = used_entries ? av_mallocz(used_entries * + codebook_setup->dimensions * + sizeof(*codebook_setup->codevectors)) + : NULL; for (j = 0, i = 0; i < entries; ++i) { uint_fast8_t dim = codebook_setup->dimensions; @@ -472,7 +475,7 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) vc->floor_count = get_bits(gb, 6) + 1; - vc->floors = av_mallocz(vc->floor_count * sizeof(vorbis_floor)); + vc->floors = av_mallocz(vc->floor_count * sizeof(*vc->floors)); for (i = 0; i < vc->floor_count; ++i) { vorbis_floor *floor_setup = &vc->floors[i]; @@ -532,7 +535,8 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) for (j = 0; j < floor_setup->data.t1.partitions; ++j) floor_setup->data.t1.x_list_dim+=floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]]; - floor_setup->data.t1.list = av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(vorbis_floor1_entry)); + floor_setup->data.t1.list = av_mallocz(floor_setup->data.t1.x_list_dim * + sizeof(*floor_setup->data.t1.list)); rangebits = get_bits(gb, 4); @@ -597,8 +601,8 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) /* codebook dim is for padding if codebook dim doesn't * * divide order+1 then we need to read more data */ floor_setup->data.t0.lsp = - av_malloc((floor_setup->data.t0.order+1 + max_codebook_dim) - * sizeof(float)); + av_malloc((floor_setup->data.t0.order + 1 + max_codebook_dim) + * sizeof(*floor_setup->data.t0.lsp)); if (!floor_setup->data.t0.lsp) return -1; @@ -640,7 +644,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) uint_fast8_t i, j, k; vc->residue_count = get_bits(gb, 6)+1; - vc->residues = av_mallocz(vc->residue_count * sizeof(vorbis_residue)); + vc->residues = av_mallocz(vc->residue_count * sizeof(*vc->residues)); AV_DEBUG(" There are %d residues. \n", vc->residue_count); @@ -716,7 +720,7 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) uint_fast8_t i, j; vc->mapping_count = get_bits(gb, 6)+1; - vc->mappings = av_mallocz(vc->mapping_count * sizeof(vorbis_mapping)); + vc->mappings = av_mallocz(vc->mapping_count * sizeof(*vc->mappings)); AV_DEBUG(" There are %d mappings. \n", vc->mapping_count); @@ -735,8 +739,10 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) if (get_bits1(gb)) { mapping_setup->coupling_steps = get_bits(gb, 8) + 1; - mapping_setup->magnitude = av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t)); - mapping_setup->angle = av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t)); + mapping_setup->magnitude = av_mallocz(mapping_setup->coupling_steps * + sizeof(*mapping_setup->magnitude)); + mapping_setup->angle = av_mallocz(mapping_setup->coupling_steps * + sizeof(*mapping_setup->angle)); for (j = 0; j < mapping_setup->coupling_steps; ++j) { GET_VALIDATED_INDEX(mapping_setup->magnitude[j], ilog(vc->audio_channels - 1), vc->audio_channels) GET_VALIDATED_INDEX(mapping_setup->angle[j], ilog(vc->audio_channels - 1), vc->audio_channels) @@ -753,7 +759,8 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) } if (mapping_setup->submaps>1) { - mapping_setup->mux = av_mallocz(vc->audio_channels * sizeof(uint_fast8_t)); + mapping_setup->mux = av_mallocz(vc->audio_channels * + sizeof(*mapping_setup->mux)); for (j = 0; j < vc->audio_channels; ++j) mapping_setup->mux[j] = get_bits(gb, 4); } @@ -813,7 +820,7 @@ static int vorbis_parse_setup_hdr_modes(vorbis_context *vc) uint_fast8_t i; vc->mode_count = get_bits(gb, 6) + 1; - vc->modes = av_mallocz(vc->mode_count * sizeof(vorbis_mode)); + vc->modes = av_mallocz(vc->mode_count * sizeof(*vc->modes)); AV_DEBUG(" There are %d modes.\n", vc->mode_count); @@ -925,9 +932,9 @@ static int vorbis_parse_id_hdr(vorbis_context *vc) return -2; } - vc->channel_residues = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(float)); - vc->channel_floors = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(float)); - vc->saved = av_mallocz((vc->blocksize[1] / 4) * vc->audio_channels * sizeof(float)); + vc->channel_residues = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(*vc->channel_residues)); + vc->channel_floors = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(*vc->channel_floors)); + vc->saved = av_mallocz((vc->blocksize[1] / 4) * vc->audio_channels * sizeof(*vc->saved)); vc->previous_window = 0; ff_mdct_init(&vc->mdct[0], bl0, 1, -vc->scale_bias);

1 0

vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.
by git＠videolan.org 30 Apr '11

30 Apr '11

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Thu Apr 28 18:59:14 2011 +0200| [a3b7dabb5bd3d7d9469f04e3fba7a49489a75372] | committer: Diego Biurrun vf_fieldorder: Replace FFmpeg by Libav in license boilerplate. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3b7dabb5bd3d7d94… --- libavfilter/vf_fieldorder.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c index 59ca778..b55640b 100644 --- a/libavfilter/vf_fieldorder.c +++ b/libavfilter/vf_fieldorder.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2011 Mark Himsley * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */

1 0

flashsv2enc:fix segfault
by git＠videolan.org 29 Apr '11

29 Apr '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Apr 29 18:31:17 2011 +0200| [4517ba092e0606e9473c8e148c9895b01f975e18] | committer: Michael Niedermayer flashsv2enc:fix segfault Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4517ba092e0606e94… --- libavcodec/flashsv2enc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index eedb902..7ee299c 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -242,7 +242,6 @@ static av_cold int flashsv2_encode_init(AVCodecContext * avctx) static int new_key_frame(FlashSV2Context * s) { int i; - FFSWAP(uint8_t * , s->keybuffer, s->encbuffer); memcpy(s->key_blocks, s->frame_blocks, s->blocks_size); memcpy(s->key_frame, s->current_frame, s->frame_size); @@ -252,6 +251,7 @@ static int new_key_frame(FlashSV2Context * s) s->key_blocks[i].sl_end = 0; s->key_blocks[i].data = 0; } + FFSWAP(uint8_t * , s->keybuffer, s->encbuffer); return 0; }

1 0

flashsv2enc: regression test.
by git＠videolan.org 29 Apr '11

29 Apr '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Apr 29 21:53:25 2011 +0200| [500bf397153a7597ebd7bf2b410d71c6e8706198] | committer: Michael Niedermayer flashsv2enc: regression test. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=500bf397153a7597e… --- tests/codec-regression.sh | 5 +++++ tests/ref/vsynth1/flashsv2 | 2 ++ tests/ref/vsynth2/flashsv2 | 2 ++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index b705bc1..2525e6c 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -243,6 +243,11 @@ do_video_encoding flashsv.flv "" "-an -vcodec flashsv -sws_flags neighbor+full_c do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" fi +if [ -n "$do_flashsv2" ] ; then +do_video_encoding flashsv2.flv "" "-an -vcodec flashsv2 -sws_flags neighbor+full_chroma_int+accurate_rnd+bitexact -strict experimental" +#do_video_decoding "" "-pix_fmt yuv420p -sws_flags area+accurate_rnd+bitexact" +fi + if [ -n "$do_roq" ] ; then do_video_encoding roqav.roq "" "-vframes 5" do_video_decoding "" "-pix_fmt yuv420p" diff --git a/tests/ref/vsynth1/flashsv2 b/tests/ref/vsynth1/flashsv2 new file mode 100644 index 0000000..0df3f47 --- /dev/null +++ b/tests/ref/vsynth1/flashsv2 @@ -0,0 +1,2 @@ +ec13d68cbce263f589fe79bcd2e98364 *./tests/data/vsynth1/flashsv2.flv +8406137 ./tests/data/vsynth1/flashsv2.flv diff --git a/tests/ref/vsynth2/flashsv2 b/tests/ref/vsynth2/flashsv2 new file mode 100644 index 0000000..93f429b --- /dev/null +++ b/tests/ref/vsynth2/flashsv2 @@ -0,0 +1,2 @@ +6fbb1cf84d473a93035047c3a3e344ff *./tests/data/vsynth2/flashsv2.flv +4814443 ./tests/data/vsynth2/flashsv2.flv

1 0

avio: Fix the deprecated fallback URL-prefixed open flags
by git＠videolan.org 29 Apr '11

29 Apr '11

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Thu Apr 28 10:36:44 2011 +0300| [5b81e295931bad4dac0af29333b4e2a203b3f4d4] | committer: Martin Storsjö avio: Fix the deprecated fallback URL-prefixed open flags While deprecated, they're totally useless as long as their values are different from the AVIO_FLAG values that are used internally. Currently, this leads to old libav applications still compiling correctly (since we haven't removed the fallback wrappers), but failing since the functions internally compare to the new AVIO_FLAG values. These should be removed at some point, but they aren't removed yet. The intent is to be able to recompile an old application against the new ABI without modifying the code, and this doesn't work currently. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b81e295931bad4da… --- libavformat/avio.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/avio.h b/libavformat/avio.h index a4ab5ae..b98137b 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -150,9 +150,9 @@ attribute_deprecated int url_poll(URLPollEntry *poll_table, int n, int timeout); * constants, optionally ORed with other flags. * @{ */ -#define URL_RDONLY 0 /**< read-only */ -#define URL_WRONLY 1 /**< write-only */ -#define URL_RDWR 2 /**< read-write */ +#define URL_RDONLY 1 /**< read-only */ +#define URL_WRONLY 2 /**< write-only */ +#define URL_RDWR (URL_RDONLY|URL_WRONLY) /**< read-write */ /** * @} */

3 3

WMADEC: fix ticket125
by git＠videolan.org 29 Apr '11

29 Apr '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Wed Apr 27 17:12:14 2011 +0200| [f08d171caa6a8eab00c1b0ac87bb3a79d98727e5] | committer: Michael Niedermayer WMADEC: fix ticket125 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f08d171caa6a8eab0… --- libavcodec/wmadec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 3601e47..1d71bdb 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -103,7 +103,7 @@ static int wma_decode_init(AVCodecContext * avctx) s->use_variable_block_len = flags2 & 0x0004; if(avctx->codec->id == CODEC_ID_WMAV2 && avctx->extradata_size >= 8){ - if(!AV_RL16(extradata+6) && s->use_variable_block_len){ + if(AV_RL16(extradata+4)==0xd && s->use_variable_block_len){ av_log(avctx, AV_LOG_WARNING, "Disabling use_variable_block_len, if this fails contact the ffmpeg developers and send us the file\n"); s->use_variable_block_len= 0; // this fixes issue1503 }

3 2

Fix channel layout for some stereo flac files.
by git＠videolan.org 29 Apr '11

29 Apr '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Fri Apr 29 10:42:43 2011 +0200| [d2ee3c913d6fec3cb8c0c1b67347007c7cd604e1] | committer: Carl Eugen Hoyos Fix channel layout for some stereo flac files. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2ee3c913d6fec3cb… --- libavcodec/flac.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 6e94c2c..5ed3ef7 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -60,6 +60,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, fi->ch_mode = FLAC_CHMODE_INDEPENDENT; } else if (fi->ch_mode <= FLAC_CHMODE_MID_SIDE) { fi->channels = 2; + avctx->channel_layout = AV_CH_LAYOUT_STEREO; } else { av_log(avctx, AV_LOG_ERROR + log_level_offset, "invalid channel mode: %d\n", fi->ch_mode);

1 0

Set channel layout for True Audio files.
by git＠videolan.org 29 Apr '11

29 Apr '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Fri Apr 29 10:46:45 2011 +0200| [d804784db5a2bd47e614770a7bd86403bf84bdf6] | committer: Carl Eugen Hoyos Set channel layout for True Audio files. This is not documented (and possibly not originally intended), but it's what the current reference decoder does. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d804784db5a2bd47e… --- libavcodec/tta.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 96a2f51..3367788 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -205,6 +205,16 @@ static int tta_get_unary(GetBitContext *gb) return ret; } +static const int64_t tta_channel_layouts[7] = { + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY, + AV_CH_LAYOUT_QUAD, + 0, + AV_CH_LAYOUT_5POINT1_BACK, + AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER, + AV_CH_LAYOUT_7POINT1_WIDE +}; + static av_cold int tta_decode_init(AVCodecContext * avctx) { TTAContext *s = avctx->priv_data; @@ -234,6 +244,8 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) } s->is_float = (s->flags == FORMAT_FLOAT); avctx->channels = s->channels = get_bits(&s->gb, 16); + if (s->channels > 1 && s->channels < 9) + avctx->channel_layout = tta_channel_layouts[s->channels-2]; avctx->bits_per_coded_sample = get_bits(&s->gb, 16); s->bps = (avctx->bits_per_coded_sample + 7) / 8; avctx->sample_rate = get_bits_long(&s->gb, 32);

1 0

Checksum update due to (should make fate green again)
by git＠videolan.org 29 Apr '11

29 Apr '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Fri Apr 29 05:00:45 2011 +0200| [749d16ced4596d6b83c3a2b2cf3a44c714516379] | committer: Michael Niedermayer Checksum update due to (should make fate green again) ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue Apr 26 09:59:07 2011 +0000| [f8fec0505294a4c05e5cfd9323e04258db465314] | committer: Anton Khirnov mpegtsenc: make PMT PID really start on pmt_start_pid Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=749d16ced4596d6b8… --- tests/ref/lavf/ts | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index e4bdb63..efac3ad 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -e8d609b8a5b5854a4485718434b287f7 *./tests/data/lavf/lavf.ts +178f5094fc874112d21b4a8716121d96 *./tests/data/lavf/lavf.ts 406644 ./tests/data/lavf/lavf.ts ./tests/data/lavf/lavf.ts CRC=0x133216c1

1 0