AC3 3F1R downmix to stereo (simple downmixer)

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index 407700a5f14c9e55886d0518e06048d428269aec..a1e3ea96152d0ef7703ef4851fd465d5b07eaec7 100644 (file)
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -65,6 +65,7 @@ vlc_module_end ()
 #define AOUT_CHANS_3_0          ( AOUT_CHANS_STEREO_FRONT | AOUT_CHAN_CENTER )
 #define AOUT_CHANS_4_0          ( AOUT_CHANS_STEREO_FRONT | AOUT_CHANS_STEREO_REAR )
 #define AOUT_CHANS_4_0_MIDDLE   ( AOUT_CHANS_STEREO_FRONT | AOUT_CHANS_STEREO_MIDDLE )
+#define AOUT_CHANS_4_CENTER_REAR (AOUT_CHANS_STEREO_FRONT | AOUT_CHAN_CENTER | AOUT_CHAN_REARCENTER)
 #define AOUT_CHANS_5_0          ( AOUT_CHANS_4_0 | AOUT_CHAN_CENTER )
 #define AOUT_CHANS_5_0_MIDDLE   ( AOUT_CHANS_4_0_MIDDLE | AOUT_CHAN_CENTER )
 #define AOUT_CHANS_6_0          ( AOUT_CHANS_STEREO_FRONT | AOUT_CHANS_STEREO_REAR | AOUT_CHANS_STEREO_MIDDLE )
@@ -108,6 +109,9 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                                (i_input_physical & AOUT_CHANS_5_0_MIDDLE) == AOUT_CHANS_5_0_MIDDLE );
     const bool b_input_3_0 = !b_input_7_0 && !b_input_5_0 &&
                              (i_input_physical & ~AOUT_CHAN_LFE) == AOUT_CHANS_3_0;
+
+    const bool b_input_4_center_rear = (i_input_physical & ~AOUT_CHAN_LFE) == AOUT_CHANS_4_CENTER_REAR;
+
     int i_input_nb = aout_FormatNbChannels( &p_filter->input );
     int i_output_nb = aout_FormatNbChannels( &p_filter->output );
     float *p_dest = (float *)p_out_buf->p_buffer;
@@ -155,6 +159,15 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
 
             if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
         }
+        else if (b_input_4_center_rear)
+        for( i = p_in_buf->i_nb_samples; i--; )
+        {
+          *p_dest = p_src[2] + p_src[3] + 0.5 * p_src[0];
+          p_dest++;
+          *p_dest = p_src[2] + p_src[3] + 0.5 * p_src[1];
+          p_dest++;
+          p_src += 4;
+        }
     }
     else if( p_filter->output.i_physical_channels == AOUT_CHAN_CENTER )
     {
@@ -345,6 +358,7 @@ static bool IsSupported( const audio_format_t *p_input, const audio_format_t *p_
         (p_input->i_physical_channels & ~AOUT_CHAN_LFE) != AOUT_CHANS_5_0 &&
         (p_input->i_physical_channels & ~AOUT_CHAN_LFE) != AOUT_CHANS_5_0_MIDDLE &&
         (p_input->i_physical_channels & ~AOUT_CHAN_LFE) != AOUT_CHANS_3_0 &&
+        (p_input->i_physical_channels & ~AOUT_CHAN_LFE) != AOUT_CHANS_4_CENTER_REAR &&
          p_input->i_physical_channels != AOUT_CHANS_2_0 )
     {
         return false;