X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ffaad.c;h=7af61bc7f092c271e143a51843a31c37f69a72ce;hb=refs%2Ftags%2F0.9.0-test2;hp=4f2bb9ff684ca7319b693b49262daea3fe3012c2;hpb=d2bd568bdfe7ebe702e698c79c6ea75a653d7b27;p=vlc

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 4f2bb9ff68..7af61bc7f0 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -26,7 +26,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>
 #include <vlc_input.h>
@@ -40,7 +41,7 @@ static int  Open( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("AAC audio decoder (using libfaad2)") );
+    set_description( N_("AAC audio decoder (using libfaad2)") );
     set_capability( "decoder", 100 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACODEC );
@@ -71,7 +72,7 @@ struct decoder_sys_t
     /* Channel positions of the current stream (for re-ordering) */
     uint32_t pi_channel_positions[MAX_CHANNEL_POSITIONS];
 
-    vlc_bool_t b_sbr, b_ps;
+    bool b_sbr, b_ps;
 
     int i_input_rate;
 };
@@ -126,10 +127,7 @@ static int Open( vlc_object_t *p_this )
     /* Allocate the memory needed to store the decoder's structure */
     if( ( p_dec->p_sys = p_sys =
           (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
-    {
-        msg_Err( p_dec, "out of memory" );
-        return VLC_EGENERIC;
-    }
+        return VLC_ENOMEM;
 
     /* Open a faad context */
     if( ( p_sys->hfaad = faacDecOpen() ) == NULL )
@@ -193,9 +191,9 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_input_rate = INPUT_RATE_DEFAULT;
 
     /* Faad2 can't deal with truncated data (eg. from MPEG TS) */
-    p_dec->b_need_packetized = VLC_TRUE;
+    p_dec->b_need_packetized = true;
 
-    p_sys->b_sbr = p_sys->b_ps = VLC_FALSE;
+    p_sys->b_sbr = p_sys->b_ps = false;
     return VLC_SUCCESS;
 }
 
@@ -231,9 +229,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             /* FIXME: multiple blocks per frame */
             if( p_block->i_buffer > i_header_size )
             {
-                p_dec->p_libvlc->pf_memcpy( p_block->p_buffer,
-                        p_block->p_buffer + i_header_size,
-                        p_block->i_buffer - i_header_size );
+                vlc_memcpy( p_block->p_buffer,
+                            p_block->p_buffer + i_header_size,
+                            p_block->i_buffer - i_header_size );
                 p_block->i_buffer -= i_header_size;
             }
         }
@@ -248,8 +246,8 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
     if( p_block->i_buffer > 0 )
     {
-        p_dec->p_libvlc->pf_memcpy( &p_sys->p_buffer[p_sys->i_buffer],
-                p_block->p_buffer, p_block->i_buffer );
+        vlc_memcpy( &p_sys->p_buffer[p_sys->i_buffer],
+                     p_block->p_buffer, p_block->i_buffer );
         p_sys->i_buffer += p_block->i_buffer;
         p_block->i_buffer = 0;
     }
@@ -266,6 +264,10 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         {
             p_dec->fmt_out.audio.i_rate = i_rate;
             p_dec->fmt_out.audio.i_channels = i_channels;
+            p_dec->fmt_out.audio.i_physical_channels
+                = p_dec->fmt_out.audio.i_original_channels
+                = pi_channels_guessed[i_channels];
+
             aout_DateInit( &p_sys->date, i_rate );
         }
     }
@@ -286,6 +288,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
         p_dec->fmt_out.audio.i_rate = i_rate;
         p_dec->fmt_out.audio.i_channels = i_channels;
+        p_dec->fmt_out.audio.i_physical_channels
+            = p_dec->fmt_out.audio.i_original_channels
+            = pi_channels_guessed[i_channels];
         aout_DateInit( &p_sys->date, i_rate );
     }
 
@@ -362,6 +367,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
 
         p_dec->fmt_out.audio.i_rate = frame.samplerate;
         p_dec->fmt_out.audio.i_channels = frame.channels;
+        p_dec->fmt_out.audio.i_physical_channels
+            = p_dec->fmt_out.audio.i_original_channels
+            = pi_channels_guessed[frame.channels];
 
         /* Adjust stream info when dealing with SBR/PS */
         if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&