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

[soc]: r5326 - wmapro/wmaprodec.c
by faust3 27 Aug '09

27 Aug '09

Author: faust3 Date: Thu Aug 27 18:49:27 2009 New Revision: 5326 Log: add whitespace fixes from ffmpeg svn Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Wed Aug 26 23:28:36 2009 (r5325) +++ wmapro/wmaprodec.c Thu Aug 27 18:49:27 2009 (r5326) @@ -803,10 +803,10 @@ static int decode_coeffs(WMA3DecodeConte idx = get_vlc2(&s->gb, vec4_vlc.table, VLCBITS, VEC4MAXDEPTH); - if ( idx == HUFF_VEC4_SIZE - 1 ) { + if (idx == HUFF_VEC4_SIZE - 1) { for (i = 0; i < 4; i += 2) { idx = get_vlc2(&s->gb, vec2_vlc.table, VLCBITS, VEC2MAXDEPTH); - if ( idx == HUFF_VEC2_SIZE - 1 ) { + if (idx == HUFF_VEC2_SIZE - 1) { vals[i] = get_vlc2(&s->gb, vec1_vlc.table, VLCBITS, VEC1MAXDEPTH); if (vals[i] == HUFF_VEC1_SIZE - 1) vals[i] += ff_wma_get_large_val(&s->gb); @@ -842,10 +842,10 @@ static int decode_coeffs(WMA3DecodeConte /** decode run level coded coefficients */ if (rl_mode) { - if(ff_wma_run_level_decode(s->avctx, &s->gb, vlc, - level, run, 1, ci->coeffs, - cur_coeff, s->subframe_len, s->subframe_len, - s->esc_len, 0)) + if (ff_wma_run_level_decode(s->avctx, &s->gb, vlc, + level, run, 1, ci->coeffs, + cur_coeff, s->subframe_len, + s->subframe_len, s->esc_len, 0)) return AVERROR_INVALIDDATA; }

1 0

[soc]: r5325 - wmapro/checkout.sh
by faust3 26 Aug '09

26 Aug '09

Author: faust3 Date: Wed Aug 26 23:28:36 2009 New Revision: 5325 Log: fix checkout script Modified: wmapro/checkout.sh Modified: wmapro/checkout.sh ============================================================================== --- wmapro/checkout.sh Wed Aug 26 23:02:43 2009 (r5324) +++ wmapro/checkout.sh Wed Aug 26 23:28:36 2009 (r5325) @@ -1,6 +1,8 @@ #!/bin/sh svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg cd ffmpeg/libavcodec +rm -rf wmaprodec.c +rm -rf wmaprodata.h ln -s ../../wmaprodec.c wmaprodec.c ln -s ../../wmaprodata.h wmaprodata.h cd ../

1 0

[soc]: r5324 - wmapro/wmaprodec.c
by faust3 26 Aug '09

26 Aug '09

Author: faust3 Date: Wed Aug 26 23:02:43 2009 New Revision: 5324 Log: get rid of the transmit_sf channel context variable Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Wed Aug 26 22:54:23 2009 (r5323) +++ wmapro/wmaprodec.c Wed Aug 26 23:02:43 2009 (r5324) @@ -133,7 +133,6 @@ typedef struct { uint16_t decoded_samples; ///< number of already processed samples uint8_t grouped; ///< channel is part of a group int quant_step; ///< quantization step for the current subframe - int8_t transmit_sf; ///< flag inidcating that scale factors are transmitted for the current subframe int8_t reuse_sf; ///< share scale factors between subframes int8_t scale_factor_step; ///< scaling step for the current subframe int max_scale_factor; ///< maximum scale factor for the current subframe @@ -885,12 +884,7 @@ static int decode_scale_factors(WMA3Deco s->channel[c].saved_scale_factors[*sf_offsets++]; } - if (s->channel[c].cur_subframe > 0) { - s->channel[c].transmit_sf = get_bits1(&s->gb); - } else - s->channel[c].transmit_sf = 1; - - if (s->channel[c].transmit_sf) { + if (!s->channel[c].cur_subframe || get_bits1(&s->gb)) { if (!s->channel[c].reuse_sf) { int val;

1 0

[soc]: r5323 - wmapro/wmaprodec.c
by faust3 26 Aug '09

26 Aug '09

Author: faust3 Date: Wed Aug 26 22:54:23 2009 New Revision: 5323 Log: use FFMAX for calculating the maximum scale factor Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Wed Aug 26 22:49:34 2009 (r5322) +++ wmapro/wmaprodec.c Wed Aug 26 22:54:23 2009 (r5323) @@ -947,8 +947,8 @@ static int decode_scale_factors(WMA3Deco /** calculate new scale factor maximum */ s->channel[c].max_scale_factor = s->channel[c].scale_factors[0]; for (sf = s->channel[c].scale_factors + 1; sf < sf_end; sf++) { - if (s->channel[c].max_scale_factor < *sf) - s->channel[c].max_scale_factor = *sf; + s->channel[c].max_scale_factor = + FFMAX(s->channel[c].max_scale_factor, *sf); } }

1 0

[soc]: r5322 - wmapro/wmaprodec.c
by faust3 26 Aug '09

26 Aug '09

Author: faust3 Date: Wed Aug 26 22:49:34 2009 New Revision: 5322 Log: reduce probability of an integer overflow when checking the output buffer size Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Wed Aug 26 22:41:04 2009 (r5321) +++ wmapro/wmaprodec.c Wed Aug 26 22:49:34 2009 (r5322) @@ -1272,7 +1272,7 @@ static int decode_frame(WMA3DecodeContex int i; /** check for potential output buffer overflow */ - if (s->samples + s->num_channels * s->samples_per_frame > s->samples_end) { + if (s->num_channels * s->samples_per_frame > s->samples_end - s->samples) { av_log(s->avctx,AV_LOG_ERROR, "not enough space for the output samples\n"); s->packet_loss = 1;

1 0

[soc]: r5321 - wmapro/wmaprodec.c
by faust3 26 Aug '09

26 Aug '09

Author: faust3 Date: Wed Aug 26 22:41:04 2009 New Revision: 5321 Log: use memcpy to move the second part of the IMDCT buffer Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Wed Aug 26 22:35:41 2009 (r5320) +++ wmapro/wmaprodec.c Wed Aug 26 22:41:04 2009 (r5321) @@ -1357,9 +1357,9 @@ static int decode_frame(WMA3DecodeContex } /** reuse second half of the IMDCT output for the next frame */ - memmove(&s->channel[i].out[0], - &s->channel[i].out[s->samples_per_frame], - s->samples_per_frame * sizeof(*s->channel[i].out)); + memcpy(&s->channel[i].out[0], + &s->channel[i].out[s->samples_per_frame], + s->samples_per_frame * sizeof(*s->channel[i].out)); } if (s->skip_frame) {

1 0

[soc]: r5320 - wmapro/wmaprodec.c
by faust3 26 Aug '09

26 Aug '09

Author: faust3 Date: Wed Aug 26 22:35:41 2009 New Revision: 5320 Log: use sizeof(first element) instead of sizeof(datatype) Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Wed Aug 26 21:39:07 2009 (r5319) +++ wmapro/wmaprodec.c Wed Aug 26 22:35:41 2009 (r5320) @@ -614,8 +614,8 @@ static void decode_decorrelation_matrix( int i; int offset = 0; int8_t rotation_offset[WMAPRO_MAX_CHANNELS * WMAPRO_MAX_CHANNELS]; - memset(chgroup->decorrelation_matrix, 0, - sizeof(float) *s->num_channels * s->num_channels); + memset(chgroup->decorrelation_matrix, 0, s->num_channels * + s->num_channels * sizeof(*chgroup->decorrelation_matrix)); for (i = 0; i < chgroup->num_channels * (chgroup->num_channels - 1) >> 1; i++) rotation_offset[i] = get_bits(&s->gb, 6); @@ -740,8 +740,8 @@ static int decode_channel_transform(WMA3 } else { memcpy(chgroup->decorrelation_matrix, default_decorrelation[chgroup->num_channels], - sizeof(float) * chgroup->num_channels * - chgroup->num_channels); + chgroup->num_channels * chgroup->num_channels * + sizeof(*chgroup->decorrelation_matrix)); } } } @@ -938,8 +938,8 @@ static int decode_scale_factors(WMA3Deco /** save transmitted scale factors so that they can be reused for the next subframe */ memcpy(s->channel[c].saved_scale_factors, - s->channel[c].scale_factors, - sizeof(int) * s->num_bands); + s->channel[c].scale_factors, s->num_bands * + sizeof(*s->channel[c].saved_scale_factors)); s->channel[c].scale_factor_block_len = s->subframe_len; s->channel[c].reuse_sf = 1; } @@ -1107,7 +1107,8 @@ static int decode_subframe(WMA3DecodeCon s->channel[c].coeffs = &s->channel[c].out[(s->samples_per_frame>>1) + offset]; - memset(s->channel[c].coeffs, 0, sizeof(float) * subframe_len); + memset(s->channel[c].coeffs, 0, + sizeof(*s->channel[c].coeffs) * subframe_len); } s->subframe_len = subframe_len; @@ -1219,8 +1220,8 @@ static int decode_subframe(WMA3DecodeCon int b; if (c == s->lfe_channel) - memset(&s->tmp[s->cur_subwoofer_cutoff], 0, - sizeof(float) * (subframe_len - s->cur_subwoofer_cutoff)); + memset(&s->tmp[s->cur_subwoofer_cutoff], 0, sizeof(*s->tmp) * + (subframe_len - s->cur_subwoofer_cutoff)); /** inverse quantization and rescaling */ for (b = 0; b < s->num_bands; b++) { @@ -1358,7 +1359,7 @@ static int decode_frame(WMA3DecodeContex /** reuse second half of the IMDCT output for the next frame */ memmove(&s->channel[i].out[0], &s->channel[i].out[s->samples_per_frame], - s->samples_per_frame * sizeof(float)); + s->samples_per_frame * sizeof(*s->channel[i].out)); } if (s->skip_frame) { @@ -1566,7 +1567,8 @@ static void flush(AVCodecContext *avctx) /** reset output buffer as a part of it is used during the windowing of a new frame */ for (i = 0; i < s->num_channels; i++) - memset(s->channel[i].out, 0, s->samples_per_frame * sizeof(float)); + memset(s->channel[i].out, 0, s->samples_per_frame * + sizeof(*s->channel[i].out)); s->packet_loss = 1; }

1 0

[soc]: r5319 - wmapro/wmaprodec.c
by faust3 26 Aug '09

26 Aug '09

Author: faust3 Date: Wed Aug 26 21:39:07 2009 New Revision: 5319 Log: reindent Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Wed Aug 26 21:32:12 2009 (r5318) +++ wmapro/wmaprodec.c Wed Aug 26 21:39:07 2009 (r5319) @@ -490,9 +490,9 @@ static int decode_tilehdr(WMA3DecodeCont fixed_channel_layout = get_bits1(&s->gb); /** calculate subframe len bits */ - if (s->max_num_subframes == 16) - subframe_len_zero_bit = 1; - subframe_len_bits = av_log2(av_log2(s->max_num_subframes)) + 1; + if (s->max_num_subframes == 16) + subframe_len_zero_bit = 1; + subframe_len_bits = av_log2(av_log2(s->max_num_subframes)) + 1; /** loop until the frame data is split between the subframes */ while (missing_samples > 0) { @@ -549,8 +549,7 @@ static int decode_tilehdr(WMA3DecodeCont } else log2_subframe_len = get_bits(&s->gb, subframe_len_bits); - subframe_len = - s->samples_per_frame / (1 << log2_subframe_len); + subframe_len = s->samples_per_frame / (1 << log2_subframe_len); /** sanity check the length */ if (subframe_len < s->min_samples_per_subframe

1 0

[soc]: r5318 - wmapro/wmaprodec.c
by faust3 26 Aug '09

26 Aug '09

Author: faust3 Date: Wed Aug 26 21:32:12 2009 New Revision: 5318 Log: remove unfinished support for wma lossless Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Wed Aug 26 21:03:45 2009 (r5317) +++ wmapro/wmaprodec.c Wed Aug 26 21:32:12 2009 (r5318) @@ -169,7 +169,6 @@ typedef struct WMA3DecodeContext { float* windows[WMAPRO_BLOCK_SIZES]; ///< windows for the different block sizes /* frame size dependent frame information (set during initialization) */ - uint8_t lossless; ///< lossless mode uint32_t decode_flags; ///< used compression features uint8_t len_prefix; ///< frame is prefixed with its length uint8_t dynamic_range_compression; ///< frame contains DRC data @@ -235,7 +234,6 @@ static void av_cold dump_context(WMA3Dec PRINT("max num subframes", s->max_num_subframes); PRINT("len prefix", s->len_prefix); PRINT("num channels", s->num_channels); - PRINT("lossless", s->lossless); } /** @@ -492,13 +490,9 @@ static int decode_tilehdr(WMA3DecodeCont fixed_channel_layout = get_bits1(&s->gb); /** calculate subframe len bits */ - if (s->lossless) { - subframe_len_bits = av_log2(s->max_num_subframes - 1) + 1; - } else { if (s->max_num_subframes == 16) subframe_len_zero_bit = 1; subframe_len_bits = av_log2(av_log2(s->max_num_subframes)) + 1; - } /** loop until the frame data is split between the subframes */ while (missing_samples > 0) { @@ -555,14 +549,8 @@ static int decode_tilehdr(WMA3DecodeCont } else log2_subframe_len = get_bits(&s->gb, subframe_len_bits); - if (s->lossless) { - subframe_len = - s->samples_per_frame / s->max_num_subframes; - subframe_len *= log2_subframe_len + 1; - } else { subframe_len = s->samples_per_frame / (1 << log2_subframe_len); - } /** sanity check the length */ if (subframe_len < s->min_samples_per_subframe

1 0

[soc]: r5317 - concat/libavformat/avplaylist.c
by gkovacs 26 Aug '09

26 Aug '09

Author: gkovacs Date: Wed Aug 26 21:03:45 2009 New Revision: 5317 Log: remove superfluous null-pointer checks when calling av_free Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Wed Aug 26 21:00:42 2009 (r5316) +++ concat/libavformat/avplaylist.c Wed Aug 26 21:03:45 2009 (r5317) @@ -160,14 +160,10 @@ int av_playlist_close(AVPlaylistContext return err; } } - if (ctx->flist) - av_free(ctx->flist); - if (ctx->durations) - av_free(ctx->durations); - if (ctx->nb_streams_list) - av_free(ctx->nb_streams_list); - if (ctx->formatcontext_list) - av_free(ctx->formatcontext_list); + av_free(ctx->flist); + av_free(ctx->durations); + av_free(ctx->nb_streams_list); + av_free(ctx->formatcontext_list); av_free(ctx); return 0; }

1 0