Rewrite a useful tooltip for Windows DShow.

[vlc] / modules / demux / mpeg / m4a.c

diff --git a/modules/demux/mpeg/m4a.c b/modules/demux/mpeg/m4a.c
index 1a5c356d5f72467531d2b556bf5ec5fb8b64eadc..f1aa237ef9b6874e747094bbca24f08a5a06420d 100644 (file)
--- a/modules/demux/mpeg/m4a.c
+++ b/modules/demux/mpeg/m4a.c
@@ -24,11 +24,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
-#include "vlc_codec.h"
+#include <vlc_codec.h>
+#include <vlc_input.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -39,8 +44,8 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("MPEG-4 audio demuxer" ) );
-    set_capability( "demux2", 110 );
+    set_description( N_("MPEG-4 audio demuxer" ) );
+    set_capability( "demux", 110 );
     set_callbacks( Open, Close );
     add_shortcut( "m4a" );
     add_shortcut( "mp4a" );
@@ -52,7 +57,7 @@ vlc_module_end();
  *****************************************************************************/
 struct demux_sys_t
 {
-    vlc_bool_t  b_start;
+    bool  b_start;
     es_out_id_t *p_es;
 
     decoder_t   *p_packetizer;
@@ -76,23 +81,14 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    uint8_t     *p_peek;
-    int         b_forced = VLC_FALSE;
-
-    if( p_demux->psz_path )
-    {
-        int i_len = strlen( p_demux->psz_path );
+    const uint8_t *p_peek;
+    int         b_forced = false;
 
-        if( i_len > 4 && !strcasecmp( &p_demux->psz_path[i_len - 4], ".aac" ) )
-        {
-            b_forced = VLC_TRUE;
-        }
-    }
+    if( demux_IsPathExtension( p_demux, ".aac" ) )
+        b_forced = true;
 
     if( !p_demux->b_force && !b_forced )
-    {
         return VLC_EGENERIC;
-    }
 
     /* peek the begining (10 is for adts header) */
     if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 )
@@ -108,13 +104,8 @@ static int Open( vlc_object_t * p_this )
 
     p_demux->pf_demux  = Demux;
     p_demux->pf_control= Control;
-    p_demux->p_sys     = p_sys = malloc( sizeof( demux_sys_t ) );
-    p_sys->p_es        = NULL;
-    p_sys->b_start     = VLC_TRUE;
-    p_sys->i_pts       = 0;
-    p_sys->i_bytes     = 0;
-    p_sys->i_time_offset = 0;
-    p_sys->i_bitrate_avg = 0;
+    p_demux->p_sys     = p_sys = calloc( sizeof( demux_sys_t ), 1 );
+    p_sys->b_start     = true;
 
     /* Load the mpeg 4 audio packetizer */
     INIT_APACKETIZER( p_sys->p_packetizer,  'm', 'p', '4', 'a'  );
@@ -153,7 +144,7 @@ static int Demux( demux_t *p_demux)
     }
 
     p_block_in->i_pts = p_block_in->i_dts = p_sys->b_start ? M4A_PTS_START : 0;
-    p_sys->b_start = VLC_FALSE;
+    p_sys->b_start = false;
 
     while( (p_block_out = p_sys->p_packetizer->pf_packetize(
                                           p_sys->p_packetizer, &p_block_in )) )
@@ -164,7 +155,7 @@ static int Demux( demux_t *p_demux)
 
             if( p_sys->p_es == NULL )
             {
-                p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
+                p_sys->p_packetizer->fmt_out.b_packetized = true;
                 p_sys->p_es = es_out_Add( p_demux->out,
                                           &p_sys->p_packetizer->fmt_out);
             }
@@ -174,9 +165,9 @@ static int Demux( demux_t *p_demux)
             p_block_out->p_next = NULL;
 
             p_sys->i_pts = p_block_out->i_pts;
-            if( p_sys->i_pts > M4A_PTS_START + I64C(500000) )
+            if( p_sys->i_pts > M4A_PTS_START + INT64_C(500000) )
                 p_sys->i_bitrate_avg =
-                    8*I64C(1000000)*p_sys->i_bytes/(p_sys->i_pts-M4A_PTS_START);
+                    8*INT64_C(1000000)*p_sys->i_bytes/(p_sys->i_pts-M4A_PTS_START);
 
             p_sys->i_bytes += p_block_out->i_buffer;
             es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
@@ -193,11 +184,17 @@ static int Demux( demux_t *p_demux)
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
+    bool *pb_bool;
     int64_t *pi64;
     int i_ret;
 
     switch( i_query )
     {
+    case DEMUX_HAS_UNSUPPORTED_META:
+        pb_bool = (bool *)va_arg( args, bool* );
+        *pb_bool = true;
+        return VLC_SUCCESS;
+
     case DEMUX_GET_TIME:
         pi64 = (int64_t*)va_arg( args, int64_t * );
         *pi64 = p_sys->i_pts + p_sys->i_time_offset;
@@ -205,13 +202,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
     case DEMUX_SET_TIME: /* TODO high precision seek for multi-input */
     default:
-        i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
+        i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
                                         p_sys->i_bitrate_avg, 1, i_query, args);
         /* Fix time_offset */
         if( (i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME ) &&
             i_ret == VLC_SUCCESS && p_sys->i_bitrate_avg > 0 )
         {
-            int64_t i_time = I64C(8000000) * stream_Tell(p_demux->s) /
+            int64_t i_time = INT64_C(8000000) * stream_Tell(p_demux->s) /
                 p_sys->i_bitrate_avg;
 
             if( i_time >= 0 )