Remove legacy casts

[vlc] / modules / access / mms / mmsh.c

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index d353f0cb4505d2844fc0fa5898474e74461096a4..e191b2a48f3b527096fddab344618ce59d4d011f 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -62,7 +62,7 @@ static int  Start( access_t *, uint64_t );
 static void Stop( access_t * );
 
 static int  GetPacket( access_t *, chunk_t * );
-static void GetHeader( access_t *p_access );
+static void GetHeader( access_t *p_access, int i_content_length );
 
 static int Restart( access_t * );
 static int Reset( access_t * );
@@ -137,7 +137,7 @@ int MMSHOpen( access_t *p_access )
     }
 
     /* open a tcp connection */
-    vlc_UrlParse( &p_sys->url, p_access->psz_path, 0 );
+    vlc_UrlParse( &p_sys->url, p_access->psz_location, 0 );
     if( ( p_sys->url.psz_host == NULL ) ||
         ( *p_sys->url.psz_host == '\0' ) )
     {
@@ -250,7 +250,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
         /* */
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
-            *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
+            *pi_64 = var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
             break;
 
         case ACCESS_GET_PRIVATE_ID_STATE:
@@ -451,7 +451,7 @@ static int Reset( access_t *p_access )
     p_sys->p_packet = NULL;
 
     /* Get the next header FIXME memory loss ? */
-    GetHeader( p_access );
+    GetHeader( p_access, -1 );
     if( p_sys->i_header <= 0 )
         return VLC_EGENERIC;
 
@@ -462,10 +462,10 @@ static int Reset( access_t *p_access )
              p_sys->asfh.i_min_data_packet_size );
 
     asf_StreamSelect( &p_sys->asfh,
-                       var_CreateGetInteger( p_access, "mms-maxbitrate" ),
-                       var_CreateGetBool( p_access, "mms-all" ),
-                       var_CreateGetInteger( p_access, "audio" ),
-                       var_CreateGetInteger( p_access, "video" ) );
+                       var_InheritInteger( p_access, "mms-maxbitrate" ),
+                       var_InheritBool( p_access, "mms-all" ),
+                       var_InheritBool( p_access, "audio" ),
+                       var_InheritBool( p_access, "video" ) );
 
     /* Check we have comptible asfh */
     for( i = 1; i < 128; i++ )
