July 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r4585 - wmapro/wma3dec.c
by faust3 04 Jul '09

04 Jul '09

Author: faust3 Date: Sat Jul 4 11:22:20 2009 New Revision: 4585 Log: do not reuse the num_fill_bits variable to read the length of its size Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jul 4 11:11:04 2009 (r4584) +++ wmapro/wma3dec.c Sat Jul 4 11:22:20 2009 (r4585) @@ -1200,8 +1200,8 @@ static int decode_subframe(WMA3DecodeCon if (get_bits1(&s->gb)) { int num_fill_bits; if (!(num_fill_bits = get_bits(&s->gb,2))) { - num_fill_bits = get_bits(&s->gb,4); - num_fill_bits = get_bits(&s->gb,num_fill_bits) + 1; + int len = get_bits(&s->gb, 4); + num_fill_bits = get_bits(&s->gb, len) + 1; } if (num_fill_bits >= 0) {

1 0

[soc]: r4584 - wmapro/wma3dec.c
by faust3 04 Jul '09

04 Jul '09

Author: faust3 Date: Sat Jul 4 11:11:04 2009 New Revision: 4584 Log: Use FFmpeg return codes Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jul 4 10:44:32 2009 (r4583) +++ wmapro/wma3dec.c Sat Jul 4 11:11:04 2009 (r4584) @@ -280,7 +280,7 @@ static av_cold int decode_init(AVCodecCo } else { ff_log_ask_for_sample(avctx, "Unknown extradata size\n"); - return -1; + return AVERROR_INVALIDDATA; } /** generic init */ @@ -293,7 +293,7 @@ static av_cold int decode_init(AVCodecCo if (!s->len_prefix) { ff_log_ask_for_sample(avctx, "no length prefix\n"); - return -1; + return AVERROR_INVALIDDATA; } /** get frame len */ @@ -314,7 +314,7 @@ static av_cold int decode_init(AVCodecCo if (s->max_num_subframes > MAX_SUBFRAMES) { av_log(avctx, AV_LOG_ERROR, "invalid number of subframes %i\n", s->max_num_subframes); - return -1; + return AVERROR_INVALIDDATA; } s->num_channels = avctx->channels; @@ -332,7 +332,7 @@ static av_cold int decode_init(AVCodecCo if (s->num_channels < 0 || s->num_channels > WMAPRO_MAX_CHANNELS) { ff_log_ask_for_sample(avctx, "invalid number of channels\n"); - return -1; + return AVERROR_NOTSUPP; } INIT_VLC_STATIC(&sf_vlc, SCALEVLCBITS, HUFF_SCALE_SIZE, @@ -376,7 +376,7 @@ static av_cold int decode_init(AVCodecCo av_log(avctx, AV_LOG_ERROR, "failed to allocate scale factor offset tables\n"); decode_end(avctx); - return -1; + return AVERROR_NOMEM; } /** calculate number of scale factor bands and their offsets @@ -556,7 +556,7 @@ static int decode_tilehdr(WMA3DecodeCont if (!channel_mask) { av_log(s->avctx, AV_LOG_ERROR, "broken frame: zero frames for subframe_len\n"); - return -1; + return AVERROR_INVALIDDATA; } } else channel_mask = -1; @@ -588,7 +588,7 @@ static int decode_tilehdr(WMA3DecodeCont || subframe_len > s->samples_per_frame) { av_log(s->avctx, AV_LOG_ERROR, "broken frame: subframe_len %i\n", subframe_len); - return -1; + return AVERROR_INVALIDDATA; } } else subframe_len = s->min_samples_per_subframe; @@ -603,7 +603,7 @@ static int decode_tilehdr(WMA3DecodeCont if (chan->num_subframes >= MAX_SUBFRAMES) { av_log(s->avctx, AV_LOG_ERROR, "broken frame: num subframes > 31\n"); - return -1; + return AVERROR_INVALIDDATA; } chan->subframe_len[chan->num_subframes] = subframe_len; chan->channel_len += subframe_len; @@ -613,7 +613,7 @@ static int decode_tilehdr(WMA3DecodeCont || chan->channel_len > s->samples_per_frame) { av_log(s->avctx, AV_LOG_ERROR,"broken frame: " "channel len > samples_per_frame\n"); - return -1; + return AVERROR_INVALIDDATA; } } } @@ -696,7 +696,7 @@ static void decode_decorrelation_matrix( /** *@brief Decode channel transformation parameters *@param s codec context - *@return 0 in case of bitstream errors, 1 on success + *@return 0 in case of success, < 0 in case of bitstream errors */ static int decode_channel_transform(WMA3DecodeContext* s) { @@ -714,7 +714,7 @@ static int decode_channel_transform(WMA3 if (get_bits1(&s->gb)) { ff_log_ask_for_sample(s->avctx, "unsupported channel transform bit\n"); - return 0; + return AVERROR_INVALIDDATA; } for (s->num_chgroups = 0; remaining_channels && @@ -799,14 +799,14 @@ static int decode_channel_transform(WMA3 remaining_channels -= chgroup->num_channels; } } - return 1; + return 0; } /** *@brief Extract the coefficients from the bitstream. *@param s codec context *@param c current channel number - *@return 0 in case of bitstream errors, 1 on success + *@return 0 on success, < 0 in case of bitstream errors */ static int decode_coeffs(WMA3DecodeContext *s, int c) { @@ -884,16 +884,16 @@ static int decode_coeffs(WMA3DecodeConte level, run, 1, ci->coeffs, cur_coeff, s->subframe_len, s->subframe_len, s->esc_len, 0)) - return -1; + return AVERROR_INVALIDDATA; } - return 1; + return 0; } /** *@brief Extract scale factors from the bitstream. *@param s codec context - *@return 0 in case of bitstream errors, 1 on success + *@return 0 on success, < 0 in case of bitstream errors */ static int decode_scale_factors(WMA3DecodeContext* s) { @@ -982,7 +982,7 @@ static int decode_scale_factors(WMA3Deco if (i >= s->num_bands) { av_log(s->avctx,AV_LOG_ERROR, "invalid scale factor coding\n"); - return 0; + return AVERROR_INVALIDDATA; } else s->channel[c].scale_factors[i] += (val ^ sign) - sign; } @@ -997,7 +997,7 @@ static int decode_scale_factors(WMA3Deco s->channel[c].scale_factor_block_len = s->subframe_len; } } - return 1; + return 0; } /** @@ -1106,7 +1106,7 @@ static void window(WMA3DecodeContext *s) /** *@brief Decode a single subframe (block). *@param s codec context - *@return 0 if decoding failed, 1 on success + *@return 0 on success, < 0 when decoding failed */ static int decode_subframe(WMA3DecodeContext *s) { @@ -1207,7 +1207,7 @@ static int decode_subframe(WMA3DecodeCon if (num_fill_bits >= 0) { if (get_bits_count(&s->gb) + num_fill_bits > s->num_saved_bits) { av_log(s->avctx,AV_LOG_ERROR,"invalid number of fill bits\n"); - return 0; + return AVERROR_INVALIDDATA; } skip_bits_long(&s->gb,num_fill_bits); @@ -1217,12 +1217,12 @@ static int decode_subframe(WMA3DecodeCon /** no idea for what the following bit is used */ if (get_bits1(&s->gb)) { ff_log_ask_for_sample(s->avctx, "reserved bit set\n"); - return 0; + return AVERROR_INVALIDDATA; } - if (!decode_channel_transform(s)) - return 0; + if (decode_channel_transform(s) < 0) + return AVERROR_INVALIDDATA; for (i=0;i<s->channels_for_cur_subframe;i++) { @@ -1237,7 +1237,7 @@ static int decode_subframe(WMA3DecodeCon if ((get_bits1(&s->gb))) { /** FIXME: might change run level mode decision */ ff_log_ask_for_sample(s->avctx, "unsupported quant step coding\n"); - return 0; + return AVERROR_INVALIDDATA; } /** decode quantization step */ step = get_sbits(&s->gb,6); @@ -1275,8 +1275,8 @@ static int decode_subframe(WMA3DecodeCon } /** decode scale factors */ - if (!decode_scale_factors(s)) - return 0; + if (decode_scale_factors(s) < 0) + return AVERROR_INVALIDDATA; } dprintf(s->avctx, "BITSTREAM: subframe header length was %i\n", @@ -1337,12 +1337,12 @@ static int decode_subframe(WMA3DecodeCon int c = s->channel_indexes_for_cur_subframe[i]; if (s->channel[c].cur_subframe >= s->channel[c].num_subframes) { av_log(s->avctx,AV_LOG_ERROR,"broken subframe\n"); - return 0; + return AVERROR_INVALIDDATA; } ++s->channel[c].cur_subframe; } - return 1; + return 0; } /** @@ -1423,7 +1423,7 @@ static int decode_frame(WMA3DecodeContex /** decode all subframes */ while (!s->parsed_all_subframes) { - if (!decode_subframe(s)) { + if (decode_subframe(s) < 0) { s->packet_loss = 1; return 0; }

1 0

[soc]: r4582 - wmapro/wma3dec.c
by faust3 04 Jul '09

04 Jul '09

Author: faust3 Date: Sat Jul 4 10:39:12 2009 New Revision: 4582 Log: avoid floats in the subwoofer cutoff calculation Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jul 4 09:43:31 2009 (r4581) +++ wmapro/wma3dec.c Sat Jul 4 10:39:12 2009 (r4582) @@ -441,8 +441,8 @@ static av_cold int decode_init(AVCodecCo /** calculate subwoofer cutoff values */ for (i=0;i< s->num_possible_block_sizes;i++) { int block_size = s->samples_per_frame >> i; - int cutoff = ceil(block_size * 440.0 - / (double)s->avctx->sample_rate + 0.5); + int cutoff = (440*block_size + 3*s->avctx->sample_rate/2 - 1) + / s->avctx->sample_rate; s->subwoofer_cutoffs[i] = av_clip(cutoff,4,block_size); }

1 0

[soc]: r4580 - concat/libavformat/m3u.c
by gkovacs 04 Jul '09

04 Jul '09

Author: gkovacs Date: Sat Jul 4 09:35:24 2009 New Revision: 4580 Log: setting pts equal to dts rather than offsetting since pts isn't correctly set on mpeg4 asp on avi Modified: concat/libavformat/m3u.c Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Sat Jul 4 09:25:21 2009 (r4579) +++ concat/libavformat/m3u.c Sat Jul 4 09:35:24 2009 (r4580) @@ -122,7 +122,7 @@ static int m3u_read_packet(AVFormatConte if (pkt) { int64_t time_offset = ff_conv_stream_time(ic, pkt->stream_index, playld->time_offsets[pkt->stream_index]); pkt->dts += time_offset; - pkt->pts += time_offset; + pkt->pts = pkt->dts; } } // TODO switch from AVERROR_EOF to AVERROR_EOS

1 0

[soc]: r4579 - in concat/libavformat: m3u.c playlist.c
by gkovacs 04 Jul '09

04 Jul '09

Author: gkovacs Date: Sat Jul 4 09:25:21 2009 New Revision: 4579 Log: now offsetting packet pts to avoid errors with mpeg-ps container Modified: concat/libavformat/m3u.c concat/libavformat/playlist.c Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Sat Jul 4 05:06:04 2009 (r4578) +++ concat/libavformat/m3u.c Sat Jul 4 09:25:21 2009 (r4579) @@ -120,7 +120,9 @@ static int m3u_read_packet(AVFormatConte } if (ret >= 0) { if (pkt) { - pkt->dts += ff_conv_stream_time(ic, pkt->stream_index, playld->time_offsets[pkt->stream_index]); + int64_t time_offset = ff_conv_stream_time(ic, pkt->stream_index, playld->time_offsets[pkt->stream_index]); + pkt->dts += time_offset; + pkt->pts += time_offset; } } // TODO switch from AVERROR_EOF to AVERROR_EOS Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sat Jul 4 05:06:04 2009 (r4578) +++ concat/libavformat/playlist.c Sat Jul 4 09:25:21 2009 (r4579) @@ -254,10 +254,10 @@ int64_t ff_conv_base_time(AVFormatContex { int64_t durn; durn = (int64_t)( - stream_duration * - ic->streams[stream_index]->time_base.num * - AV_TIME_BASE / // 10^6 - ic->streams[stream_index]->time_base.den + (stream_duration * + ic->streams[stream_index]->time_base.num) * + (AV_TIME_BASE / // 10^6 + ic->streams[stream_index]->time_base.den) ); return durn; }

1 0

[soc]: r4578 - in concat/libavformat: playlist.c playlist.h
by gkovacs 04 Jul '09

04 Jul '09

Author: gkovacs Date: Sat Jul 4 05:06:04 2009 New Revision: 4578 Log: -m Modified: concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sat Jul 4 03:39:30 2009 (r4577) +++ concat/libavformat/playlist.c Sat Jul 4 05:06:04 2009 (r4578) @@ -240,15 +240,28 @@ int64_t ff_conv_stream_time(AVFormatCont { int64_t durn; durn = (int64_t)( - (double)avt_duration / //double casting may be unnecessary - ic->streams[stream_index]->time_base.num / - (AV_TIME_BASE / // 10^6 - ic->streams[stream_index]->time_base.den) + (avt_duration * + ic->streams[stream_index]->time_base.den) / + (AV_TIME_BASE * // 10^6 + ic->streams[stream_index]->time_base.num) ); printf("%s conv stream time from %ld to %ld/%ld is %ld\n", ic->iformat->name, avt_duration, ic->streams[stream_index]->time_base.num, ic->streams[stream_index]->time_base.den, durn); return durn; } +// converts duration to AV_TIME_BASE +int64_t ff_conv_base_time(AVFormatContext *ic, int stream_index, int64_t stream_duration) +{ + int64_t durn; + durn = (int64_t)( + stream_duration * + ic->streams[stream_index]->time_base.num * + AV_TIME_BASE / // 10^6 + ic->streams[stream_index]->time_base.den + ); + return durn; +} + // returns duration in seconds * AV_TIME_BASE int64_t ff_get_duration(AVFormatContext *ic, int stream_index) { @@ -263,7 +276,10 @@ int64_t ff_get_duration(AVFormatContext // ic->duration correct, divide by AV_TIME_BASE to get seconds // h264 and mpeg1: pkt->dts values incorrect int64_t durn; - durn = ic->duration; + +// durn = ic->duration; + durn = ff_conv_base_time(ic, stream_index, ic->streams[stream_index]->duration); + // durn = ic->streams[stream_index]->duration; // ogg gives wrong value printf("duration is %ld\n", durn); return durn; Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Sat Jul 4 03:39:30 2009 (r4577) +++ concat/libavformat/playlist.h Sat Jul 4 05:06:04 2009 (r4578) @@ -61,4 +61,6 @@ void ff_split_wd_fn(char *filepath, char int64_t ff_conv_stream_time(AVFormatContext *ic, int stream_index, int64_t avt_duration); +int64_t ff_conv_base_time(AVFormatContext *ic, int stream_index, int64_t stream_duration); + int64_t ff_get_duration(AVFormatContext *ic, int stream_index);

1 0

[soc]: r4577 - concat/ffmpeg-patch.diff
by gkovacs 04 Jul '09

04 Jul '09

Author: gkovacs Date: Sat Jul 4 03:39:30 2009 New Revision: 4577 Log: ffmpeg patch to handle codec switching Added: concat/ffmpeg-patch.diff Added: concat/ffmpeg-patch.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ concat/ffmpeg-patch.diff Sat Jul 4 03:39:30 2009 (r4577) @@ -0,0 +1,47 @@ +diff --git a/ffmpeg.c b/ffmpeg.c +index 18bf949..b5e02ca 100644 +--- a/ffmpeg.c ++++ b/ffmpeg.c +@@ -1237,7 +1237,8 @@ static void print_report(AVFormatContext **output_files, + /* pkt = NULL means EOF (needed to flush decoder buffers) */ + static int output_packet(AVInputStream *ist, int ist_index, + AVOutputStream **ost_table, int nb_ostreams, +- const AVPacket *pkt) ++ const AVPacket *pkt, ++ AVFormatContext *is) + { + AVFormatContext *os; + AVOutputStream *ost; +@@ -1250,6 +1251,23 @@ static int output_packet(AVInputStream *ist, int ist_index, + AVSubtitle subtitle, *subtitle_to_free; + int got_subtitle; + AVPacket avpkt; ++ if (ist && is && pkt && is->nb_streams > pkt->stream_index && is->streams && is->streams[pkt->stream_index] && is->streams[pkt->stream_index]->codec) { ++ fprintf(stdout, "stream index modified to %d\n", pkt->stream_index); ++ ist->st = is->streams[pkt->stream_index]; ++ if (!ist->st->codec->codec) { ++ AVCodec *codec = avcodec_find_decoder(ist->st->codec->codec_id); ++ if (!codec) { ++ fprintf(stderr, "output_packet: Decoder (codec id %d) not found for input stream #%d.%d\n", ++ ist->st->codec->codec_id, ist->file_index, ist->index); ++ return AVERROR(EINVAL); ++ } ++ if (avcodec_open(ist->st->codec, codec) < 0) { ++ fprintf(stderr, "output_packet: Error while opening decoder for input stream #%d.%d\n", ++ ist->file_index, ist->index); ++ return AVERROR(EINVAL); ++ } ++ } ++ } + + if(ist->next_pts == AV_NOPTS_VALUE) + ist->next_pts= ist->pts; +@@ -2300,7 +2326,7 @@ static int av_encode(AVFormatContext **output_files, + for(i=0;i<nb_istreams;i++) { + ist = ist_table[i]; + if (ist->decoding_needed) { +- output_packet(ist, i, ost_table, nb_ostreams, NULL); ++ output_packet(ist, i, ost_table, nb_ostreams, NULL, is); + } + } +

1 0

[soc]: r4575 - wmapro/wma3dec.c
by faust3 02 Jul '09

02 Jul '09

Author: faust3 Date: Thu Jul 2 22:14:05 2009 New Revision: 4575 Log: Fix scaling for 24-bit files Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Thu Jul 2 20:17:32 2009 (r4574) +++ wmapro/wma3dec.c Thu Jul 2 22:14:05 2009 (r4575) @@ -267,12 +267,10 @@ static av_cold int decode_init(AVCodecCo avctx->sample_fmt = SAMPLE_FMT_FLT; - /** FIXME: is this really the right thing to do for 24 bits? */ - s->bits_per_sample = 16; // avctx->bits_per_sample; if (avctx->extradata_size >= 18) { s->decode_flags = AV_RL16(edata_ptr+14); channel_mask = AV_RL32(edata_ptr+2); -// s->bits_per_sample = AV_RL16(edata_ptr); + s->bits_per_sample = AV_RL16(edata_ptr); #ifdef DEBUG /** dump the extradata */ for (i=0 ; i<avctx->extradata_size ; i++) @@ -429,7 +427,8 @@ static av_cold int decode_init(AVCodecCo /** init MDCT, FIXME: only init needed sizes */ for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) ff_mdct_init(&s->mdct_ctx[i], BLOCK_MIN_BITS+1+i, 1, - 1.0 / (1<<(BLOCK_MIN_BITS + i + s->bits_per_sample - 2))); + 1.0 / (1 <<(BLOCK_MIN_BITS + i - 1)) + / (1 << (s->bits_per_sample - 1))); /** init MDCT windows: simple sinus window */ for (i=0 ; i<WMAPRO_BLOCK_SIZES ; i++) {

1 0

[soc]: r4574 - wmapro/wma3dec.c
by faust3 02 Jul '09

02 Jul '09

Author: faust3 Date: Thu Jul 2 20:17:32 2009 New Revision: 4574 Log: do the final scaling in the imdct Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Thu Jul 2 19:46:53 2009 (r4573) +++ wmapro/wma3dec.c Thu Jul 2 20:17:32 2009 (r4574) @@ -428,8 +428,8 @@ static av_cold int decode_init(AVCodecCo /** init MDCT, FIXME: only init needed sizes */ for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) - ff_mdct_init(&s->mdct_ctx[i], - BLOCK_MIN_BITS+1+i, 1, 1.0 / (1<<(BLOCK_MIN_BITS+i-1))); + ff_mdct_init(&s->mdct_ctx[i], BLOCK_MIN_BITS+1+i, 1, + 1.0 / (1<<(BLOCK_MIN_BITS + i + s->bits_per_sample - 2))); /** init MDCT windows: simple sinus window */ for (i=0 ; i<WMAPRO_BLOCK_SIZES ; i++) { @@ -1440,8 +1440,7 @@ static int decode_frame(WMA3DecodeContex ptr = s->samples + i; for (x=0;x<s->samples_per_frame;x++) { - *ptr = (1./32768)* *iptr++; - *ptr = av_clipf(*ptr, -1.0, 32767.0 / 32768.0); + *ptr = av_clipf(*iptr++, -1.0, 32767.0 / 32768.0); ptr += incr; }

1 0

[soc]: r4573 - seek_api/seektest/test_dothack2.sh
by spyfeng 02 Jul '09

02 Jul '09

Author: spyfeng Date: Thu Jul 2 19:46:53 2009 New Revision: 4573 Log: change the diff order and output redirection type. Modified: seek_api/seektest/test_dothack2.sh Modified: seek_api/seektest/test_dothack2.sh ============================================================================== --- seek_api/seektest/test_dothack2.sh Thu Jul 2 19:42:17 2009 (r4572) +++ seek_api/seektest/test_dothack2.sh Thu Jul 2 19:46:53 2009 (r4573) @@ -1,10 +1,10 @@ #!/bin/sh echo "Test dothack.mpg from http://samples.mplayerhq.hu/MPEG2/" -./seek_test2 dothack2.mpg >> res.txt +./seek_test2 dothack2.mpg > res.txt #echo "Done, please check the returned value according to the outputs." -if diff -u -w res.txt dothack2.ref ; then +if diff -u -w dothack2.ref res.txt ; then echo echo The output is correct. exit 0

1 0