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 Control( access_t *, int, va_list );
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;
input_thread_t * p_input = vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT );
input_item_t * p_new_loc;
+
+ if( !p_input )
+ {
+ free( psz_location );
+ return VLC_EGENERIC;
+ }
/** \bug we do not autodelete here */
p_new_loc = input_item_New( p_access, psz_location, psz_location );
input_item_AddSubItem( input_GetItem( p_input ), p_new_loc );
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 ) )
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);
}
/*****************************************************************************
- * 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 )
- {
- 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;
- }
- else if( (p_sys->i_packet_length > 0) &&
- ((int)p_sys->i_packet_used < p_sys->asfh.i_min_data_packet_size) )
- {
- 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 );
+ 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 );
- i_data += i_copy;
- p_sys->i_packet_used += i_copy;
- p_access->info.i_pos += i_copy;
+ 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 )
+ {
+ 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( i_ret )
{
- 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;
}
/* */
p_sys->asfh.i_data_packets_count,
p_sys->asfh.i_min_data_packet_size );
+ if( p_sys->asfh.i_min_data_packet_size <= 0 )
+ goto error;
+
asf_StreamSelect( &p_sys->asfh,
var_CreateGetInteger( p_access, "mms-maxbitrate" ),
var_CreateGetInteger( p_access, "mms-all" ),
projects / vlc / blobdiff