Skip to content

F
ffmpeg-mt
Commit dfc4054d authored by diego's avatar diego
Browse files
Options

cosmetics: indentation and other prettyprinting fixes 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19753 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 687888fe
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 73 deletions
libavcodec/wmaprodec.c
View file @ dfc4054d
...@@ -381,11 +381,11 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -381,11 +381,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->sfb_offsets[i][0] = 0; s->sfb_offsets[i][0] = 0;
for (x = 0; x < MAX_BANDS-1 && s->sfb_offsets[i][band-1] < subframe_len; x++) { for (x = 0; x < MAX_BANDS-1 && s->sfb_offsets[i][band - 1] < subframe_len; x++) {
int offset = (subframe_len * 2 * critical_freq[x]) int offset = (subframe_len * 2 * critical_freq[x])
/ s->avctx->sample_rate + 2; / s->avctx->sample_rate + 2;
offset &= ~3; offset &= ~3;
if ( offset > s->sfb_offsets[i][band - 1] ) if (offset > s->sfb_offsets[i][band - 1])
s->sfb_offsets[i][band++] = offset; s->sfb_offsets[i][band++] = offset;
} }
s->sfb_offsets[i][band - 1] = subframe_len; s->sfb_offsets[i][band - 1] = subframe_len;
...@@ -403,7 +403,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -403,7 +403,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
for (b = 0; b < s->num_sfb[i]; b++) { for (b = 0; b < s->num_sfb[i]; b++) {
int x; int x;
int offset = ((s->sfb_offsets[i][b] int offset = ((s->sfb_offsets[i][b]
+ s->sfb_offsets[i][b + 1] - 1)<<i) >> 1; + s->sfb_offsets[i][b + 1] - 1) << i) >> 1;
for (x = 0; x < num_possible_block_sizes; x++) { for (x = 0; x < num_possible_block_sizes; x++) {
int v = 0; int v = 0;
while (s->sfb_offsets[x][v + 1] << x < offset) while (s->sfb_offsets[x][v + 1] << x < offset)
...@@ -416,7 +416,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -416,7 +416,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
/** init MDCT, FIXME: only init needed sizes */ /** init MDCT, FIXME: only init needed sizes */
for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) for (i = 0; i < WMAPRO_BLOCK_SIZES; i++)
ff_mdct_init(&s->mdct_ctx[i], BLOCK_MIN_BITS+1+i, 1, ff_mdct_init(&s->mdct_ctx[i], BLOCK_MIN_BITS+1+i, 1,
1.0 / (1 <<(BLOCK_MIN_BITS + i - 1)) 1.0 / (1 << (BLOCK_MIN_BITS + i - 1))
/ (1 << (s->bits_per_sample - 1))); / (1 << (s->bits_per_sample - 1)));
/** init MDCT windows: simple sinus window */ /** init MDCT windows: simple sinus window */
...@@ -424,7 +424,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ...@@ -424,7 +424,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
const int n = 1 << (WMAPRO_BLOCK_MAX_BITS - i); const int n = 1 << (WMAPRO_BLOCK_MAX_BITS - i);
const int win_idx = WMAPRO_BLOCK_MAX_BITS - i - 7; const int win_idx = WMAPRO_BLOCK_MAX_BITS - i - 7;
ff_sine_window_init(ff_sine_windows[win_idx], n); ff_sine_window_init(ff_sine_windows[win_idx], n);
s->windows[WMAPRO_BLOCK_SIZES-i-1] = ff_sine_windows[win_idx]; s->windows[WMAPRO_BLOCK_SIZES - i - 1] = ff_sine_windows[win_idx];
} }
/** calculate subwoofer cutoff values */ /** calculate subwoofer cutoff values */
...@@ -471,8 +471,8 @@ static int decode_subframe_length(WMAProDecodeCtx *s, int offset) ...@@ -471,8 +471,8 @@ static int decode_subframe_length(WMAProDecodeCtx *s, int offset)
subframe_len = s->samples_per_frame >> frame_len_shift; subframe_len = s->samples_per_frame >> frame_len_shift;
/** sanity check the length */ /** sanity check the length */
if (subframe_len < s->min_samples_per_subframe if (subframe_len < s->min_samples_per_subframe ||
|| subframe_len > s->samples_per_frame) { subframe_len > s->samples_per_frame) {
av_log(s->avctx, AV_LOG_ERROR, "broken frame: subframe_len %i\n", av_log(s->avctx, AV_LOG_ERROR, "broken frame: subframe_len %i\n",
subframe_len); subframe_len);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -559,11 +559,11 @@ static int decode_tilehdr(WMAProDecodeCtx *s) ...@@ -559,11 +559,11 @@ static int decode_tilehdr(WMAProDecodeCtx *s)
num_samples[c] += subframe_len; num_samples[c] += subframe_len;
++chan->num_subframes; ++chan->num_subframes;
if (num_samples[c] > s->samples_per_frame) { if (num_samples[c] > s->samples_per_frame) {
av_log(s->avctx, AV_LOG_ERROR,"broken frame: " av_log(s->avctx, AV_LOG_ERROR, "broken frame: "
"channel len > samples_per_frame\n"); "channel len > samples_per_frame\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} else if(num_samples[c] <= min_channel_len) { } else if (num_samples[c] <= min_channel_len) {
if (num_samples[c] < min_channel_len) { if (num_samples[c] < min_channel_len) {
channels_for_cur_subframe = 0; channels_for_cur_subframe = 0;
min_channel_len = num_samples[c]; min_channel_len = num_samples[c];
...@@ -578,7 +578,8 @@ static int decode_tilehdr(WMAProDecodeCtx *s) ...@@ -578,7 +578,8 @@ static int decode_tilehdr(WMAProDecodeCtx *s)
int offset = 0; int offset = 0;
for (i = 0; i < s->channel[c].num_subframes; i++) { for (i = 0; i < s->channel[c].num_subframes; i++) {
dprintf(s->avctx, "frame[%i] channel[%i] subframe[%i]" dprintf(s->avctx, "frame[%i] channel[%i] subframe[%i]"
" len %i\n", s->frame_num, c, i, s->channel[c].subframe_len[i]); " len %i\n", s->frame_num, c, i,
s->channel[c].subframe_len[i]);
s->channel[c].subframe_offset[i] = offset; s->channel[c].subframe_offset[i] = offset;
offset += s->channel[c].subframe_len[i]; offset += s->channel[c].subframe_len[i];
} }
...@@ -621,10 +622,10 @@ static void decode_decorrelation_matrix(WMAProDecodeCtx *s, ...@@ -621,10 +622,10 @@ static void decode_decorrelation_matrix(WMAProDecodeCtx *s,
if (n < 32) { if (n < 32) {
sinv = sin64[n]; sinv = sin64[n];
cosv = sin64[32-n]; cosv = sin64[32 - n];
} else { } else {
sinv = sin64[64-n]; sinv = sin64[64 - n];
cosv = -sin64[n-32]; cosv = -sin64[n - 32];
} }
chgroup->decorrelation_matrix[y + x * chgroup->num_channels] = chgroup->decorrelation_matrix[y + x * chgroup->num_channels] =
...@@ -646,7 +647,7 @@ static int decode_channel_transform(WMAProDecodeCtx* s) ...@@ -646,7 +647,7 @@ static int decode_channel_transform(WMAProDecodeCtx* s)
{ {
int i; int i;
/* should never consume more than 1921 bits for the 8 channel case /* should never consume more than 1921 bits for the 8 channel case
* 1 + MAX_CHANNELS * ( MAX_CHANNELS + 2 + 3 * MAX_CHANNELS * MAX_CHANNELS * 1 + MAX_CHANNELS * (MAX_CHANNELS + 2 + 3 * MAX_CHANNELS * MAX_CHANNELS
* + MAX_CHANNELS + MAX_BANDS + 1) * + MAX_CHANNELS + MAX_BANDS + 1)
*/ */
...@@ -814,13 +815,13 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c) ...@@ -814,13 +815,13 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c)
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (vals[i]) { if (vals[i]) {
int sign = get_bits1(&s->gb) - 1; int sign = get_bits1(&s->gb) - 1;
ci->coeffs[cur_coeff] = (vals[i]^sign) - sign; ci->coeffs[cur_coeff] = (vals[i] ^ sign) - sign;
num_zeros = 0; num_zeros = 0;
} else { } else {
ci->coeffs[cur_coeff] = 0; ci->coeffs[cur_coeff] = 0;
/** switch to run level mode when subframe_len / 128 zeros /** switch to run level mode when subframe_len / 128 zeros
were found in a row */ were found in a row */
rl_mode |= (++num_zeros > s->subframe_len>>8); rl_mode |= (++num_zeros > s->subframe_len >> 8);
} }
++cur_coeff; ++cur_coeff;
} }
...@@ -893,7 +894,7 @@ static int decode_scale_factors(WMAProDecodeCtx* s) ...@@ -893,7 +894,7 @@ static int decode_scale_factors(WMAProDecodeCtx* s)
idx = get_vlc2(&s->gb, sf_rl_vlc.table, VLCBITS, SCALERLMAXDEPTH); idx = get_vlc2(&s->gb, sf_rl_vlc.table, VLCBITS, SCALERLMAXDEPTH);
if ( !idx ) { if (!idx) {
uint32_t code = get_bits(&s->gb, 14); uint32_t code = get_bits(&s->gb, 14);
val = code >> 6; val = code >> 6;
sign = (code & 1) - 1; sign = (code & 1) - 1;
...@@ -908,7 +909,7 @@ static int decode_scale_factors(WMAProDecodeCtx* s) ...@@ -908,7 +909,7 @@ static int decode_scale_factors(WMAProDecodeCtx* s)
i += skip; i += skip;
if (i >= s->num_bands) { if (i >= s->num_bands) {
av_log(s->avctx,AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"invalid scale factor coding\n"); "invalid scale factor coding\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -955,7 +956,7 @@ static void inverse_channel_transform(WMAProDecodeCtx *s) ...@@ -955,7 +956,7 @@ static void inverse_channel_transform(WMAProDecodeCtx *s)
/** multichannel decorrelation */ /** multichannel decorrelation */
for (sfb = s->cur_sfb_offsets; for (sfb = s->cur_sfb_offsets;
sfb < s->cur_sfb_offsets + s->num_bands;sfb++) { sfb < s->cur_sfb_offsets + s->num_bands; sfb++) {
int y; int y;
if (*tb++ == 1) { if (*tb++ == 1) {
/** multiply values with the decorrelation_matrix */ /** multiply values with the decorrelation_matrix */
...@@ -995,18 +996,18 @@ static void inverse_channel_transform(WMAProDecodeCtx *s) ...@@ -995,18 +996,18 @@ static void inverse_channel_transform(WMAProDecodeCtx *s)
static void wmapro_window(WMAProDecodeCtx *s) static void wmapro_window(WMAProDecodeCtx *s)
{ {
int i; int i;
for (i = 0; i< s->channels_for_cur_subframe; i++) { for (i = 0; i < s->channels_for_cur_subframe; i++) {
int c = s->channel_indexes_for_cur_subframe[i]; int c = s->channel_indexes_for_cur_subframe[i];
float* window; float* window;
int winlen = s->channel[c].prev_block_len; int winlen = s->channel[c].prev_block_len;
float* start = s->channel[c].coeffs - (winlen >> 1); float* start = s->channel[c].coeffs - (winlen >> 1);
if (s->subframe_len < winlen) { if (s->subframe_len < winlen) {
start += (winlen - s->subframe_len)>>1; start += (winlen - s->subframe_len) >> 1;
winlen = s->subframe_len; winlen = s->subframe_len;
} }
window = s->windows[av_log2(winlen)-BLOCK_MIN_BITS]; window = s->windows[av_log2(winlen) - BLOCK_MIN_BITS];
winlen >>= 1; winlen >>= 1;
...@@ -1086,7 +1087,7 @@ static int decode_subframe(WMAProDecodeCtx *s) ...@@ -1086,7 +1087,7 @@ static int decode_subframe(WMAProDecodeCtx *s)
for (i = 0; i < s->channels_for_cur_subframe; i++) { for (i = 0; i < s->channels_for_cur_subframe; i++) {
int c = s->channel_indexes_for_cur_subframe[i]; int c = s->channel_indexes_for_cur_subframe[i];
s->channel[c].coeffs = &s->channel[c].out[(s->samples_per_frame>>1) s->channel[c].coeffs = &s->channel[c].out[(s->samples_per_frame >> 1)
+ offset]; + offset];
} }
...@@ -1103,7 +1104,7 @@ static int decode_subframe(WMAProDecodeCtx *s) ...@@ -1103,7 +1104,7 @@ static int decode_subframe(WMAProDecodeCtx *s)
if (num_fill_bits >= 0) { if (num_fill_bits >= 0) {
if (get_bits_count(&s->gb) + num_fill_bits > s->num_saved_bits) { 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"); av_log(s->avctx, AV_LOG_ERROR, "invalid number of fill bits\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -1143,13 +1144,13 @@ static int decode_subframe(WMAProDecodeCtx *s) ...@@ -1143,13 +1144,13 @@ static int decode_subframe(WMAProDecodeCtx *s)
const int sign = (step == 31) - 1; const int sign = (step == 31) - 1;
int quant = 0; int quant = 0;
while (get_bits_count(&s->gb) + 5 < s->num_saved_bits && while (get_bits_count(&s->gb) + 5 < s->num_saved_bits &&
(step = get_bits(&s->gb, 5)) == 31 ) { (step = get_bits(&s->gb, 5)) == 31) {
quant += 31; quant += 31;
} }
quant_step += ((quant + step) ^ sign) - sign; quant_step += ((quant + step) ^ sign) - sign;
} }
if (quant_step < 0) { if (quant_step < 0) {
av_log(s->avctx,AV_LOG_DEBUG,"negative quant step\n"); av_log(s->avctx, AV_LOG_DEBUG, "negative quant step\n");
} }
/** decode quantization step modifiers for every channel */ /** decode quantization step modifiers for every channel */
...@@ -1163,8 +1164,7 @@ static int decode_subframe(WMAProDecodeCtx *s) ...@@ -1163,8 +1164,7 @@ static int decode_subframe(WMAProDecodeCtx *s)
s->channel[c].quant_step = quant_step; s->channel[c].quant_step = quant_step;
if (get_bits1(&s->gb)) { if (get_bits1(&s->gb)) {
if (modifier_len) { if (modifier_len) {
s->channel[c].quant_step += s->channel[c].quant_step += get_bits(&s->gb, modifier_len) + 1;
get_bits(&s->gb, modifier_len) + 1;
} else } else
++s->channel[c].quant_step; ++s->channel[c].quant_step;
} }
...@@ -1219,7 +1219,7 @@ static int decode_subframe(WMAProDecodeCtx *s) ...@@ -1219,7 +1219,7 @@ static int decode_subframe(WMAProDecodeCtx *s)
} }
/** apply imdct (ff_imdct_half == DCTIV with reverse) */ /** apply imdct (ff_imdct_half == DCTIV with reverse) */
ff_imdct_half(&s->mdct_ctx[av_log2(subframe_len)-BLOCK_MIN_BITS], ff_imdct_half(&s->mdct_ctx[av_log2(subframe_len) - BLOCK_MIN_BITS],
s->channel[c].coeffs, s->tmp); s->channel[c].coeffs, s->tmp);
} }
} }
...@@ -1231,7 +1231,7 @@ static int decode_subframe(WMAProDecodeCtx *s) ...@@ -1231,7 +1231,7 @@ static int decode_subframe(WMAProDecodeCtx *s)
for (i = 0; i < s->channels_for_cur_subframe; i++) { for (i = 0; i < s->channels_for_cur_subframe; i++) {
int c = s->channel_indexes_for_cur_subframe[i]; int c = s->channel_indexes_for_cur_subframe[i];
if (s->channel[c].cur_subframe >= s->channel[c].num_subframes) { if (s->channel[c].cur_subframe >= s->channel[c].num_subframes) {
av_log(s->avctx,AV_LOG_ERROR,"broken subframe\n"); av_log(s->avctx, AV_LOG_ERROR, "broken subframe\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
++s->channel[c].cur_subframe; ++s->channel[c].cur_subframe;
...@@ -1255,7 +1255,7 @@ static int decode_frame(WMAProDecodeCtx *s) ...@@ -1255,7 +1255,7 @@ static int decode_frame(WMAProDecodeCtx *s)
/** check for potential output buffer overflow */ /** check for potential output buffer overflow */
if (s->num_channels * s->samples_per_frame > s->samples_end - s->samples) { if (s->num_channels * s->samples_per_frame > s->samples_end - s->samples) {
av_log(s->avctx,AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"not enough space for the output samples\n"); "not enough space for the output samples\n");
s->packet_loss = 1; s->packet_loss = 1;
return 0; return 0;
...@@ -1351,7 +1351,7 @@ static int decode_frame(WMAProDecodeCtx *s) ...@@ -1351,7 +1351,7 @@ static int decode_frame(WMAProDecodeCtx *s)
if (len != (get_bits_count(gb) - s->frame_offset) + 2) { if (len != (get_bits_count(gb) - s->frame_offset) + 2) {
/** FIXME: not sure if this is always an error */ /** FIXME: not sure if this is always an error */
av_log(s->avctx,AV_LOG_ERROR,"frame[%i] would have to skip %i bits\n", av_log(s->avctx, AV_LOG_ERROR, "frame[%i] would have to skip %i bits\n",
s->frame_num, len - (get_bits_count(gb) - s->frame_offset) - 1); s->frame_num, len - (get_bits_count(gb) - s->frame_offset) - 1);
s->packet_loss = 1; s->packet_loss = 1;
return 0; return 0;
...@@ -1373,7 +1373,7 @@ static int decode_frame(WMAProDecodeCtx *s) ...@@ -1373,7 +1373,7 @@ static int decode_frame(WMAProDecodeCtx *s)
*@param gb bitstream reader context *@param gb bitstream reader context
*@return remaining size in bits *@return remaining size in bits
*/ */
static int remaining_bits(WMAProDecodeCtx *s, GetBitContext* gb) static int remaining_bits(WMAProDecodeCtx *s, GetBitContext *gb)
{ {
return s->buf_bit_size - get_bits_count(gb); return s->buf_bit_size - get_bits_count(gb);
} }
...@@ -1410,7 +1410,8 @@ static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len, ...@@ -1410,7 +1410,8 @@ static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len,
s->num_saved_bits += len; s->num_saved_bits += len;
if (!append) { if (!append) {
ff_copy_bits(&s->pb, gb->buffer + (get_bits_count(gb) >> 3), s->num_saved_bits); ff_copy_bits(&s->pb, gb->buffer + (get_bits_count(gb) >> 3),
s->num_saved_bits);
} else { } else {
int align = 8 - (get_bits_count(gb) & 7); int align = 8 - (get_bits_count(gb) & 7);
align = FFMIN(align, len); align = FFMIN(align, len);
...@@ -1473,7 +1474,7 @@ static int decode_packet(AVCodecContext *avctx, ...@@ -1473,7 +1474,7 @@ static int decode_packet(AVCodecContext *avctx,
/** check for packet loss */ /** check for packet loss */
if (!s->packet_loss && if (!s->packet_loss &&
((s->packet_sequence_number + 1)&0xF) != packet_sequence_number) { ((s->packet_sequence_number + 1) & 0xF) != packet_sequence_number) {
s->packet_loss = 1; s->packet_loss = 1;
av_log(avctx, AV_LOG_ERROR, "Packet loss detected! seq %x vs %x\n", av_log(avctx, AV_LOG_ERROR, "Packet loss detected! seq %x vs %x\n",
s->packet_sequence_number, packet_sequence_number); s->packet_sequence_number, packet_sequence_number);
...@@ -1502,7 +1503,7 @@ static int decode_packet(AVCodecContext *avctx, ...@@ -1502,7 +1503,7 @@ static int decode_packet(AVCodecContext *avctx,
int frame_size = show_bits(&gb, s->log2_frame_size); int frame_size = show_bits(&gb, s->log2_frame_size);
/** there is enough data for a full frame */ /** there is enough data for a full frame */
if (remaining_bits(s,&gb) >= frame_size && frame_size > 0) { if (remaining_bits(s, &gb) >= frame_size && frame_size > 0) {
save_bits(s, &gb, frame_size, 0); save_bits(s, &gb, frame_size, 0);
/** decode the frame */ /** decode the frame */
...@@ -1515,10 +1516,10 @@ static int decode_packet(AVCodecContext *avctx, ...@@ -1515,10 +1516,10 @@ static int decode_packet(AVCodecContext *avctx,
more_frames = 0; more_frames = 0;
} }
if (!s->packet_loss && remaining_bits(s,&gb) > 0) { if (!s->packet_loss && remaining_bits(s, &gb) > 0) {
/** save the rest of the data so that it can be decoded /** save the rest of the data so that it can be decoded
with the next packet */ with the next packet */
save_bits(s, &gb, remaining_bits(s,&gb), 0); save_bits(s, &gb, remaining_bits(s, &gb), 0);
} }
*data_size = (int8_t *)s->samples - (int8_t *)data; *data_size = (int8_t *)s->samples - (int8_t *)data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment