]> git.sesse.net Git - vlc/blobdiff - modules/codec/aes3.c
[Qt] Add an icon when dragging.
[vlc] / modules / codec / aes3.c
index 1ee36639489b59a93828b1319e34aad2a37c5528..e1f1c15ecf5ce34759f9785b8f72a4295eb7d4e5 100644 (file)
@@ -41,20 +41,20 @@ static int  OpenDecoder   ( vlc_object_t * );
 static int  OpenPacketizer( vlc_object_t * );
 static void Close         ( vlc_object_t * );
 
-vlc_module_begin();
+vlc_module_begin ()
 
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_ACODEC );
-    set_description( _("AES3/SMPTE 302M audio decoder") );
-    set_capability( "decoder", 100 );
-    set_callbacks( OpenDecoder, Close );
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_ACODEC )
+    set_description( _("AES3/SMPTE 302M audio decoder") )
+    set_capability( "decoder", 100 )
+    set_callbacks( OpenDecoder, Close )
 
-    add_submodule();
-    set_description( N_("AES3/SMPTE 302M audio packetizer") );
-    set_capability( "packetizer", 100 );
-    set_callbacks( OpenPacketizer, Close );
+    add_submodule ()
+    set_description( N_("AES3/SMPTE 302M audio packetizer") )
+    set_capability( "packetizer", 100 )
+    set_callbacks( OpenPacketizer, Close )
 
-vlc_module_end();
+vlc_module_end ()
 
 /*****************************************************************************
  * decoder_sys_t : aes3 decoder descriptor
@@ -130,7 +130,7 @@ static aout_buffer_t *Decode( decoder_t *p_dec, block_t **pp_block )
     if( !p_block )
         return NULL;
 
-    p_aout_buffer = p_dec->pf_aout_buffer_new( p_dec, i_frame_length );
+    p_aout_buffer = decoder_NewAudioBuffer( p_dec, i_frame_length );
     if( p_aout_buffer == NULL )
         goto exit;
 
@@ -350,8 +350,8 @@ static block_t *Parse( decoder_t *p_dec, int *pi_frame_length, int *pi_bits,
     }
 
     p_dec->fmt_out.audio.i_channels = i_channels;
-    p_dec->fmt_out.audio.i_original_channels = pi_original_channels[i_channels];
-    p_dec->fmt_out.audio.i_physical_channels = pi_original_channels[i_channels] & AOUT_CHAN_PHYSMASK;
+    p_dec->fmt_out.audio.i_original_channels = pi_original_channels[i_channels/2-1];
+    p_dec->fmt_out.audio.i_physical_channels = pi_original_channels[i_channels/2-1] & AOUT_CHAN_PHYSMASK;
 
     *pi_frame_length = (p_block->i_buffer - AES3_HEADER_LEN) / ( (4+i_bits) * i_channels / 8 );
     *pi_bits = i_bits;