#include <vlc_common.h>
#include <vlc_access.h>
-#include "vlc_strings.h"
-#include "vlc_input.h"
+#include <vlc_strings.h>
+#include <vlc_input.h>
#include <vlc_network.h>
-#include "vlc_url.h"
+#include <vlc_url.h>
#include "asf.h"
#include "buffer.h"
int MMSHOpen ( access_t * );
void MMSHClose ( access_t * );
-static ssize_t Read( access_t *, uint8_t *, size_t );
+static block_t *Block( access_t *p_access );
static ssize_t ReadRedirect( access_t *, uint8_t *, size_t );
-static int Seek( access_t *, int64_t );
+static int Seek( access_t *, uint64_t );
static int Control( access_t *, int, va_list );
static int Describe( access_t *, char **ppsz_location );
-static int Start( access_t *, int64_t );
+static int Start( access_t *, uint64_t );
static void Stop( access_t * );
static int GetPacket( access_t *, chunk_t * );
char *psz_location = NULL;
char *psz_proxy;
- /* init p_sys */
+ STANDARD_BLOCK_ACCESS_INIT
- /* Set up p_access */
- p_access->pf_read = Read;
- p_access->pf_block = NULL;
- p_access->pf_control = Control;
- p_access->pf_seek = Seek;
- p_access->info.i_update = 0;
- p_access->info.i_size = 0;
- p_access->info.i_pos = 0;
- p_access->info.b_eof = false;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
-
- p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
- if( !p_sys )
- return VLC_ENOMEM;
-
- memset( p_sys, 0, sizeof( access_sys_t ) );
p_sys->i_proto= MMS_PROTO_HTTP;
p_sys->fd = -1;
- p_sys->i_start= 0;
/* Handle proxy */
p_sys->b_proxy = false;
/* Check proxy */
/* TODO reuse instead http-proxy from http access ? */
- psz_proxy = var_CreateGetString( p_access, "mmsh-proxy" );
- if( !*psz_proxy )
+ psz_proxy = var_CreateGetNonEmptyString( p_access, "mmsh-proxy" );
+ if( !psz_proxy )
{
- char *psz_http_proxy = config_GetPsz( p_access, "http-proxy" );
- if( psz_http_proxy && *psz_http_proxy )
+ char *psz_http_proxy = var_InheritString( p_access, "http-proxy" );
+ if( psz_http_proxy )
{
- free( psz_proxy );
psz_proxy = psz_http_proxy;
var_SetString( p_access, "mmsh-proxy", psz_proxy );
}
- else
- {
- free( psz_http_proxy );
- }
}
- if( *psz_proxy )
+ if( psz_proxy )
{
p_sys->b_proxy = true;
vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
+ free( psz_proxy );
}
#ifdef HAVE_GETENV
else
{
- char *psz_proxy = getenv( "http_proxy" );
- if( psz_proxy && *psz_proxy )
+ const char *http_proxy = getenv( "http_proxy" );
+ if( http_proxy )
{
p_sys->b_proxy = true;
- vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
+ vlc_UrlParse( &p_sys->proxy, http_proxy, 0 );
}
}
#endif
- free( psz_proxy );
if( p_sys->b_proxy )
{
( *p_sys->url.psz_host == '\0' ) )
{
msg_Err( p_access, "invalid host" );
- vlc_UrlClean( &p_sys->proxy );
- vlc_UrlClean( &p_sys->url );
- free( p_sys );
- return VLC_EGENERIC;
+ goto error;
}
if( p_sys->url.i_port <= 0 )
p_sys->url.i_port = 80;
if( Describe( p_access, &psz_location ) )
- {
- vlc_UrlClean( &p_sys->proxy );
- vlc_UrlClean( &p_sys->url );
- free( p_sys );
- return VLC_EGENERIC;
- }
+ goto error;
+
/* Handle redirection */
if( psz_location && *psz_location )
{
msg_Dbg( p_access, "redirection to %s", psz_location );
- input_thread_t * p_input = vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT );
+ input_thread_t * p_input = access_GetParentInput( p_access );
input_item_t * p_new_loc;
+
+ if( !p_input )
+ {
+ free( psz_location );
+ goto error;
+ }
/** \bug we do not autodelete here */
- p_new_loc = input_ItemNew( p_access, psz_location, psz_location );
- input_ItemAddSubItem( input_GetItem( p_input ), p_new_loc );
+ p_new_loc = input_item_New( p_access, psz_location, psz_location );
+ input_item_t *p_item = input_GetItem( p_input );
+ input_item_PostSubItem( p_item, p_new_loc );
+
+ vlc_gc_decref( p_new_loc );
vlc_object_release( p_input );
free( psz_location );
+ p_access->pf_block = NULL;
p_access->pf_read = ReadRedirect;
return VLC_SUCCESS;
}
+ free( psz_location );
/* Start playing */
if( Start( p_access, 0 ) )
{
msg_Err( p_access, "cannot start stream" );
free( p_sys->p_header );
- vlc_UrlClean( &p_sys->proxy );
- vlc_UrlClean( &p_sys->url );
- free( p_sys );
- return VLC_EGENERIC;
+ goto error;
}
if( !p_sys->b_broadcast )
}
return VLC_SUCCESS;
+
+error:
+ vlc_UrlClean( &p_sys->proxy );
+ vlc_UrlClean( &p_sys->url );
+ free( p_sys );
+ return VLC_EGENERIC;
}
/*****************************************************************************
Stop( p_access );
- free( p_sys->p_header );
+ free( p_sys->p_header );
vlc_UrlClean( &p_sys->proxy );
vlc_UrlClean( &p_sys->url );
access_sys_t *p_sys = p_access->p_sys;
bool *pb_bool;
bool b_bool;
- int *pi_int;
int64_t *pi_64;
int i_int;
break;
/* */
- case ACCESS_GET_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = 3 * p_sys->asfh.i_min_data_packet_size;
- break;
-
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);
/*****************************************************************************
* Seek: try to go at the right place
*****************************************************************************/
-static int Seek( access_t *p_access, int64_t i_pos )
+static int Seek( access_t *p_access, uint64_t i_pos )
{
access_sys_t *p_sys = p_access->p_sys;
chunk_t ck;
- off_t i_offset;
- off_t i_packet;
+ uint64_t i_offset;
+ uint64_t i_packet;
msg_Dbg( p_access, "seeking to %"PRId64, i_pos );
}
/*****************************************************************************
- * Read:
+ * ReadRedirect:
*****************************************************************************/
static ssize_t ReadRedirect( access_t *p_access, uint8_t *p, size_t i_len )
{
+ VLC_UNUSED(p_access); VLC_UNUSED(p); VLC_UNUSED(i_len);
return 0;
}
/*****************************************************************************
- * Read:
+ * Block:
*****************************************************************************/
-static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
+static block_t *Block( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
- size_t i_copy;
- size_t i_data = 0;
+ const unsigned i_packet_min = p_sys->asfh.i_min_data_packet_size;
- if( p_access->info.b_eof )
- return 0;
+ if( p_access->info.i_pos < p_sys->i_start + p_sys->i_header )
+ {
+ const size_t i_offset = p_access->info.i_pos - p_sys->i_start;
+ const size_t i_copy = p_sys->i_header - i_offset;
- while( i_data < (size_t) i_len )
+ block_t *p_block = block_New( p_access, i_copy );
+ if( !p_block )
+ return NULL;
+
+ memcpy( p_block->p_buffer, &p_sys->p_header[i_offset], i_copy );
+ p_access->info.i_pos += i_copy;
+ return p_block;
+ }
+ else if( p_sys->i_packet_length > 0 &&
+ p_sys->i_packet_used < __MAX( p_sys->i_packet_length, i_packet_min ) )
{
- if( p_access->info.i_pos < (p_sys->i_start + p_sys->i_header) )
- {
- int i_offset = p_access->info.i_pos - p_sys->i_start;
- i_copy = __MIN( p_sys->i_header - i_offset,
- (int)((size_t)i_len - i_data) );
- memcpy( &p_buffer[i_data], &p_sys->p_header[i_offset], i_copy );
+ size_t i_copy = 0;
+ size_t i_padding = 0;
- i_data += i_copy;
- p_access->info.i_pos += i_copy;
- }
- else if( p_sys->i_packet_used < p_sys->i_packet_length )
+ if( p_sys->i_packet_used < p_sys->i_packet_length )
+ i_copy = p_sys->i_packet_length - p_sys->i_packet_used;
+ if( __MAX( p_sys->i_packet_used, p_sys->i_packet_length ) < i_packet_min )
+ i_padding = i_packet_min - __MAX( p_sys->i_packet_used, p_sys->i_packet_length );
+
+ block_t *p_block = block_New( p_access, i_copy + i_padding );
+ if( !p_block )
+ return NULL;
+
+ if( i_copy > 0 )
+ memcpy( &p_block->p_buffer[0], &p_sys->p_packet[p_sys->i_packet_used], i_copy );
+ if( i_padding > 0 )
+ memset( &p_block->p_buffer[i_copy], 0, i_padding );
+
+ p_sys->i_packet_used += i_copy + i_padding;
+ p_access->info.i_pos += i_copy + i_padding;
+ return p_block;
+
+ }
+
+ chunk_t ck;
+ if( GetPacket( p_access, &ck ) )
+ {
+ int i_ret = -1;
+ if( p_sys->b_broadcast )
{
- i_copy = __MIN( p_sys->i_packet_length - p_sys->i_packet_used,
- i_len - i_data );
- memcpy( &p_buffer[i_data],
- &p_sys->p_packet[p_sys->i_packet_used],
- i_copy );
-
- i_data += i_copy;
- p_sys->i_packet_used += i_copy;
- p_access->info.i_pos += i_copy;
+ if( (ck.i_type == 0x4524) && (ck.i_sequence != 0) )
+ i_ret = Restart( p_access );
+ else if( ck.i_type == 0x4324 )
+ i_ret = Reset( p_access );
}
- else if( (p_sys->i_packet_length > 0) &&
- ((int)p_sys->i_packet_used < p_sys->asfh.i_min_data_packet_size) )
+ if( i_ret )
{
- i_copy = __MIN( p_sys->asfh.i_min_data_packet_size - p_sys->i_packet_used,
- i_len - i_data );
- memset( &p_buffer[i_data], 0, i_copy );
-
- i_data += i_copy;
- p_sys->i_packet_used += i_copy;
- p_access->info.i_pos += i_copy;
- }
- else
- {
- chunk_t ck;
- if( GetPacket( p_access, &ck ) )
- {
- int i_ret = -1;
- if( p_sys->b_broadcast )
- {
- if( (ck.i_type == 0x4524) && (ck.i_sequence != 0) )
- i_ret = Restart( p_access );
- else if( ck.i_type == 0x4324 )
- i_ret = Reset( p_access );
- }
- if( i_ret )
- {
- p_access->info.b_eof = true;
- return 0;
- }
- }
- if( ck.i_type != 0x4424 )
- {
- p_sys->i_packet_used = 0;
- p_sys->i_packet_length = 0;
- }
+ p_access->info.b_eof = true;
+ return 0;
}
}
+ if( ck.i_type != 0x4424 )
+ {
+ p_sys->i_packet_used = 0;
+ p_sys->i_packet_length = 0;
+ }
- return( i_data );
+ return NULL;
}
/* */
msg_Err( p_access, "describe failed" );
return VLC_EGENERIC;
}
+ free( psz_location );
+
/* */
if( Start( p_access, 0 ) )
{
if( p_sys->i_header <= 0 )
return VLC_EGENERIC;
- asf_HeaderParse ( &p_sys->asfh,
- p_sys->p_header, p_sys->i_header );
+ asf_HeaderParse ( &p_sys->asfh,
+ p_sys->p_header, p_sys->i_header );
msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d",
p_sys->asfh.i_data_packets_count,
p_sys->asfh.i_min_data_packet_size );
- asf_StreamSelect( &p_sys->asfh,
- var_CreateGetInteger( p_access, "mms-maxbitrate" ),
- var_CreateGetInteger( p_access, "mms-all" ),
- var_CreateGetInteger( p_access, "audio" ),
- var_CreateGetInteger( p_access, "video" ) );
+ 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" ) );
/* Check we have comptible asfh */
for( i = 1; i < 128; i++ )
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) ||
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) ||
p_sys->i_packet_used = 0;
p_sys->i_packet_length = 0;
p_sys->p_packet = NULL;
- GenerateGuid ( &p_sys->guid );
+
+ GenerateGuid ( &p_sys->guid );
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"
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;
}
/* Receive the http header */
- if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ) ) == NULL )
+ if( ( psz = net_Gets( p_access, p_sys->fd, NULL ) ) == NULL )
{
msg_Err( p_access, "failed to read answer" );
goto error;
*ppsz_location = psz_location;
return VLC_SUCCESS;
}
+ free( psz_location );
/* Read the asf header */
GetHeader( p_access );
*
* TODO : stream bitrates properties(optional)
* and bitrate mutual exclusion(optional) */
- asf_HeaderParse ( &p_sys->asfh,
- p_sys->p_header, p_sys->i_header );
+ asf_HeaderParse ( &p_sys->asfh,
+ p_sys->p_header, p_sys->i_header );
msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d",
p_sys->asfh.i_data_packets_count,
p_sys->asfh.i_min_data_packet_size );
- asf_StreamSelect( &p_sys->asfh,
- var_CreateGetInteger( p_access, "mms-maxbitrate" ),
- var_CreateGetInteger( p_access, "mms-all" ),
- var_CreateGetInteger( p_access, "audio" ),
- var_CreateGetInteger( p_access, "video" ) );
+ if( p_sys->asfh.i_min_data_packet_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" ) );
return VLC_SUCCESS;
error:
if( ck.i_data > 0 )
{
p_sys->i_header += ck.i_data;
- p_sys->p_header = realloc( p_sys->p_header, p_sys->i_header );
+ p_sys->p_header = xrealloc( p_sys->p_header, p_sys->i_header );
memcpy( &p_sys->p_header[p_sys->i_header - ck.i_data],
ck.p_data, ck.i_data );
}
/*****************************************************************************
* Start stream
****************************************************************************/
-static int Start( access_t *p_access, int64_t i_pos )
+static int Start( access_t *p_access, uint64_t i_pos )
{
access_sys_t *p_sys = p_access->p_sys;
int i_streams = 0;
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"
{
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;
}
- psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL );
+ psz = net_Gets( p_access, p_sys->fd, NULL );
if( psz == NULL )
{
msg_Err( p_access, "cannot read data 0" );
projects / vlc / blobdiff