* don't add an 'empty folder' if the user hit cancel when asked to enter a name for it

[vlc] / modules / codec / faad.c

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 06fdaf481fd171556bb9a9c4171f0a5dc2ade8bc..b3ff586a93b36e0081205588d3819a2e8eecb401 100644 (file)
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * decoder.c: AAC decoder using libfaad2
  *****************************************************************************
- * Copyright (C) 2001, 2003 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2001, 2003 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -19,12 +19,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include <vlc/decoder.h>
+#include <vlc_aout.h>
+#include <vlc_codec.h>
+#include <vlc_input.h>
 
 #include <faad.h>
 
@@ -66,6 +67,8 @@ 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;
 };
 
 static const uint32_t pi_channels_in[MAX_CHANNEL_POSITIONS] =
@@ -118,7 +121,7 @@ static int Open( vlc_object_t *p_this )
     aout_DateSet( &p_sys->date, 0 );
     p_dec->fmt_out.i_cat = AUDIO_ES;
 
-    if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+    if (p_this->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU)
         p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
     else
         p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
@@ -153,7 +156,7 @@ static int Open( vlc_object_t *p_this )
 
     /* Set the faad config */
     cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
-    if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+    if (p_this->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU)
         cfg->outputFormat = FAAD_FMT_FLOAT;
     else
         cfg->outputFormat = FAAD_FMT_16BIT;
@@ -166,6 +169,7 @@ static int Open( vlc_object_t *p_this )
     /* Faad2 can't deal with truncated data (eg. from MPEG TS) */
     p_dec->b_need_packetized = VLC_TRUE;
 
+    p_sys->b_sbr = p_sys->b_ps = VLC_FALSE;
     return VLC_SUCCESS;
 }
 
@@ -311,6 +315,27 @@ 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;
 
+        /* Adjust stream info when dealing with SBR/PS */
+        if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) &&
+            p_dec->p_parent->i_object_type == VLC_OBJECT_INPUT )
+        {
+          input_thread_t *p_input = (input_thread_t *)p_dec->p_parent;
+          char *psz_cat, *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" :
+            frame.sbr ? "SBR" : "PS";
+
+          msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)",
+                   psz_ext, frame.channels, frame.samplerate );
+
+          asprintf( &psz_cat, _("Stream %d"), p_dec->fmt_in.i_id );
+          input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+                          _("AAC extension"), "%s", psz_ext );
+          input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+                         _("Channels"), "%d", frame.channels );
+          input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+                         _("Sample rate"), _("%d Hz"), frame.samplerate );
+          free( psz_cat );
+          p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
+        }
 
         /* Convert frame.channel_position to our own channel values */
         for( i = 0; i < frame.channels; i++ )
@@ -330,8 +355,11 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             if( j == MAX_CHANNEL_POSITIONS )
             {
                 msg_Warn( p_dec, "unknown channel ordering" );
-                block_Release( p_block );
-                return NULL;
+
+                /* Try to invent something */
+                p_sys->pi_channel_positions[i] = pi_channels_out[i];
+                p_dec->fmt_out.audio.i_physical_channels |=
+                    pi_channels_out[i];
             }
         }
         p_dec->fmt_out.audio.i_original_channels =
@@ -376,6 +404,7 @@ static void Close( vlc_object_t *p_this )
     decoder_sys_t *p_sys = p_dec->p_sys;
 
     faacDecClose( p_sys->hfaad );
+    if( p_sys->p_buffer ) free( p_sys->p_buffer );
     free( p_sys );
 }
 
@@ -404,7 +433,7 @@ static void DoReordering( decoder_t *p_dec,
     }
 
     /* Do the actual reordering */
-    if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_FPU )
+    if( p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU )
         for( i = 0; i < i_samples; i++ )
             for( j = 0; j < i_nb_channels; j++ )
                 p_out[i * i_nb_channels + pi_chan_table[j]] =