diff options
| author | Roberto Togni <rxt@rtogni.it> | 2013-04-20 23:57:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-21 02:00:06 +0200 |
| commit | 8017683647f5afaea0251eb0e01ec533f2a48d33 (patch) | |
| tree | 737038e632f6bbaa077908337cd4f7f619cc148d | |
| parent | 578d9cf7ccd3a98b11dd70199da4f3e6f934e33e (diff) | |
| download | ffmpeg-8017683647f5afaea0251eb0e01ec533f2a48d33.tar.gz | |
qdm2: initialize coeff_per_sb_select from bit_rate
The value of coeff_per_sb_select depends on the bit rate, not on
sub_sampling.
Also remove the calculation of tmp, no longer needed.
Fixes tickets #1868 and #742 (only audio part)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/qdm2.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 5482e9b6aa..daf127e0f5 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1862,18 +1862,9 @@ static av_cold int qdm2_decode_init(AVCodecContext *avctx) if ((tmp * 2240) < avctx->bit_rate) tmp_val = 4; s->cm_table_select = tmp_val; - if (s->sub_sampling == 0) - tmp = 7999; - else - tmp = ((-(s->sub_sampling -1)) & 8000) + 20000; - /* - 0: 7999 -> 0 - 1: 20000 -> 2 - 2: 28000 -> 2 - */ - if (tmp < 8000) + if (avctx->bit_rate <= 8000) s->coeff_per_sb_select = 0; - else if (tmp <= 16000) + else if (avctx->bit_rate < 16000) s->coeff_per_sb_select = 1; else s->coeff_per_sb_select = 2; |