Merge commit 'origin/1.0-bugfix'

[vlc] / src / audio_output / dec.c

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 3b27992817314fa09c751e5d9af520b1497bf9dd..b31b02f4af6b4db366d8aff428f48994a001a3e3 100644 (file)
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -42,9 +42,10 @@
 /*****************************************************************************
  * aout_DecNew : create a decoder
  *****************************************************************************/
-static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
+static aout_input_t * DecNew( aout_instance_t * p_aout,
                               audio_sample_format_t *p_format,
-                              const audio_replay_gain_t *p_replay_gain )
+                              const audio_replay_gain_t *p_replay_gain,
+                              const aout_request_vout_t *p_request_vout )
 {
     aout_input_t * p_input;
 
@@ -60,6 +61,11 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
         msg_Err( p_aout, "no audio channels" );
         return NULL;
     }
+    if( p_format->i_channels != aout_FormatNbChannels( p_format ) )
+    {
+        msg_Err( p_aout, "incompatible audio channels count with layout mask" );
+        return NULL;
+    }
 
     if( p_format->i_rate > 192000 )
     {
@@ -84,10 +90,9 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
         goto error;
     }
 
-    p_input = malloc(sizeof(aout_input_t));
-    if( p_input == NULL )
+    p_input = calloc( 1, sizeof(aout_input_t));
+    if( !p_input )
         goto error;
-    memset( p_input, 0, sizeof(aout_input_t) );
 
     vlc_mutex_init( &p_input->lock );
 
@@ -131,10 +136,12 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
         /* Create other input streams. */
         for ( i = 0; i < p_aout->i_nb_inputs - 1; i++ )
         {
-            aout_lock_input( p_aout, p_aout->pp_inputs[i] );
-            aout_InputDelete( p_aout, p_aout->pp_inputs[i] );
-            aout_InputNew( p_aout, p_aout->pp_inputs[i] );
-            aout_unlock_input( p_aout, p_aout->pp_inputs[i] );
+            aout_input_t *p_input = p_aout->pp_inputs[i];
+
+            aout_lock_input( p_aout, p_input );
+            aout_InputDelete( p_aout, p_input );
+            aout_InputNew( p_aout, p_input, &p_input->request_vout );
+            aout_unlock_input( p_aout, p_input );
         }
     }
     else
@@ -149,7 +156,7 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
         goto error;
     }
 
-    aout_InputNew( p_aout, p_input );
+    aout_InputNew( p_aout, p_input, p_request_vout );
     aout_unlock_input_fifos( p_aout );
 
     aout_unlock_mixer( p_aout );
@@ -164,7 +171,8 @@ error:
 aout_input_t * __aout_DecNew( vlc_object_t * p_this,
                               aout_instance_t ** pp_aout,
                               audio_sample_format_t * p_format,
-                              const audio_replay_gain_t *p_replay_gain )
+                              const audio_replay_gain_t *p_replay_gain,
+                              const aout_request_vout_t *p_request_video )
 {
     aout_instance_t *p_aout = *pp_aout;
     if ( p_aout == NULL )
@@ -180,7 +188,7 @@ aout_input_t * __aout_DecNew( vlc_object_t * p_this,
         *pp_aout = p_aout;
     }
 
-    return DecNew( p_this, p_aout, p_format, p_replay_gain );
+    return DecNew( p_aout, p_format, p_replay_gain, p_request_video );
 }
 
 /*****************************************************************************