diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2016-01-12 15:56:36 +0100 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2016-01-12 15:56:36 +0100 |
| commit | 1b412a523d1ed950a1822ae4a01c8ce8aa29b34f (patch) | |
| tree | c5373adc4c7dc94a6639a0601192823035f95ab9 | |
| parent | ef3844cf6fd9ec7f4e9cde7085cd3146504e4ca9 (diff) | |
audio-channel-mixer: round before truncating
Round the result before truncating for int channel mixing.
| -rw-r--r-- | gst-libs/gst/audio/audio-channel-mixer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gst-libs/gst/audio/audio-channel-mixer.c b/gst-libs/gst/audio/audio-channel-mixer.c index bb010d059..873bc8148 100644 --- a/gst-libs/gst/audio/audio-channel-mixer.c +++ b/gst-libs/gst/audio/audio-channel-mixer.c @@ -52,7 +52,7 @@ ensure_debug_category (void) #endif /* GST_DISABLE_GST_DEBUG */ -#define INT_MATRIX_FACTOR_EXPONENT 10 +#define PRECISION_INT 10 typedef void (*MixerFunc) (GstAudioChannelMixer * mix, const gpointer src, gpointer dst, gint samples); @@ -650,7 +650,7 @@ gst_audio_channel_mixer_setup_matrix_int (GstAudioChannelMixer * mix) { gint i, j; gfloat tmp; - gfloat factor = (1 << INT_MATRIX_FACTOR_EXPONENT); + gfloat factor = (1 << PRECISION_INT); mix->matrix_int = g_new0 (gint *, mix->in_channels); @@ -729,7 +729,7 @@ gst_audio_channel_mixer_mix_int16 (GstAudioChannelMixer * mix, res += in_data[n * inchannels + in] * mix->matrix_int[in][out]; /* remove factor from int matrix */ - res = res >> INT_MATRIX_FACTOR_EXPONENT; + res = (res + (1 << (PRECISION_INT - 1))) >> PRECISION_INT; out_data[n * outchannels + out] = CLAMP (res, G_MININT16, G_MAXINT16); } } @@ -754,7 +754,7 @@ gst_audio_channel_mixer_mix_int32 (GstAudioChannelMixer * mix, res += in_data[n * inchannels + in] * (gint64) mix->matrix_int[in][out]; /* remove factor from int matrix */ - res = res >> INT_MATRIX_FACTOR_EXPONENT; + res = (res + (1 << (PRECISION_INT - 1))) >> PRECISION_INT; out_data[n * outchannels + out] = CLAMP (res, G_MININT32, G_MAXINT32); } } |