Skip to content

V
vlc-1.1
Commit 2560f1d6 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Recognized more channels layout in aout_FormatPrintChannels.

parent 7336ff44
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
src/audio_output/common.c
View file @ 2560f1d6
...@@ -236,9 +236,15 @@ const char * aout_FormatPrintChannels( const audio_sample_format_t * p_format ) ...@@ -236,9 +236,15 @@ const char * aout_FormatPrintChannels( const audio_sample_format_t * p_format )
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT: | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
return "2F2R"; return "2F2R";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT:
return "2F2M";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT: | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
return "3F2R"; return "3F2R";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT:
return "3F2M";
case AOUT_CHAN_CENTER | AOUT_CHAN_LFE: case AOUT_CHAN_CENTER | AOUT_CHAN_LFE:
if ( (p_format->i_original_channels & AOUT_CHAN_CENTER) if ( (p_format->i_original_channels & AOUT_CHAN_CENTER)
...@@ -271,9 +277,15 @@ const char * aout_FormatPrintChannels( const audio_sample_format_t * p_format ) ...@@ -271,9 +277,15 @@ const char * aout_FormatPrintChannels( const audio_sample_format_t * p_format )
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE: | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE:
return "2F2R/LFE"; return "2F2R/LFE";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_LFE:
return "2F2M/LFE";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE: | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE:
return "3F2R/LFE"; return "3F2R/LFE";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_LFE:
return "3F2M/LFE";
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_MIDDLELEFT
| AOUT_CHAN_MIDDLERIGHT: | AOUT_CHAN_MIDDLERIGHT:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment