generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

g722dec: remove the use of lowres for half-rate decoding.

Browse Source 
It is broken because an AVCodecContext can be opened/closed multiple
times, and sample_rate is getting divided by 2 each time that happens.

This removes the only use of lowres for audio.
This commit is contained in:
Justin Ruggles 2011-10-22 18:29:14 -04:00
parent f540ca22c5
commit d0a196962a
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
avconv.c
View File

@ -2074,11 +2074,8 @@ static int transcode_init(OutputFile *output_files,
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE); ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE);
if (!codec->sample_rate) { if (!codec->sample_rate)
codec->sample_rate = icodec->sample_rate; codec->sample_rate = icodec->sample_rate;
if (icodec->lowres)
codec->sample_rate >>= icodec->lowres;
}
choose_sample_rate(ost->st, ost->enc); choose_sample_rate(ost->st, ost->enc);
codec->time_base = (AVRational){1, codec->sample_rate}; codec->time_base = (AVRational){1, codec->sample_rate};
if (codec->sample_fmt == AV_SAMPLE_FMT_NONE) if (codec->sample_fmt == AV_SAMPLE_FMT_NONE)

18
libavcodec/g722dec.c
View File

@ -66,9 +66,6 @@ static av_cold int g722_decode_init(AVCodecContext * avctx)
c->band[1].scale_factor = 2; c->band[1].scale_factor = 2;
c->prev_samples_pos = 22; c->prev_samples_pos = 22;
if (avctx->lowres)
avctx->sample_rate /= 2;
return 0; return 0;
} }
@ -96,7 +93,8 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
init_get_bits(&gb, avpkt->data, avpkt->size * 8); init_get_bits(&gb, avpkt->data, avpkt->size * 8);
for (j = 0; j < avpkt->size; j++) { for (j = 0; j < avpkt->size; j++) {
int ilow, ihigh, rlow; int ilow, ihigh, rlow, rhigh, dhigh;
int xout1, xout2;
ihigh = get_bits(&gb, 2); ihigh = get_bits(&gb, 2);
ilow = get_bits(&gb, 6 - skip); ilow = get_bits(&gb, 6 - skip);
@ -107,12 +105,9 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
ff_g722_update_low_predictor(&c->band[0], ilow >> (2 - skip)); ff_g722_update_low_predictor(&c->band[0], ilow >> (2 - skip));
if (!avctx->lowres) { dhigh = c->band[1].scale_factor *
const int dhigh = c->band[1].scale_factor * ff_g722_high_inv_quant[ihigh] >> 10;
ff_g722_high_inv_quant[ihigh] >> 10; rhigh = av_clip(dhigh + c->band[1].s_predictor, -16384, 16383);
const int rhigh = av_clip(dhigh + c->band[1].s_predictor,
-16384, 16383);
int xout1, xout2;
ff_g722_update_high_predictor(&c->band[1], dhigh, ihigh); ff_g722_update_high_predictor(&c->band[1], dhigh, ihigh);
@ -128,8 +123,6 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
22 * sizeof(c->prev_samples[0])); 22 * sizeof(c->prev_samples[0]));
c->prev_samples_pos = 22; c->prev_samples_pos = 22;
} }
} else
out_buf[out_len++] = rlow;
} }
*data_size = out_len << 1; *data_size = out_len << 1;
return avpkt->size; return avpkt->size;
@ -143,5 +136,4 @@ AVCodec ff_adpcm_g722_decoder = {
.init = g722_decode_init, .init = g722_decode_init,
.decode = g722_decode_frame, .decode = g722_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"), .long_name = NULL_IF_CONFIG_SMALL("G.722 ADPCM"),
.max_lowres = 1,
}; };