diff --git a/libswresample/rematrix_template.c b/libswresample/rematrix_template.c index 690ea7c6c7..f83825d5ec 100644 --- a/libswresample/rematrix_template.c +++ b/libswresample/rematrix_template.c @@ -45,6 +45,16 @@ static void RENAME(mix6to2)(SAMPLE **out, const SAMPLE **in, COEFF *coeffp, int } } +static void RENAME(mix8to2)(SAMPLE **out, const SAMPLE **in, COEFF *coeffp, int len){ + int i; + + for(i=0; iout_ch_layout == AV_CH_LAYOUT_STEREO && (s->in_ch_layout == AV_CH_LAYOUT_5POINT1 || s->in_ch_layout == AV_CH_LAYOUT_5POINT1_BACK) && s->matrix[0][2] == s->matrix[1][2] && s->matrix[0][3] == s->matrix[1][3] @@ -52,5 +62,12 @@ static mix_any_func_type *RENAME(get_mix_any_func)(SwrContext *s){ ) return RENAME(mix6to2); + if( s->out_ch_layout == AV_CH_LAYOUT_STEREO && s->in_ch_layout == AV_CH_LAYOUT_7POINT1 + && s->matrix[0][2] == s->matrix[1][2] && s->matrix[0][3] == s->matrix[1][3] + && !s->matrix[0][1] && !s->matrix[0][5] && !s->matrix[1][0] && !s->matrix[1][4] + && !s->matrix[0][7] && !s->matrix[1][6] + ) + return RENAME(mix8to2); + return NULL; }