On 2012-12-14 01:31:31 -0500, Justin Ruggles wrote:
> ---
> libavresample/resample.c | 18 ++++++++++++------
> 1 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/libavresample/resample.c b/libavresample/resample.c
> index 381d673..2cd9b7d 100644
> --- a/libavresample/resample.c
> +++ b/libavresample/resample.c
> @@ -259,6 +259,7 @@ int avresample_set_compensation(AVAudioResampleContext
> *avr, int sample_delta,
> AVAudioResampleContext and force resampling */
> if (!avr->resample_needed) {
> int fifo_samples;
> + int save_matrix = 0;
the variable name is a little confusing, it is set to true after the
matrix is saved. has_matrix or restore_matrix would be less confusing
> double matrix[AVRESAMPLE_MAX_CHANNELS * AVRESAMPLE_MAX_CHANNELS] = {
> 0 };
>
> /* buffer any remaining samples in the output FIFO before closing */
> @@ -274,9 +275,12 @@ int avresample_set_compensation(AVAudioResampleContext
> *avr, int sample_delta,
> goto reinit_fail;
> }
> /* save the channel mixing matrix */
> - ret = avresample_get_matrix(avr, matrix, AVRESAMPLE_MAX_CHANNELS);
> - if (ret < 0)
> - goto reinit_fail;
> + if (avr->am) {
> + ret = avresample_get_matrix(avr, matrix,
> AVRESAMPLE_MAX_CHANNELS);
> + if (ret < 0)
> + goto reinit_fail;
> + save_matrix = 1;
> + }
>
> /* close the AVAudioResampleContext */
> avresample_close(avr);
> @@ -284,9 +288,11 @@ int avresample_set_compensation(AVAudioResampleContext
> *avr, int sample_delta,
> avr->force_resampling = 1;
>
> /* restore the channel mixing matrix */
> - ret = avresample_set_matrix(avr, matrix, AVRESAMPLE_MAX_CHANNELS);
> - if (ret < 0)
> - goto reinit_fail;
> + if (save_matrix) {
> + ret = avresample_set_matrix(avr, matrix,
> AVRESAMPLE_MAX_CHANNELS);
> + if (ret < 0)
> + goto reinit_fail;
> + }
>
> /* re-open the AVAudioResampleContext */
> ret = avresample_open(avr);
the rest looks good
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
