/*****************************************************************************
* Preamble
*****************************************************************************/
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_access.h>
-#include "vlc_playlist.h"
#include "vlc_strings.h"
+#include "vlc_input.h"
#include <vlc_network.h>
#include "vlc_url.h"
#include "mmsh.h"
/* TODO:
- * - http_proxy
* - authentication
*/
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-int E_(MMSHOpen) ( access_t * );
-void E_(MMSHClose) ( access_t * );
+int MMSHOpen ( access_t * );
+void MMSHClose ( access_t * );
-static int Read( access_t *, uint8_t *, int );
-static int ReadRedirect( access_t *, uint8_t *, int );
+static ssize_t Read( access_t *, uint8_t *, size_t );
+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 );
/****************************************************************************
* Open: connect to ftp server and ask for file
****************************************************************************/
-int E_(MMSHOpen)( access_t *p_access )
+int MMSHOpen( access_t *p_access )
{
access_sys_t *p_sys;
char *psz_location = NULL;
p_access->info.i_update = 0;
p_access->info.i_size = 0;
p_access->info.i_pos = 0;
- p_access->info.b_eof = VLC_FALSE;
+ 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 = VLC_FALSE;
+ p_sys->b_proxy = false;
memset( &p_sys->proxy, 0, sizeof(p_sys->proxy) );
/* Check proxy */
/* TODO reuse instead http-proxy from http access ? */
psz_proxy = var_CreateGetString( p_access, "mmsh-proxy" );
+ if( !*psz_proxy )
+ {
+ char *psz_http_proxy = config_GetPsz( p_access, "http-proxy" );
+ if( psz_http_proxy && *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 )
{
- p_sys->b_proxy = VLC_TRUE;
+ p_sys->b_proxy = true;
vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
}
#ifdef HAVE_GETENV
char *psz_proxy = getenv( "http_proxy" );
if( psz_proxy && *psz_proxy )
{
- p_sys->b_proxy = VLC_TRUE;
+ p_sys->b_proxy = true;
vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 );
}
}
if( p_sys->b_proxy )
{
- if( p_sys->proxy.psz_host == NULL || *p_sys->proxy.psz_host == '\0' )
+ if( ( p_sys->proxy.psz_host == NULL ) ||
+ ( *p_sys->proxy.psz_host == '\0' ) )
{
msg_Warn( p_access, "invalid proxy host" );
vlc_UrlClean( &p_sys->proxy );
free( p_sys );
return VLC_EGENERIC;
}
+
if( p_sys->proxy.i_port <= 0 )
p_sys->proxy.i_port = 80;
msg_Dbg( p_access, "Using http proxy %s:%d",
/* open a tcp connection */
vlc_UrlParse( &p_sys->url, p_access->psz_path, 0 );
- if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' )
+ if( ( p_sys->url.psz_host == NULL ) ||
+ ( *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;
if( Describe( p_access, &psz_location ) )
{
+ vlc_UrlClean( &p_sys->proxy );
vlc_UrlClean( &p_sys->url );
free( p_sys );
return VLC_EGENERIC;
/* Handle redirection */
if( psz_location && *psz_location )
{
- playlist_t * p_playlist = pl_Yield( p_access );
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_item_t * p_new_loc;
/** \bug we do not autodelete here */
- playlist_Add( p_playlist, psz_location, psz_location,
- PLAYLIST_INSERT | PLAYLIST_GO, PLAYLIST_END, VLC_TRUE,
- VLC_FALSE );
- vlc_object_release( p_playlist );
+ p_new_loc = input_ItemNew( p_access, psz_location, psz_location );
+ input_ItemAddSubItem( input_GetItem( p_input ), p_new_loc );
+ vlc_object_release( p_input );
free( psz_location );
{
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;
/*****************************************************************************
* Close: free unused data structures
*****************************************************************************/
-void E_( MMSHClose )( access_t *p_access )
+void MMSHClose ( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
Stop( p_access );
+
+ free( p_sys->p_header );
+
+ vlc_UrlClean( &p_sys->proxy );
+ vlc_UrlClean( &p_sys->url );
free( p_sys );
}
static int Control( access_t *p_access, int i_query, va_list args )
{
access_sys_t *p_sys = p_access->p_sys;
- vlc_bool_t *pb_bool;
+ bool *pb_bool;
+ bool b_bool;
int *pi_int;
int64_t *pi_64;
int i_int;
{
/* */
case ACCESS_CAN_SEEK:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+ pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = !p_sys->b_broadcast;
break;
case ACCESS_CAN_FASTSEEK:
- case ACCESS_CAN_PAUSE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_FALSE;
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = false;
break;
+ case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
-
-#if 0 /* Disable for now until we have a clock synchro algo
- * which works with something else than MPEG over UDP */
- *pb_bool = VLC_FALSE;
-#endif
- *pb_bool = VLC_TRUE;
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
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" ) * I64C(1000);
+ *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
break;
case ACCESS_GET_PRIVATE_ID_STATE:
i_int = (int)va_arg( args, int );
- pb_bool = (vlc_bool_t *)va_arg( args, vlc_bool_t * );
+ pb_bool = (bool *)va_arg( args, bool * );
- if( i_int < 0 || i_int > 127 )
+ if( (i_int < 0) || (i_int > 127) )
return VLC_EGENERIC;
- *pb_bool = p_sys->asfh.stream[i_int].i_selected ? VLC_TRUE : VLC_FALSE;
+ *pb_bool = p_sys->asfh.stream[i_int].i_selected ? true : false;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
+ b_bool = (bool)va_arg( args, int );
+ if( b_bool )
+ Stop( p_access );
+ else
+ Seek( p_access, p_access->info.i_pos );
+ break;
+
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
+ case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
off_t i_offset;
off_t i_packet;
- msg_Dbg( p_access, "seeking to "I64Fd, i_pos );
+ msg_Dbg( p_access, "seeking to %"PRId64, i_pos );
i_packet = ( i_pos - p_sys->i_header ) / p_sys->asfh.i_min_data_packet_size;
i_offset = ( i_pos - p_sys->i_header ) % p_sys->asfh.i_min_data_packet_size;
Stop( p_access );
Start( p_access, i_packet * p_sys->asfh.i_min_data_packet_size );
- while( !p_access->b_die )
+ while( vlc_object_alive (p_access) )
{
if( GetPacket( p_access, &ck ) )
break;
}
p_access->info.i_pos = i_pos;
- p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_eof = false;
p_sys->i_packet_used += i_offset;
return VLC_SUCCESS;
/*****************************************************************************
* Read:
*****************************************************************************/
-static int ReadRedirect( access_t *p_access, uint8_t *p, int i_len )
+static ssize_t ReadRedirect( access_t *p_access, uint8_t *p, size_t i_len )
{
return 0;
}
/*****************************************************************************
* Read:
*****************************************************************************/
-static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
+static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
{
access_sys_t *p_sys = p_access->p_sys;
size_t i_copy;
while( i_data < (size_t) i_len )
{
- if( p_access->info.i_pos < p_sys->i_start + p_sys->i_header )
+ 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) );
+ 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 );
i_data += i_copy;
{
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_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;
int i_ret = -1;
if( p_sys->b_broadcast )
{
- if( ck.i_type == 0x4524 && ck.i_sequence != 0 )
+ 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 = VLC_TRUE;
+ p_access->info.b_eof = true;
return 0;
}
}
if( Describe( p_access, &psz_location ) )
{
msg_Err( p_access, "describe failed" );
- return -1;
+ return VLC_EGENERIC;
}
/* */
if( Start( p_access, 0 ) )
{
msg_Err( p_access, "Start failed" );
- return -1;
+ return VLC_EGENERIC;
}
- return 0;
+ return VLC_SUCCESS;
}
static int Reset( access_t *p_access )
{
/* Get the next header FIXME memory loss ? */
GetHeader( p_access );
if( p_sys->i_header <= 0 )
- return -1;
+ return VLC_EGENERIC;
- E_( asf_HeaderParse )( &p_sys->asfh,
+ asf_HeaderParse ( &p_sys->asfh,
p_sys->p_header, p_sys->i_header );
- msg_Dbg( p_access, "packet count="I64Fd" packet size=%d",
+ 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 );
- E_( asf_StreamSelect)( &p_sys->asfh,
+ asf_StreamSelect( &p_sys->asfh,
var_CreateGetInteger( p_access, "mms-maxbitrate" ),
var_CreateGetInteger( p_access, "mms-all" ),
var_CreateGetInteger( p_access, "audio" ),
/* */
p_sys->i_packet_used = 0;
p_sys->i_packet_length = 0;
- return 0;
+ return VLC_SUCCESS;
}
static int OpenConnection( access_t *p_access )
net_Printf( VLC_OBJECT(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 || *p_sys->url.psz_path == '\0' ) ? "/" : p_sys->url.psz_path );
+ ( (p_sys->url.psz_path == NULL) ||
+ (*p_sys->url.psz_path == '\0') ) ?
+ "/" : p_sys->url.psz_path );
/* Proxy Authentication */
if( p_sys->proxy.psz_username && *p_sys->proxy.psz_username )
net_Printf( VLC_OBJECT(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->url.psz_path == '\0' ) ? "/" : p_sys->url.psz_path,
+ ( (p_sys->url.psz_path == NULL) ||
+ (*p_sys->url.psz_path == '\0') ) ?
+ "/" : p_sys->url.psz_path,
p_sys->url.psz_host, p_sys->url.i_port );
}
return VLC_SUCCESS;
int i_code;
/* Reinit context */
- p_sys->b_broadcast = VLC_TRUE;
+ p_sys->b_broadcast = true;
p_sys->i_request_context = 1;
p_sys->i_packet_sequence = 0;
p_sys->i_packet_used = 0;
p_sys->i_packet_length = 0;
p_sys->p_packet = NULL;
- E_( GenerateGuid )( &p_sys->guid );
+ GenerateGuid ( &p_sys->guid );
- OpenConnection( p_access );
+ if( OpenConnection( p_access ) )
+ return VLC_EGENERIC;
net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
"Accept: */*\r\n"
msg_Err( p_access, "failed to read answer" );
goto error;
}
+
if( strncmp( psz, "HTTP/1.", 7 ) )
{
msg_Err( p_access, "invalid HTTP reply '%s'", psz );
if( strstr( p, "broadcast" ) )
{
msg_Dbg( p_access, "stream type = broadcast" );
- p_sys->b_broadcast = VLC_TRUE;
+ p_sys->b_broadcast = true;
}
else if( strstr( p, "seekable" ) )
{
msg_Dbg( p_access, "stream type = seekable" );
- p_sys->b_broadcast = VLC_FALSE;
+ p_sys->b_broadcast = false;
}
else
{
msg_Warn( p_access, "unknow stream types (%s)", p );
- p_sys->b_broadcast = VLC_FALSE;
+ p_sys->b_broadcast = false;
}
}
}
}
/* Handle the redirection */
- if( ( i_code == 301 || i_code == 302 ||
- i_code == 303 || i_code == 307 ) &&
+ if( ( (i_code == 301) || (i_code == 302) ||
+ (i_code == 303) || (i_code == 307) ) &&
psz_location && *psz_location )
{
msg_Dbg( p_access, "redirection to %s", psz_location );
goto error;
}
/* close this connection */
- net_Close( p_sys->fd ); p_sys->fd = -1;
+ net_Close( p_sys->fd );
+ p_sys->fd = -1;
/* *** parse header and get stream and their id *** */
/* get all streams properties,
*
* TODO : stream bitrates properties(optional)
* and bitrate mutual exclusion(optional) */
- E_( asf_HeaderParse )( &p_sys->asfh,
+ asf_HeaderParse ( &p_sys->asfh,
p_sys->p_header, p_sys->i_header );
- msg_Dbg( p_access, "packet count="I64Fd" packet size=%d",
+ 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 );
- E_( asf_StreamSelect)( &p_sys->asfh,
+ asf_StreamSelect( &p_sys->asfh,
var_CreateGetInteger( p_access, "mms-maxbitrate" ),
var_CreateGetInteger( p_access, "mms-all" ),
var_CreateGetInteger( p_access, "audio" ),
}
return VLC_EGENERIC;
}
+
static void GetHeader( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
/* Read the asf header */
p_sys->i_header = 0;
+ free( p_sys->p_header );
p_sys->p_header = NULL;
for( ;; )
{
/*****************************************************************************
- *
- *****************************************************************************/
-static int Start( access_t *p_access, off_t i_pos )
+ * Start stream
+ ****************************************************************************/
+static int Start( access_t *p_access, int64_t i_pos )
{
access_sys_t *p_sys = p_access->p_sys;
int i_streams = 0;
int i_streams_selected = 0;
int i;
- char *psz;
+ char *psz = NULL;
msg_Dbg( p_access, "starting stream" );
return VLC_EGENERIC;
}
- OpenConnection( p_access );
+ if( OpenConnection( p_access ) )
+ return VLC_EGENERIC;
net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
"Accept: */*\r\n"
{
i_select = 0;
}
-
net_Printf( VLC_OBJECT(p_access), p_sys->fd, NULL,
"ffff:%d:%d ", i, i_select );
}
return VLC_EGENERIC;
}
- if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL ) ) == NULL )
+ psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, NULL );
+ if( psz == NULL )
{
- msg_Err( p_access, "cannot read data" );
+ msg_Err( p_access, "cannot read data 0" );
return VLC_EGENERIC;
}
+
if( atoi( &psz[9] ) >= 400 )
{
msg_Err( p_access, "error: %s", psz );
char *psz = net_Gets( p_access, p_sys->fd, NULL );
if( psz == NULL )
{
- msg_Err( p_access, "cannot read data" );
+ msg_Err( p_access, "cannot read data 1" );
return VLC_EGENERIC;
}
if( *psz == '\0' )
}
/*****************************************************************************
- *
+ * closing stream
*****************************************************************************/
static void Stop( access_t *p_access )
{
}
/*****************************************************************************
- *
+ * get packet
*****************************************************************************/
static int GetPacket( access_t * p_access, chunk_t *p_ck )
{
* (4 bytes), decode and then read up to 8 additional bytes to get the
* entire header.
*/
- if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer, 4, VLC_TRUE ) < 4 )
+ if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer, 4, true ) < 4 )
+ {
+ msg_Err( p_access, "cannot read data 2" );
return VLC_EGENERIC;
+ }
p_ck->i_type = GetWLE( p_sys->buffer);
p_ck->i_size = GetWLE( p_sys->buffer + 2);
if( restsize > 8 )
restsize = 8;
- if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer + 4, restsize, VLC_TRUE ) < restsize )
+ if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer + 4, restsize, true ) < restsize )
{
- msg_Err( p_access, "cannot read data" );
+ msg_Err( p_access, "cannot read data 3" );
return VLC_EGENERIC;
}
p_ck->i_sequence = GetDWLE( p_sys->buffer + 4);
if( (p_ck->i_data > 0) &&
(net_Read( p_access, p_sys->fd, NULL, &p_sys->buffer[12],
- p_ck->i_data, VLC_TRUE ) < p_ck->i_data) )
+ p_ck->i_data, true ) < p_ck->i_data) )
{
- msg_Err( p_access, "cannot read data" );
+ msg_Err( p_access, "cannot read data 4" );
return VLC_EGENERIC;
}
projects / vlc / blobdiff