Fixed playing of some .mov with raw audio.

[vlc] / modules / demux / live555.cpp

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 0b84343ef71c58f9cee1fa2f06dc42360fb2f32a..0b3860dafcde4efdd613f234fb22fd57a69a56f9 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -27,14 +27,19 @@
  * Preamble
  *****************************************************************************/
 
+/* For inttypes.h
+ * Note: config.h may include inttypes.h, so make sure we define this option
+ * early enough. */
+#define __STDC_CONSTANT_MACROS 1
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#define __STDC_CONSTANT_MACROS 1
 #include <inttypes.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 #include <vlc_demux.h>
 #include <vlc_interface.h>
@@ -44,6 +49,7 @@
 #include <iostream>
 #include <limits.h>
 
+
 #if defined( WIN32 )
 #   include <winsock2.h>
 #endif
@@ -83,7 +89,7 @@ static void Close( vlc_object_t * );
     "used for the connection.")
 
 vlc_module_begin();
-    set_description( _("RTP/RTSP/SDP demuxer (using Live555)" ) );
+    set_description( N_("RTP/RTSP/SDP demuxer (using Live555)" ) );
     set_capability( "demux", 50 );
     set_shortname( "RTP/RTSP");
     set_callbacks( Open, Close );
@@ -93,7 +99,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_INPUT_DEMUX );
 
     add_submodule();
-        set_description( _("RTSP/RTP access and demux") );
+        set_description( N_("RTSP/RTP access and demux") );
         add_shortcut( "rtsp" );
         add_shortcut( "sdp" );
         set_capability( "access_demux", 0 );
@@ -104,6 +110,9 @@ vlc_module_begin();
         add_integer( "rtp-client-port", -1, NULL,
                   N_("Client port"),
                   N_("Port to use for the RTP source of the session"), true );
+        add_bool( "rtsp-mcast", false, NULL,
+                  N_("Force multicast RTP via RTSP"),
+                  N_("Force multicast RTP via RTSP"), true );
         add_bool( "rtsp-http", 0, NULL,
                   N_("Tunnel RTSP and RTP over HTTP"),
                   N_("Tunnel RTSP and RTP over HTTP"), true );
@@ -134,15 +143,15 @@ typedef struct
     es_format_t     fmt;
     es_out_id_t     *p_es;
 
-    bool      b_muxed;
-    bool      b_quicktime;
-    bool      b_asf;
+    bool            b_muxed;
+    bool            b_quicktime;
+    bool            b_asf;
     stream_t        *p_out_muxed;    /* for muxed stream */
 
     uint8_t         *p_buffer;
     unsigned int    i_buffer;
 
-    bool      b_rtcp_sync;
+    bool            b_rtcp_sync;
     char            waiting;
     int64_t         i_pts;
     u_int32_t       i_start_seq;
@@ -190,8 +199,9 @@ struct demux_sys_t
     timeout_thread_t *p_timeout;    /* the actual thread that makes sure we don't timeout */
 
     /* */
-    bool       b_multicast;   /* true if one of the tracks is multicasted */
-    bool       b_no_data;     /* true if we never receive any data */
+    bool             b_force_mcast;
+    bool             b_multicast;   /* if one of the tracks is multicasted */
+    bool             b_no_data;     /* if we never received any data */
     int              i_no_data_ti;  /* consecutive number of TaskInterrupt */
 
     char             event;
@@ -273,6 +283,7 @@ static int  Open ( vlc_object_t *p_this )
     p_sys->b_multicast = false;
     p_sys->b_real = false;
     p_sys->psz_path = strdup( p_demux->psz_path );
+    p_sys->b_force_mcast = var_CreateGetBool( p_demux, "rtsp-mcast" );
 
     /* parse URL for rtsp://[user:[passwd]@]serverip:port/options */
     vlc_UrlParse( &p_sys->url, p_sys->psz_path, 0 );
@@ -714,13 +725,18 @@ static int SessionsSetup( demux_t *p_demux )
             /* Issue the SETUP */
             if( p_sys->rtsp )
             {
-                if( !( p_sys->rtsp->setupMediaSubsession( *sub, False,
-                                                   b_rtsp_tcp ? True : False ) ) )
+                bool tcp = b_rtsp_tcp;
+                bool mcast = p_sys->b_force_mcast;
+                if( !p_sys->rtsp->setupMediaSubsession( *sub, False,
+                                           tcp ? True : False,
+                                           ( mcast && !tcp ) ? True : False ) )
                 {
+                    tcp = !tcp;
                     /* if we get an unsupported transport error, toggle TCP use and try again */
                     if( !strstr(p_sys->env->getResultMsg(), "461 Unsupported Transport")
-                     || !( p_sys->rtsp->setupMediaSubsession( *sub, False,
-                                                   b_rtsp_tcp ? False : True ) ) )
+                     || !p_sys->rtsp->setupMediaSubsession( *sub, False,
+                                           tcp ? False : True,
+                                           ( mcast && !tcp ) ? True : False ) )
                     {
                         msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(),
                                  sub->codecName(), p_sys->env->getResultMsg() );
@@ -1201,13 +1217,10 @@ static int Demux( demux_t *p_demux )
                 return 0;
             }
         }
-        else if( p_sys->i_no_data_ti > 34 )
-        {
-            msg_Err( p_demux, "no data received in 10s, aborting" );
-            return 0;
-        }
+        msg_Err( p_demux, "no data received in 10s, aborting" );
+        return 0;
     }
-    else if( !p_sys->b_multicast && p_sys->b_no_data && p_sys->i_no_data_ti > 34 )
+    else if( !p_sys->b_multicast && p_sys->i_no_data_ti > 34 )
     {
         /* EOF ? */
         msg_Warn( p_demux, "no data received in 10s, eof ?" );
@@ -1850,7 +1863,7 @@ static int ParseASF( demux_t *p_demux )
     }
 
     /* Parse it to get packet size */
-    E_(asf_HeaderParse)( &p_sys->asfh, p_header->p_buffer, p_header->i_buffer );
+    asf_HeaderParse( &p_sys->asfh, p_header->p_buffer, p_header->i_buffer );
 
     /* Send it to demuxer */
     stream_DemuxSend( p_sys->p_out_asf, p_header );