]> git.sesse.net Git - vlc/blobdiff - modules/demux/live555.cpp
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Don't distribute removed autoconf260
[vlc] / modules / demux / live555.cpp
diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 20f46061f046523afd78c3508f31f3d503cef7e6..ea58cca32f1a0ec677de5911f9bb964cfb70b998 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -27,6 +27,10 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 
 #include <vlc_demux.h>
@@ -35,6 +39,7 @@
 #include <vlc_url.h>
 
 #include <iostream>
+#include <limits.h>
 
 #if defined( WIN32 )
 #   include <winsock2.h>
@@ -304,11 +309,17 @@ static int  Open ( vlc_object_t *p_this )
             int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp],
                                       i_sdp_max - i_sdp - 1 );
 
+            if( p_demux->b_die || p_demux->b_error )
+            {
+                free( p_sdp );
+                goto error;
+            }
+
             if( i_read < 0 )
             {
                 msg_Err( p_demux, "failed to read SDP" );
-                free( p_sys );
-                return VLC_EGENERIC;
+                free( p_sdp );
+                goto error;
             }
 
             i_sdp += i_read;
@@ -387,11 +398,11 @@ error:
         vlc_object_kill( p_sys->p_timeout );
         vlc_thread_join( p_sys->p_timeout );
         vlc_object_detach( p_sys->p_timeout );
-        vlc_object_destroy( p_sys->p_timeout );
+        vlc_object_release( p_sys->p_timeout );
     }
-    if( p_sys->scheduler ) delete p_sys->scheduler;
-    if( p_sys->p_sdp ) free( p_sys->p_sdp );
-    if( p_sys->psz_path ) free( p_sys->psz_path );
+    delete p_sys->scheduler;
+    free( p_sys->p_sdp );
+    free( p_sys->psz_path );
 
     vlc_UrlClean( &p_sys->url );
 
@@ -428,11 +439,11 @@ static void Close( vlc_object_t *p_this )
         vlc_object_kill( p_sys->p_timeout );
         vlc_thread_join( p_sys->p_timeout );
         vlc_object_detach( p_sys->p_timeout );
-        vlc_object_destroy( p_sys->p_timeout );
+        vlc_object_release( p_sys->p_timeout );
     }
-    if( p_sys->scheduler ) delete p_sys->scheduler;
-    if( p_sys->p_sdp ) free( p_sys->p_sdp );
-    if( p_sys->psz_path ) free( p_sys->psz_path );
+    delete p_sys->scheduler;
+    free( p_sys->p_sdp );
+    free( p_sys->psz_path );
 
     vlc_UrlClean( &p_sys->url );
 
@@ -446,6 +457,7 @@ static int Connect( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
     Authenticator authenticator;
+    vlc_bool_t b_firstpass = VLC_TRUE;
 
     char *psz_user    = NULL;
     char *psz_pwd     = NULL;
@@ -518,7 +530,7 @@ describe:
 
     psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
                                                &authenticator );
-    if( psz_options ) delete [] psz_options;
+    delete [] psz_options;
 
     p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator,
                          var_GetBool( p_demux, "rtsp-kasenna" ) );
@@ -531,16 +543,28 @@ describe:
         if( var_GetBool( p_demux, "rtsp-http" ) )
             sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s",
                     &i_code );
-        else sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code );
+        else
+        {
+            const char *psz_tmp = strstr( psz_error, "RTSP" );
+            sscanf( psz_tmp, "RTSP/%*s%3u", &i_code );
+        }
         msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error );
 
+        if( b_firstpass )
+        {   /* describeURL always returns an "RTSP/1.0 401 Unauthorized" the
+             * first time. This is a workaround to avoid asking for a
+             * user/passwd the first time the code passess here. */
+            i_code = 0;
+            b_firstpass = VLC_FALSE;
+        }
+
         if( i_code == 401 )
         {
             int i_result;
             msg_Dbg( p_demux, "authentication failed" );
 
-            if( psz_user ) free( psz_user );
-            if( psz_pwd ) free( psz_pwd );
+            free( psz_user );
+            free( psz_pwd );
             psz_user = psz_pwd = NULL;
 
             i_result = intf_UserLoginPassword( p_demux, _("RTSP authentication"),
@@ -575,11 +599,11 @@ describe:
     }
 
     /* malloc-ated copy */
-    if( psz_url ) free( psz_url );
-    if( psz_user ) free( psz_user );
-    if( psz_pwd ) free( psz_pwd );
+    free( psz_url );
+    free( psz_user );
+    free( psz_pwd );
 
-    if( p_sys->p_sdp ) free( p_sys->p_sdp );
+    free( p_sys->p_sdp );
     p_sys->p_sdp = NULL;
     if( p_sdp ) p_sys->p_sdp = strdup( (char*)p_sdp );
     delete[] p_sdp;
@@ -621,6 +645,12 @@ static int SessionsSetup( demux_t *p_demux )
         Boolean bInit;
         live_track_t *tk;
 
+        if( p_demux->b_die || p_demux->b_error )
+        {
+            delete iter;
+            return VLC_EGENERIC;
+        }
+
         /* Value taken from mplayer */
         if( !strcmp( sub->mediumName(), "audio" ) )
             i_buffer = 100000;
@@ -695,6 +725,11 @@ static int SessionsSetup( demux_t *p_demux )
             }
 
             tk = (live_track_t*)malloc( sizeof( live_track_t ) );
