Skip to content
Snippets Groups Projects
Commit 9b42653b authored by Justin Ruggles's avatar Justin Ruggles Committed by Michael Niedermayer
Browse files

swr: update side to back mixing.

parent 7bea0a06
No related branches found
No related tags found
No related merge requests found
...@@ -184,8 +184,15 @@ static int auto_matrix(SwrContext *s) ...@@ -184,8 +184,15 @@ static int auto_matrix(SwrContext *s)
if(unaccounted & AV_CH_SIDE_LEFT){ if(unaccounted & AV_CH_SIDE_LEFT){
if(s->out_ch_layout & AV_CH_BACK_LEFT){ if(s->out_ch_layout & AV_CH_BACK_LEFT){
matrix[ BACK_LEFT][ SIDE_LEFT]+= 1.0; /* if back channels do not exist in the input, just copy side
matrix[BACK_RIGHT][SIDE_RIGHT]+= 1.0; channels to back channels, otherwise mix side into back */
if (s->in_ch_layout & AV_CH_BACK_LEFT) {
matrix[BACK_LEFT ][SIDE_LEFT ] += M_SQRT1_2;
matrix[BACK_RIGHT][SIDE_RIGHT] += M_SQRT1_2;
} else {
matrix[BACK_LEFT ][SIDE_LEFT ] += 1.0;
matrix[BACK_RIGHT][SIDE_RIGHT] += 1.0;
}
}else if(s->out_ch_layout & AV_CH_BACK_CENTER){ }else if(s->out_ch_layout & AV_CH_BACK_CENTER){
matrix[BACK_CENTER][ SIDE_LEFT]+= M_SQRT1_2; matrix[BACK_CENTER][ SIDE_LEFT]+= M_SQRT1_2;
matrix[BACK_CENTER][SIDE_RIGHT]+= M_SQRT1_2; matrix[BACK_CENTER][SIDE_RIGHT]+= M_SQRT1_2;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment