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 * );
}
/* 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' ) )
{
/* */
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:
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;
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++ )
{
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;
{
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 );
}
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" );
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:
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;
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;