@@ -503,7 +503,7 @@ static int OpenConnection( access_t *p_access )
 
     if( p_sys->b_proxy )
     {
-        net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+        net_Printf( p_access, p_sys->fd, NULL,
                     "GET http://%s:%d%s HTTP/1.0\r\n",
                     p_sys->url.psz_host, p_sys->url.i_port,
                     ( (p_sys->url.psz_path == NULL) ||
@@ -523,14 +523,14 @@ static int OpenConnection( access_t *p_access )
             b64 = vlc_b64_encode( buf );
             free( buf );
 
-            net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+            net_Printf( p_access, p_sys->fd, NULL,
                         "Proxy-Authorization: Basic %s\r\n", b64 );
             free( b64 );
         }
     }
     else
     {
-        net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+        net_Printf( p_access, p_sys->fd, NULL,
                     "GET %s HTTP/1.0\r\n"
                     "Host: %s:%d\r\n",
                     ( (p_sys->url.psz_path == NULL) ||
@@ -548,6 +548,8 @@ static int Describe( access_t  *p_access, char **ppsz_location )
 {
     access_sys_t *p_sys = p_access->p_sys;
     char         *psz_location = NULL;
+    int          i_content_length = -1;
+    bool         b_keepalive = false;
     char         *psz;
     int          i_code;
 
@@ -564,7 +566,7 @@ static int Describe( access_t  *p_access, char **ppsz_location )
     if( OpenConnection( p_access ) )
         return VLC_EGENERIC;
 
-    net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+    net_Printf( p_access, p_sys->fd, NULL,
                 "Accept: */*\r\n"
                 "User-Agent: "MMSH_USER_AGENT"\r\n"
                 "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=0:0,request-context=%d,max-duration=0\r\n"
@@ -573,7 +575,7 @@ static int Describe( access_t  *p_access, char **ppsz_location )
                 p_sys->i_request_context++,
                 GUID_PRINT( p_sys->guid ) );
 
-    if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, "\r\n" ) < 0 )
+    if( net_Printf( p_access, p_sys->fd, NULL, "\r\n" ) < 0 )
     {
         msg_Err( p_access, "failed to send request" );
         goto error;
@@ -656,6 +658,20 @@ static int Describe( access_t  *p_access, char **ppsz_location )
         {
             psz_location = strdup( p );
         }
+        else if( !strcasecmp( psz, "Content-Length" ) )
+        {
+            i_content_length = atoi( p );
+            msg_Dbg( p_access, "content-length = %d", i_content_length );
+        }
+        else if( !strcasecmp( psz, "Connection" ) )
+        {
+            if( strcasestr( p, "Keep-Alive" ) )
+            {
+                msg_Dbg( p_access, "Keep-Alive header found" );
+                b_keepalive = true;
+            }
+        }
+
 
         free( psz );
     }
@@ -674,7 +690,7 @@ static int Describe( access_t  *p_access, char **ppsz_location )
     free( psz_location );
 
     /* Read the asf header */
-    GetHeader( p_access );
+    GetHeader( p_access, b_keepalive ? i_content_length : -1);
     if( p_sys->i_header <= 0 )
     {
         msg_Err( p_access, "header size == 0" );
@@ -699,10 +715,10 @@ static int Describe( access_t  *p_access, char **ppsz_location )
         goto error;
 
     asf_StreamSelect( &p_sys->asfh,
-                       var_CreateGetInteger( p_access, "mms-maxbitrate" ),
-                       var_CreateGetBool( p_access, "mms-all" ),
-                       var_CreateGetInteger( p_access, "audio" ),
-                       var_CreateGetInteger( p_access, "video" ) );
+                       var_InheritInteger( p_access, "mms-maxbitrate" ),
+                       var_InheritBool( p_access, "mms-all" ),
+                       var_InheritBool( p_access, "audio" ),
+                       var_InheritBool( p_access, "video" ) );
     return VLC_SUCCESS;
 
 error:
@@ -714,9 +730,10 @@ error:
     return VLC_EGENERIC;
 }
 
-static void GetHeader( access_t *p_access )
+static void GetHeader( access_t *p_access, int i_content_length )
 {
     access_sys_t *p_sys = p_access->p_sys;
+    int i_read_content = 0;
 
     /* Read the asf header */
     p_sys->i_header = 0;
@@ -725,9 +742,11 @@ static void GetHeader( access_t *p_access )
     for( ;; )
     {
         chunk_t ck;
-        if( GetPacket( p_access, &ck ) || ck.i_type != 0x4824 )
+        if( (i_content_length >= 0 && i_read_content >= i_content_length) || GetPacket( p_access, &ck ) || ck.i_type != 0x4824 )
             break;
 
+        i_read_content += (4+ck.i_size);
+
         if( ck.i_data > 0 )
         {
             p_sys->i_header += ck.i_data;
@@ -770,24 +789,24 @@ static int Start( access_t *p_access, uint64_t i_pos )
     if( OpenConnection( p_access ) )
         return VLC_EGENERIC;
 
-    net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+    net_Printf( p_access, p_sys->fd, NULL,
                 "Accept: */*\r\n"
                 "User-Agent: "MMSH_USER_AGENT"\r\n" );
     if( p_sys->b_broadcast )
     {
-        net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+        net_Printf( p_access, p_sys->fd, NULL,
                     "Pragma: no-cache,rate=1.000000,request-context=%d\r\n",
                     p_sys->i_request_context++ );
     }
     else
     {
-        net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+        net_Printf( p_access, p_sys->fd, NULL,
                     "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=%u:%u,request-context=%d,max-duration=0\r\n",
                     (uint32_t)((i_pos >> 32)&0xffffffff),
                     (uint32_t)(i_pos&0xffffffff),
                     p_sys->i_request_context++ );
     }
-    net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+    net_Printf( p_access, p_sys->fd, NULL,
                 "Pragma: xPlayStrm=1\r\n"
                 "Pragma: xClientGUID={"GUID_FMT"}\r\n"
                 "Pragma: stream-switch-count=%d\r\n"
@@ -804,15 +823,15 @@ static int Start( access_t *p_access, uint64_t i_pos )
             {
                 i_select = 0;
             }
-            net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+            net_Printf( p_access, p_sys->fd, NULL,
                         "ffff:%d:%d ", i, i_select );
         }
     }
-    net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, "\r\n" );
-    net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
+    net_Printf( p_access, p_sys->fd, NULL, "\r\n" );
+    net_Printf( p_access, p_sys->fd, NULL,
                 "Connection: Close\r\n" );
 
-    if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL, "\r\n" ) < 0 )
+    if( net_Printf( p_access, p_sys->fd, NULL, "\r\n" ) < 0 )
     {
         msg_Err( p_access, "failed to send request" );
         return VLC_EGENERIC;