+            if( !tk )
+            {
+                delete iter;
+                return VLC_ENOMEM;
+            }
             tk->p_demux     = p_demux;
             tk->sub         = sub;
             tk->p_es        = NULL;
@@ -707,6 +742,11 @@ static int SessionsSetup( demux_t *p_demux )
             tk->i_pts       = 0;
             tk->i_buffer    = 65536;
             tk->p_buffer    = (uint8_t *)malloc( 65536 );
+            if( !tk->p_buffer )
+            {
+                delete iter;
+                return VLC_ENOMEM;
+            }
 
             /* Value taken from mplayer */
             if( !strcmp( sub->mediumName(), "audio" ) )
@@ -937,7 +977,7 @@ static int SessionsSetup( demux_t *p_demux )
     delete iter;
     if( p_sys->i_track <= 0 ) i_return = VLC_EGENERIC;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
     /* Retrieve the starttime if possible */
     p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -946,7 +986,7 @@ static int SessionsSetup( demux_t *p_demux )
     if( p_sys->i_npt_start < 0 )
         p_sys->i_npt_start = -1;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
     /* Retrieve the duration if possible */
     p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -980,7 +1020,11 @@ static int Play( demux_t *p_demux )
         p_sys->i_timeout = p_sys->rtsp->sessionTimeoutParameter();
         if( p_sys->i_timeout <= 0 )
             p_sys->i_timeout = 60; /* default value from RFC2326 */
-        if( !p_sys->p_timeout )
+
+        /* start timeout-thread only on x-asf streams (wms), it has rtcp support but doesn't 
+         * seem to use it for liveness/keep-alive, get_parameter seems to work for it. get_parameter
+         * doesn't work with dss 5.5.4 & 5.5.5, they seems to work with rtcp */
+        if( !p_sys->p_timeout && p_sys->p_out_asf )
         {
             msg_Dbg( p_demux, "We have a timeout of %d seconds",  p_sys->i_timeout );
             p_sys->p_timeout = (timeout_thread_t *)vlc_object_create( p_demux, sizeof(timeout_thread_t) );
@@ -989,7 +1033,7 @@ static int Play( demux_t *p_demux )
                                    VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
             {
                 msg_Err( p_demux, "cannot spawn liveMedia timeout thread" );
-                vlc_object_destroy( p_sys->p_timeout );
+                vlc_object_release( p_sys->p_timeout );
             }
             msg_Dbg( p_demux, "spawned timeout thread" );
             vlc_object_attach( p_sys->p_timeout, p_demux );
@@ -1007,7 +1051,7 @@ static int Play( demux_t *p_demux )
     }
 #endif
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
     /* Retrieve the starttime if possible */
     p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -1021,7 +1065,7 @@ static int Play( demux_t *p_demux )
     else
         p_sys->i_npt = p_sys->i_npt_start;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
     /* Retrieve the duration if possible */
     p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -1226,7 +1270,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                     msg_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq );
                 }
 #endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
                 /* Retrieve the starttime if possible */
                 p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -1240,7 +1284,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 else
                     p_sys->i_npt = p_sys->i_npt_start;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
                 /* Retrieve the duration if possible */
                 p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -1256,6 +1300,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         }
         /* Special for access_demux */
         case DEMUX_CAN_PAUSE:
+        case DEMUX_CAN_SEEK:
             pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
             if( p_sys->rtsp && p_sys->i_npt_length )
                 /* Not always true, but will be handled in SET_PAUSE_STATE */
@@ -1329,7 +1374,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             double d_npt = (double) p_sys->i_npt / I64C(1000000);
             int i;
 
-            b_bool = (vlc_bool_t)va_arg( args, vlc_bool_t );
+            b_bool = (bool)va_arg( args, int );
             if( p_sys->rtsp == NULL )
                 return VLC_EGENERIC;
 
@@ -1366,7 +1411,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 msg_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq );
             }
 #endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
             /* Retrieve the starttime if possible */
             p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -1380,7 +1425,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             else
                 p_sys->i_npt = p_sys->i_npt_start;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
             /* Retrieve the duration if possible */
             p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -1647,9 +1692,13 @@ static void StreamRead( void *p_private, unsigned int i_size,
 
     if( (i_pts != tk->i_pts) && (!tk->b_muxed) )
     {
-        p_block->i_dts = ( tk->fmt.i_cat == VIDEO_ES ) ? 0 : i_pts;
         p_block->i_pts = i_pts;
     }
+    if( !tk->b_muxed )
+    {
+        /*FIXME: for h264 you should check that packetization-mode=1 in sdp-file */
+        p_block->i_dts = ( tk->fmt.i_codec == VLC_FOURCC( 'm', 'p', 'g', 'v' ) ) ? 0 : i_pts;
+    }
 
     if( tk->b_muxed )
     {
@@ -1833,7 +1882,7 @@ static unsigned char* parseH264ConfigStr( char const* configStr,
         psz += strlen(psz)+1;
     }
 
-    if( dup ) free( dup );
+    free( dup );
     return cfg;
 }
 
Unnamed repository; edit this file 'description' to name the repository.