diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-04-26 16:02:37 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-05-01 13:52:59 -0400 |
| commit | 4010d724e1d57858d56bff66fa245f2d5646be6e (patch) | |
| tree | 52302973e6372e554c5a063cade02b113c553e56 /libavresample/audio_mix_matrix.c | |
| parent | f1ffb01ee9fd3a15c395c3cf6ff362ac5cd668d0 (diff) | |
| download | ffmpeg-4010d724e1d57858d56bff66fa245f2d5646be6e.tar.gz | |
lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type
Diffstat (limited to 'libavresample/audio_mix_matrix.c')
| -rw-r--r-- | libavresample/audio_mix_matrix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavresample/audio_mix_matrix.c b/libavresample/audio_mix_matrix.c index 96c49ef26f..6135b02422 100644 --- a/libavresample/audio_mix_matrix.c +++ b/libavresample/audio_mix_matrix.c @@ -257,14 +257,14 @@ int avresample_get_matrix(AVAudioResampleContext *avr, double *matrix, } switch (avr->mix_coeff_type) { - case AV_MIX_COEFF_TYPE_Q6: - if (!avr->am->matrix_q6[0]) { + case AV_MIX_COEFF_TYPE_Q8: + if (!avr->am->matrix_q8[0]) { av_log(avr, AV_LOG_ERROR, "matrix is not set\n"); return AVERROR(EINVAL); } for (o = 0; o < out_channels; o++) for (i = 0; i < in_channels; i++) - matrix[o * stride + i] = avr->am->matrix_q6[o][i] / 64.0; + matrix[o * stride + i] = avr->am->matrix_q8[o][i] / 256.0; break; case AV_MIX_COEFF_TYPE_Q15: if (!avr->am->matrix_q15[0]) { @@ -325,8 +325,8 @@ int avresample_set_matrix(AVAudioResampleContext *avr, const double *matrix, avr->am->matrix = (void **)avr->am->matrix_## type; switch (avr->mix_coeff_type) { - case AV_MIX_COEFF_TYPE_Q6: - CONVERT_MATRIX(q6, av_clip_int16(lrint(64.0 * v))) + case AV_MIX_COEFF_TYPE_Q8: + CONVERT_MATRIX(q8, av_clip_int16(lrint(256.0 * v))) break; case AV_MIX_COEFF_TYPE_Q15: CONVERT_MATRIX(q15, av_clipl_int32(llrint(32768.0 * v))) |