MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

swresample: Use channel count in rematrix initialization 

Rematrixing supports up to 64 channels. However, there is only a limited number of channel layouts defined. Since the in/out channel count is currently obtained from the channel layout, for undefined layouts (e.g. for 9, 10, 11 channels etc.) the rematrixing fails.

This patch changes rematrix init methods to use in (used) and out channel count directly instead of computing it from channel layout.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Marcin Gorzel 2018-07-24 14:55:47 +01:00 committed by Michael Niedermayer
parent d01d46ad86
commit 8b710ea5e7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswresample/rematrix.c
View File

@ -384,8 +384,8 @@ av_cold static int auto_matrix(SwrContext *s)
av_cold int swri_rematrix_init(SwrContext *s){
int i, j;
int nb_in = av_get_channel_layout_nb_channels(s->in_ch_layout);
int nb_out = av_get_channel_layout_nb_channels(s->out_ch_layout);
int nb_in = s->used_ch_count;
int nb_out = s->out.ch_count;
s->mix_any_f = NULL;

4
libswresample/x86/rematrix_init.c
View File

@ -33,8 +33,8 @@ D(int16, sse2)
av_cold int swri_rematrix_init_x86(struct SwrContext *s){
#if HAVE_X86ASM
int mm_flags = av_get_cpu_flags();
int nb_in = av_get_channel_layout_nb_channels(s->in_ch_layout);
int nb_out = av_get_channel_layout_nb_channels(s->out_ch_layout);
int nb_in = s->used_ch_count;
int nb_out = s->out.ch_count;
int num = nb_in * nb_out;
int i,j;