Skip to content

V
vlc-2-2
Commit df3ce87c authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

* mms/* : converted to access2. It should be reworked to use pf_block, but 

that can wait ...
 * access2: little fix + added mms* shortcuts.
parent b2867914
Show whitespace changes
Inline Side-by-side
Showing with 543 additions and 705 deletions
modules/access/access2.c
View file @ df3ce87c
...@@ -59,6 +59,11 @@ vlc_module_begin(); ...@@ -59,6 +59,11 @@ vlc_module_begin();
add_shortcut( "cdda" ); add_shortcut( "cdda" );
add_shortcut( "cddasimple" ); add_shortcut( "cddasimple" );
add_shortcut( "mms" );
add_shortcut( "mmsh" );
add_shortcut( "mmst" );
add_shortcut( "mmsu" );
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
...@@ -191,7 +196,7 @@ static int Access2Open( vlc_object_t * p_this ) ...@@ -191,7 +196,7 @@ static int Access2Open( vlc_object_t * p_this )
access2_Control( p_access, ACCESS_CAN_CONTROL_PACE, &b_bool ); access2_Control( p_access, ACCESS_CAN_CONTROL_PACE, &b_bool );
p_input->stream.b_pace_control = b_bool; p_input->stream.b_pace_control = b_bool;
/* End of init */ /* End of init */
access2_Control( p_access, ACCESS_CAN_SEEK, &b_bool ); access2_Control( p_access, ACCESS_CAN_FASTSEEK, &b_bool );
if( b_bool ) if( b_bool )
p_input->stream.i_method = INPUT_METHOD_FILE; /* FIXME */ p_input->stream.i_method = INPUT_METHOD_FILE; /* FIXME */
else else
......
modules/access/mms/asf.c
View file @ df3ce87c
/***************************************************************************** /*****************************************************************************
* asf.c: MMS access plug-in * asf.c: MMS access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001-2004 VideoLAN
* $Id$ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
...@@ -59,7 +59,7 @@ void E_( GenerateGuid )( guid_t *p_guid ) ...@@ -59,7 +59,7 @@ void E_( GenerateGuid )( guid_t *p_guid )
} }
} }
void E_( asf_HeaderParse ) ( asf_header_t *hdr, void E_( asf_HeaderParse )( asf_header_t *hdr,
uint8_t *p_header, int i_header ) uint8_t *p_header, int i_header )
{ {
var_buffer_t buffer; var_buffer_t buffer;
...@@ -117,7 +117,6 @@ void E_( asf_HeaderParse ) ( asf_header_t *hdr, ...@@ -117,7 +117,6 @@ void E_( asf_HeaderParse ) ( asf_header_t *hdr,
{ {
int i_stream_id; int i_stream_id;
guid_t stream_type; guid_t stream_type;
//msg_Dbg( p_input, "found stream_properties" );
var_buffer_getguid( &buffer, &stream_type ); var_buffer_getguid( &buffer, &stream_type );
var_buffer_getmemory( &buffer, NULL, 32 ); var_buffer_getmemory( &buffer, NULL, 32 );
...@@ -129,18 +128,15 @@ void E_( asf_HeaderParse ) ( asf_header_t *hdr, ...@@ -129,18 +128,15 @@ void E_( asf_HeaderParse ) ( asf_header_t *hdr,
if( CmpGuid( &stream_type, &asf_object_stream_type_video ) ) if( CmpGuid( &stream_type, &asf_object_stream_type_video ) )
{ {
//fprintf( stderr, "\nvideo stream[%d] found\n", i_stream_id ); //fprintf( stderr, "\nvideo stream[%d] found\n", i_stream_id );
//msg_Dbg( p_input, "video stream[%d] found", i_stream_id );
hdr->stream[i_stream_id].i_cat = ASF_STREAM_VIDEO; hdr->stream[i_stream_id].i_cat = ASF_STREAM_VIDEO;
} }
else if( CmpGuid( &stream_type, &asf_object_stream_type_audio ) ) else if( CmpGuid( &stream_type, &asf_object_stream_type_audio ) )
{ {
//fprintf( stderr, "\naudio stream[%d] found\n", i_stream_id ); //fprintf( stderr, "\naudio stream[%d] found\n", i_stream_id );
//msg_Dbg( p_input, "audio stream[%d] found", i_stream_id );
hdr->stream[i_stream_id].i_cat = ASF_STREAM_AUDIO; hdr->stream[i_stream_id].i_cat = ASF_STREAM_AUDIO;
} }
else else
{ {
// msg_Dbg( p_input, "unknown stream[%d] found", i_stream_id );
hdr->stream[i_stream_id].i_cat = ASF_STREAM_UNKNOWN; hdr->stream[i_stream_id].i_cat = ASF_STREAM_UNKNOWN;
} }
} }
...@@ -169,10 +165,8 @@ void E_( asf_HeaderParse ) ( asf_header_t *hdr, ...@@ -169,10 +165,8 @@ void E_( asf_HeaderParse ) ( asf_header_t *hdr,
} }
if( var_buffer_readempty( &buffer ) ) if( var_buffer_readempty( &buffer ) )
{
return; return;
} }
}
} }
void E_( asf_StreamSelect ) ( asf_header_t *hdr, void E_( asf_StreamSelect ) ( asf_header_t *hdr,
...@@ -210,40 +204,6 @@ void E_( asf_StreamSelect ) ( asf_header_t *hdr, ...@@ -210,40 +204,6 @@ void E_( asf_StreamSelect ) ( asf_header_t *hdr,
} }
} }
#if 0
psz_stream = config_GetPsz( p_input, "mms-stream" );
if( psz_stream && *psz_stream )
{
char *psz_tmp = psz_stream;
while( *psz_tmp )
{
if( *psz_tmp == ',' )
{
psz_tmp++;
}
else
{
int i_stream;
i_stream = atoi( psz_tmp );
while( *psz_tmp != '\0' && *psz_tmp != ',' )
{
psz_tmp++;
}
if( i_stream > 0 && i_stream < 128 &&
stream[i_stream].i_cat != MMS_STREAM_UNKNOWN )
{
stream[i_stream].i_selected = 1;
}
}
}
FREE( psz_stream );
return;
}
FREE( psz_stream );
#endif
/* big test: /* big test:
* select a stream if * select a stream if
* - no audio nor video stream * - no audio nor video stream
...@@ -319,19 +279,5 @@ void E_( asf_StreamSelect ) ( asf_header_t *hdr, ...@@ -319,19 +279,5 @@ void E_( asf_StreamSelect ) ( asf_header_t *hdr,
} }
} }
#if 0
if( i_bitrate_max > 0 )
{
msg_Dbg( p_input,
"requested bitrate:%d real bitrate:%d",
i_bitrate_max, i_bitrate_total );
}
else
{
msg_Dbg( p_input,
"total bitrate:%d",
i_bitrate_total );
}
#endif
} }
modules/access/mms/asf.h
View file @ df3ce87c
/***************************************************************************** /*****************************************************************************
* asf.h: MMS access plug-in * asf.h: MMS access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001-2004 VideoLAN
* $Id$ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#define ASF_STREAM_AUDIO 0x0002 #define ASF_STREAM_AUDIO 0x0002
#define ASF_STREAM_UNKNOWN 0xffff #define ASF_STREAM_UNKNOWN 0xffff
typedef struct asf_stream_s typedef struct
{ {
int i_cat; /* ASF_STREAM_VIDEO, ASF_STREAM_AUDIO */ int i_cat; /* ASF_STREAM_VIDEO, ASF_STREAM_AUDIO */
int i_bitrate; /* -1 if unknown */ int i_bitrate; /* -1 if unknown */
......
modules/access/mms/buffer.c
View file @ df3ce87c
/***************************************************************************** /*****************************************************************************
* buffer.c: MMS access plug-in * buffer.c: MMS access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001-2004 VideoLAN
* $Id: buffer.c,v 1.3 2002/12/06 13:05:22 sam Exp $ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
/***************************************************************************** /*****************************************************************************
* Buffer management functions * Buffer management functions
*****************************************************************************/ *****************************************************************************/
int var_buffer_initwrite( var_buffer_t *p_buf, int i_default_size ) int var_buffer_initwrite( var_buffer_t *p_buf, int i_default_size )
{ {
p_buf->i_size = ( i_default_size > 0 ) ? i_default_size : 2048; p_buf->i_size = ( i_default_size > 0 ) ? i_default_size : 2048;
......
modules/access/mms/buffer.h
View file @ df3ce87c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* buffer.h: MMS access plug-in * buffer.h: MMS access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: buffer.h,v 1.2 2002/11/25 00:22:04 fenrir Exp $ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
typedef struct var_buffer_s typedef struct
{ {
uint8_t *p_data; // pointer on data uint8_t *p_data; // pointer on data
int i_data; // number of bytes set in p_data int i_data; // number of bytes set in p_data
......
modules/access/mms/mms.c
View file @ df3ce87c
...@@ -38,22 +38,11 @@ ...@@ -38,22 +38,11 @@
****************************************************************************/ ****************************************************************************/
/***************************************************************************** /*****************************************************************************
* Local prototypes * Module descriptor
*****************************************************************************/ *****************************************************************************/
struct access_sys_t
{
int i_proto;
};
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * ); static void Close( vlc_object_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define CACHING_TEXT N_("Caching value in ms") #define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \ #define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for MMS streams. This " \ "Allows you to modify the default caching value for MMS streams. This " \
...@@ -67,7 +56,7 @@ static void Close ( vlc_object_t * ); ...@@ -67,7 +56,7 @@ static void Close ( vlc_object_t * );
vlc_module_begin(); vlc_module_begin();
set_description( _("Microsoft Media Server (MMS) input") ); set_description( _("Microsoft Media Server (MMS) input") );
set_capability( "access", 0 ); set_capability( "access2", 0 );
add_integer( "mms-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, add_integer( "mms-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
...@@ -83,41 +72,50 @@ vlc_module_begin(); ...@@ -83,41 +72,50 @@ vlc_module_begin();
set_callbacks( Open, Close ); set_callbacks( Open, Close );
vlc_module_end(); vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
struct access_sys_t
{
int i_proto;
};
/***************************************************************************** /*****************************************************************************
* Open: * Open:
*****************************************************************************/ *****************************************************************************/
static int Open( vlc_object_t *p_this ) static int Open( vlc_object_t *p_this )
{ {
input_thread_t *p_input = (input_thread_t*)p_this; access_t *p_access = (access_t*)p_this;
/* First set ipv4/ipv6 */ /* First set ipv4/ipv6 */
var_Create( p_input, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_access, "ipv4", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_input, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); var_Create( p_access, "ipv6", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
/* mms-caching */ /* mms-caching */
var_Create( p_input, "mms-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); var_Create( p_access, "mms-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
/* use specified method */ /* use specified method */
if( *p_input->psz_access ) if( *p_access->psz_access )
{ {
if( !strncmp( p_input->psz_access, "mmsu", 4 ) ) if( !strncmp( p_access->psz_access, "mmsu", 4 ) )
{ {
return E_( MMSTUOpen )( p_input ); return E_( MMSTUOpen )( p_access );
} }
else if( !strncmp( p_input->psz_access, "mmst", 4 ) ) else if( !strncmp( p_access->psz_access, "mmst", 4 ) )
{ {
return E_( MMSTUOpen )( p_input ); return E_( MMSTUOpen )( p_access );
} }
else if( !strncmp( p_input->psz_access, "mmsh", 4 ) ) else if( !strncmp( p_access->psz_access, "mmsh", 4 ) )
{ {
return E_( MMSHOpen )( p_input ); return E_( MMSHOpen )( p_access );
} }
} }
if( E_( MMSTUOpen )( p_input ) ) if( E_( MMSTUOpen )( p_access ) )
{ {
/* try mmsh if mmstu failed */ /* try mmsh if mmstu failed */
return E_( MMSHOpen )( p_input ); return E_( MMSHOpen )( p_access );
} }
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -127,131 +125,15 @@ static int Open( vlc_object_t *p_this ) ...@@ -127,131 +125,15 @@ static int Open( vlc_object_t *p_this )
*****************************************************************************/ *****************************************************************************/
static void Close( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this )
{ {
input_thread_t * p_input = (input_thread_t *)p_this; access_t *p_access = (access_t*)p_this;
access_sys_t * p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
if( p_sys->i_proto == MMS_PROTO_TCP || p_sys->i_proto == MMS_PROTO_UDP ) if( p_sys->i_proto == MMS_PROTO_TCP || p_sys->i_proto == MMS_PROTO_UDP )
{ {
E_( MMSTUClose )( p_input ); E_( MMSTUClose )( p_access );
} }
else if( p_sys->i_proto == MMS_PROTO_HTTP ) else if( p_sys->i_proto == MMS_PROTO_HTTP )
{ {
E_( MMSHClose )( p_input ); E_( MMSHClose )( p_access );
}
}
/****************************************************************************
* parse hostname:port/path@username:password
* FIXME ipv6 ip will be baddly parsed (contain ':' )
****************************************************************************/
url_t *E_( url_new ) ( char * psz_url )
{
url_t *p_url = malloc( sizeof( url_t ) );
char *psz_dup = strdup( psz_url );
char *psz_parser = psz_dup;
char *psz_tmp;
/* 1: get hostname:port */
while( *psz_parser == '/' )
{
psz_parser++;
}
psz_tmp = psz_parser;
while( *psz_parser &&
*psz_parser != ':' && *psz_parser != '/' && *psz_parser != '@' )
{
psz_parser++;
}
p_url->psz_host = strndup( psz_tmp, psz_parser - psz_tmp );
if( *psz_parser == ':' )
{
psz_parser++;
psz_tmp = psz_parser;
while( *psz_parser && *psz_parser != '/' && *psz_parser != '@' )
{
psz_parser++;
} }
p_url->i_port = atoi( psz_tmp );
}
else
{
p_url->i_port = 0;
}
/* 2: get path */
if( *psz_parser == '/' )
{
//psz_parser++;
psz_tmp = psz_parser;
while( *psz_parser && *psz_parser != '@' )
{
psz_parser++;
}
p_url->psz_path = strndup( psz_tmp, psz_parser - psz_tmp );
}
else
{
p_url->psz_path = strdup( "" );
}
/* 3: usrname and password */
if( *psz_parser == '@' )
{
psz_parser++;
psz_tmp = psz_parser;
while( *psz_parser && *psz_parser != ':' )
{
psz_parser++;
}
p_url->psz_username = strndup( psz_tmp, psz_parser - psz_tmp );
if( *psz_parser == ':' )
{
psz_parser++;
p_url->psz_password = strdup( psz_parser );
}
else
{
p_url->psz_password = strdup( "" );
}
}
else
{
p_url->psz_username = strdup( "" );
p_url->psz_password = strdup( "" );
}
#if 0
fprintf( stderr,
"host=`%s' port=%d path=`%s' username=`%s' password=`%s'\n",
p_url->psz_host,
p_url->i_port,
p_url->psz_path,
p_url->psz_username,
p_url->psz_password );
#endif
free( psz_dup );
return p_url;
}
void E_( url_free ) ( url_t * p_url )
{
free( p_url->psz_host );
free( p_url->psz_path );
free( p_url->psz_username );
free( p_url->psz_password );
free( p_url );
} }
modules/access/mms/mms.h
View file @ df3ce87c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mms.h: MMS access plug-in * mms.h: MMS access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: mms.h,v 1.10 2003/08/17 23:02:51 fenrir Exp $ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -28,27 +28,11 @@ ...@@ -28,27 +28,11 @@
/* mmst and mmsu */ /* mmst and mmsu */
int E_( MMSTUOpen ) ( input_thread_t * ); int E_( MMSTUOpen ) ( access_t * );
void E_( MMSTUClose ) ( input_thread_t * ); void E_( MMSTUClose ) ( access_t * );
/* mmsh */ /* mmsh */
int E_( MMSHOpen ) ( input_thread_t * ); int E_( MMSHOpen ) ( access_t * );
void E_( MMSHClose ) ( input_thread_t * ); void E_( MMSHClose ) ( access_t * );
#define FREE( p ) if( p ) { free( p ); (p) = NULL; } #define FREE( p ) if( p ) { free( p ); (p) = NULL; }
/* url: [/]host[:port][/path][@username[:password]] */
typedef struct url_s
{
char *psz_host;
int i_port;
char *psz_path;
char *psz_username;
char *psz_password;
} url_t;
url_t *E_( url_new ) ( char * );
void E_( url_free ) ( url_t * );
modules/access/mms/mmsh.c
View file @ df3ce87c
...@@ -46,52 +46,60 @@ ...@@ -46,52 +46,60 @@
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
int E_(MMSHOpen) ( input_thread_t * ); int E_(MMSHOpen) ( access_t * );
void E_(MMSHClose) ( input_thread_t * ); void E_(MMSHClose) ( access_t * );
static ssize_t Read( input_thread_t *, byte_t *, size_t ); static int Read( access_t *, uint8_t *, int );
static ssize_t ReadRedirect( input_thread_t *, byte_t *, size_t ); static int ReadRedirect( access_t *, uint8_t *, int );
static void Seek( input_thread_t *, off_t ); static int Seek( access_t *, int64_t );
static int Control( access_t *, int, va_list );
static int Describe( input_thread_t *, char **ppsz_location ); static int Describe( access_t *, char **ppsz_location );
static int Start( input_thread_t *, off_t ); static int Start( access_t *, int64_t );
static void Stop( input_thread_t * ); static void Stop( access_t * );
static int GetPacket( input_thread_t *, chunk_t * ); static int GetPacket( access_t *, chunk_t * );
/**************************************************************************** /****************************************************************************
* Open: connect to ftp server and ask for file * Open: connect to ftp server and ask for file
****************************************************************************/ ****************************************************************************/
int E_( MMSHOpen ) ( input_thread_t *p_input ) int E_(MMSHOpen)( access_t *p_access )
{ {
access_sys_t *p_sys; access_sys_t *p_sys;
char *psz_location = NULL; char *psz_location = NULL;
vlc_value_t val; vlc_value_t val;
/* init p_sys */ /* init p_sys */
p_input->p_access_data = p_sys = malloc( sizeof( access_sys_t ) );
p_sys->i_proto = MMS_PROTO_HTTP;
/* 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 = VLC_FALSE;
p_access->info.i_title = 0;
p_access->info.i_seekpoint = 0;
p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
memset( p_sys, 0, sizeof( access_sys_t ) );
p_sys->i_proto= MMS_PROTO_HTTP;
p_sys->fd = -1; p_sys->fd = -1;
p_sys->i_pos = 0;
p_sys->i_start= 0; p_sys->i_start= 0;
/* open a tcp connection */ /* open a tcp connection */
vlc_UrlParse( &p_sys->url, p_input->psz_name, 0 ); 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_input, "invalid host" ); msg_Err( p_access, "invalid host" );
vlc_UrlClean( &p_sys->url ); vlc_UrlClean( &p_sys->url );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( p_sys->url.i_port <= 0 ) if( p_sys->url.i_port <= 0 )
{
p_sys->url.i_port = 80; p_sys->url.i_port = 80;
}
if( Describe( p_input, &psz_location ) ) if( Describe( p_access, &psz_location ) )
{ {
vlc_UrlClean( &p_sys->url ); vlc_UrlClean( &p_sys->url );
free( p_sys ); free( p_sys );
...@@ -100,13 +108,13 @@ int E_( MMSHOpen ) ( input_thread_t *p_input ) ...@@ -100,13 +108,13 @@ int E_( MMSHOpen ) ( input_thread_t *p_input )
/* Handle redirection */ /* Handle redirection */
if( psz_location && *psz_location ) if( psz_location && *psz_location )
{ {
playlist_t * p_playlist = vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_PARENT ); playlist_t * p_playlist = vlc_object_find( p_access, VLC_OBJECT_PLAYLIST, FIND_PARENT );
msg_Dbg( p_input, "redirection to %s", psz_location ); msg_Dbg( p_access, "redirection to %s", psz_location );
if( !p_playlist ) if( !p_playlist )
{ {
msg_Err( p_input, "redirection failed: can't find playlist" ); msg_Err( p_access, "redirection failed: can't find playlist" );
free( psz_location ); free( psz_location );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -118,62 +126,27 @@ int E_( MMSHOpen ) ( input_thread_t *p_input ) ...@@ -118,62 +126,27 @@ int E_( MMSHOpen ) ( input_thread_t *p_input )
free( psz_location ); free( psz_location );
p_input->pf_read = ReadRedirect; p_access->pf_read = ReadRedirect;
p_input->pf_seek = NULL;
p_input->pf_set_program = input_SetProgram;
p_input->pf_set_area = NULL;
/* *** finished to set some variable *** */
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.b_pace_control = 0;
p_input->stream.p_selected_area->i_size = 0;
p_input->stream.b_seekable = 0;
p_input->stream.p_selected_area->i_tell = 0;
p_input->stream.i_method = INPUT_METHOD_NETWORK;
vlc_mutex_unlock( &p_input->stream.stream_lock );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/* Start playing */ /* Start playing */
if( Start( p_input, 0 ) ) if( Start( p_access, 0 ) )
{ {
msg_Err( p_input, "cannot start stream" ); msg_Err( p_access, "cannot start stream" );
free( p_sys->p_header ); free( p_sys->p_header );
vlc_UrlClean( &p_sys->url ); vlc_UrlClean( &p_sys->url );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
/* *** set exported functions *** */ if( !p_sys->b_broadcast )
p_input->pf_read = Read;
p_input->pf_seek = Seek;
p_input->pf_set_program = input_SetProgram;
p_input->pf_set_area = NULL;
p_input->p_private = NULL;
p_input->i_mtu = 3 * p_sys->asfh.i_min_data_packet_size;
/* *** finished to set some variable *** */
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.b_pace_control = 0;
if( p_sys->b_broadcast )
{
p_input->stream.p_selected_area->i_size = 0;
p_input->stream.b_seekable = 0;
}
else
{ {
p_input->stream.p_selected_area->i_size = p_sys->asfh.i_file_size; p_access->info.i_size = p_sys->asfh.i_file_size;
p_input->stream.b_seekable = 1;
} }
p_input->stream.p_selected_area->i_tell = 0;
p_input->stream.i_method = INPUT_METHOD_NETWORK;
vlc_mutex_unlock( &p_input->stream.stream_lock );
/* Update default_pts to a suitable value for mms access */ /* Update default_pts to a suitable value for mms access */
var_Get( p_input, "mms-caching", &val ); var_Get( p_access, "mms-caching", &val );
p_input->i_pts_delay = val.i_int * 1000;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -181,64 +154,107 @@ int E_( MMSHOpen ) ( input_thread_t *p_input ) ...@@ -181,64 +154,107 @@ int E_( MMSHOpen ) ( input_thread_t *p_input )
/***************************************************************************** /*****************************************************************************
* Close: free unused data structures * Close: free unused data structures
*****************************************************************************/ *****************************************************************************/
void E_( MMSHClose )( input_thread_t *p_input ) void E_( MMSHClose )( access_t *p_access )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
msg_Dbg( p_input, "stopping stream" ); Stop( p_access );
free( p_sys );
}
/*****************************************************************************
* Control:
*****************************************************************************/
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;
int *pi_int;
int64_t *pi_64;
vlc_value_t val;
Stop( p_input ); switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
*pb_bool = !p_sys->b_broadcast;
break;
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
*pb_bool = VLC_FALSE;
break;
/* */
case ACCESS_GET_MTU:
pi_int = (int*)va_arg( args, int * );
*pi_int = 3 * p_sys->asfh.i_min_data_packet_size;
break;
free( p_sys ); case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
var_Get( p_access, "mms-caching", &val );
*pi_64 = val.i_int * 1000;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
return VLC_EGENERIC;
default:
msg_Err( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
} }
/***************************************************************************** /*****************************************************************************
* Seek: try to go at the right place * Seek: try to go at the right place
*****************************************************************************/ *****************************************************************************/
static void Seek( input_thread_t * p_input, off_t i_pos ) static int Seek( access_t *p_access, int64_t i_pos )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
chunk_t ck; chunk_t ck;
off_t i_offset; off_t i_offset;
off_t i_packet; off_t i_packet;
msg_Dbg( p_access, "seeking to "I64Fd, i_pos );
i_packet = ( i_pos - p_sys->i_header ) / p_sys->asfh.i_min_data_packet_size; 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; i_offset = ( i_pos - p_sys->i_header ) % p_sys->asfh.i_min_data_packet_size;
msg_Dbg( p_input, "seeking to "I64Fd, i_pos ); Stop( p_access );
Start( p_access, i_packet * p_sys->asfh.i_min_data_packet_size );
vlc_mutex_lock( &p_input->stream.stream_lock ); while( !p_access->b_die )
Stop( p_input );
Start( p_input, i_packet * p_sys->asfh.i_min_data_packet_size );
for( ;; )
{
if( GetPacket( p_input, &ck ) )
{ {
if( GetPacket( p_access, &ck ) )
break; break;
}
/* skip headers */ /* skip headers */
if( ck.i_type != 0x4824 ) if( ck.i_type != 0x4824 )
{
break; break;
}
msg_Warn( p_input, "skipping header" ); msg_Warn( p_access, "skipping header" );
} }
p_sys->i_pos = i_pos; p_access->info.i_pos = i_pos;
p_access->info.b_eof = VLC_FALSE;
p_sys->i_packet_used += i_offset; p_sys->i_packet_used += i_offset;
p_input->stream.p_selected_area->i_tell = i_pos; return VLC_SUCCESS;
vlc_mutex_unlock( &p_input->stream.stream_lock );
} }
/***************************************************************************** /*****************************************************************************
* Read: * Read:
*****************************************************************************/ *****************************************************************************/
static ssize_t ReadRedirect( input_thread_t *p_input, byte_t *p, size_t i ) static int ReadRedirect( access_t *p_access, uint8_t *p, int i_len )
{ {
return 0; return 0;
} }
...@@ -246,23 +262,25 @@ static ssize_t ReadRedirect( input_thread_t *p_input, byte_t *p, size_t i ) ...@@ -246,23 +262,25 @@ static ssize_t ReadRedirect( input_thread_t *p_input, byte_t *p, size_t i )
/***************************************************************************** /*****************************************************************************
* Read: * Read:
*****************************************************************************/ *****************************************************************************/
static ssize_t Read ( input_thread_t * p_input, byte_t * p_buffer, static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
size_t i_len )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
size_t i_copy; size_t i_copy;
size_t i_data = 0; size_t i_data = 0;
if( p_access->info.b_eof )
return 0;
while( i_data < i_len ) while( i_data < i_len )
{ {
if( p_sys->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_sys->i_pos - p_sys->i_start; int i_offset = p_access->info.i_pos - p_sys->i_start;
i_copy = __MIN( p_sys->i_header - i_offset, i_len - i_data ); i_copy = __MIN( p_sys->i_header - i_offset, i_len - i_data );
memcpy( &p_buffer[i_data], &p_sys->p_header[i_offset], i_copy ); memcpy( &p_buffer[i_data], &p_sys->p_header[i_offset], i_copy );
i_data += i_copy; i_data += i_copy;
p_sys->i_pos += i_copy; p_access->info.i_pos += i_copy;
} }
else if( p_sys->i_packet_used < p_sys->i_packet_length ) else if( p_sys->i_packet_used < p_sys->i_packet_length )
{ {
...@@ -275,7 +293,7 @@ static ssize_t Read ( input_thread_t * p_input, byte_t * p_buffer, ...@@ -275,7 +293,7 @@ static ssize_t Read ( input_thread_t * p_input, byte_t * p_buffer,
i_data += i_copy; i_data += i_copy;
p_sys->i_packet_used += i_copy; p_sys->i_packet_used += i_copy;
p_sys->i_pos += i_copy; p_access->info.i_pos += i_copy;
} }
else if( p_sys->i_packet_length > 0 && else if( p_sys->i_packet_length > 0 &&
(int)p_sys->i_packet_used < p_sys->asfh.i_min_data_packet_size ) (int)p_sys->i_packet_used < p_sys->asfh.i_min_data_packet_size )
...@@ -287,37 +305,40 @@ static ssize_t Read ( input_thread_t * p_input, byte_t * p_buffer, ...@@ -287,37 +305,40 @@ static ssize_t Read ( input_thread_t * p_input, byte_t * p_buffer,
i_data += i_copy; i_data += i_copy;
p_sys->i_packet_used += i_copy; p_sys->i_packet_used += i_copy;
p_sys->i_pos += i_copy; p_access->info.i_pos += i_copy;
} }
else else
{ {
chunk_t ck; chunk_t ck;
if( GetPacket( p_input, &ck ) ) if( GetPacket( p_access, &ck ) )
{ {
if( ck.i_type == 0x4524 && ck.i_sequence != 0 && p_sys->b_broadcast ) if( ck.i_type == 0x4524 && ck.i_sequence != 0 && p_sys->b_broadcast )
{ {
char *psz_location = NULL; char *psz_location = NULL;
p_sys->i_start = p_sys->i_pos; p_sys->i_start = p_access->info.i_pos;
msg_Dbg( p_input, "stoping the stream" ); msg_Dbg( p_access, "stoping the stream" );
Stop( p_input ); Stop( p_access );
msg_Dbg( p_input, "describe the stream" ); msg_Dbg( p_access, "describe the stream" );
if( Describe( p_input, &psz_location ) ) if( Describe( p_access, &psz_location ) )
{ {
msg_Err( p_input, "describe failed" ); msg_Err( p_access, "describe failed" );
return -1; p_access->info.b_eof = VLC_TRUE;
return 0;
} }
if( Start( p_input, 0 ) ) if( Start( p_access, 0 ) )
{ {
msg_Err( p_input, "Start failed" ); msg_Err( p_access, "Start failed" );
return -1; p_access->info.b_eof = VLC_TRUE;
return 0;
} }
} }
else else
{ {
return -1; p_access->info.b_eof = VLC_TRUE;
return 0;
} }
} }
if( ck.i_type != 0x4424 ) if( ck.i_type != 0x4424 )
...@@ -334,9 +355,9 @@ static ssize_t Read ( input_thread_t * p_input, byte_t * p_buffer, ...@@ -334,9 +355,9 @@ static ssize_t Read ( input_thread_t * p_input, byte_t * p_buffer,
/***************************************************************************** /*****************************************************************************
* Describe: * Describe:
*****************************************************************************/ *****************************************************************************/
static int Describe( input_thread_t *p_input, char **ppsz_location ) static int Describe( access_t *p_access, char **ppsz_location )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
char *psz_location = NULL; char *psz_location = NULL;
char *psz; char *psz;
int i_code; int i_code;
...@@ -350,15 +371,15 @@ static int Describe( input_thread_t *p_input, char **ppsz_location ) ...@@ -350,15 +371,15 @@ static int Describe( input_thread_t *p_input, char **ppsz_location )
p_sys->p_packet = NULL; p_sys->p_packet = NULL;
E_( GenerateGuid )( &p_sys->guid ); E_( GenerateGuid )( &p_sys->guid );
if( ( p_sys->fd = net_OpenTCP( p_input, p_sys->url.psz_host, if( ( p_sys->fd = net_OpenTCP( p_access, p_sys->url.psz_host,
p_sys->url.i_port ) ) < 0 ) p_sys->url.i_port ) ) < 0 )
{ {
msg_Err( p_input, "cannot connect to%s:%d", p_sys->url.psz_host, p_sys->url.i_port ); msg_Err( p_access, "cannot connect to%s:%d", p_sys->url.psz_host, p_sys->url.i_port );
goto error; goto error;
} }
/* send first request */ /* send first request */
net_Printf( VLC_OBJECT(p_input), p_sys->fd, net_Printf( VLC_OBJECT(p_access), p_sys->fd,
"GET %s HTTP/1.0\r\n" "GET %s HTTP/1.0\r\n"
"Accept: */*\r\n" "Accept: */*\r\n"
"User-Agent: NSPlayer/4.1.0.3856\r\n" "User-Agent: NSPlayer/4.1.0.3856\r\n"
...@@ -371,42 +392,42 @@ static int Describe( input_thread_t *p_input, char **ppsz_location ) ...@@ -371,42 +392,42 @@ static int Describe( input_thread_t *p_input, char **ppsz_location )
p_sys->i_request_context++, p_sys->i_request_context++,
GUID_PRINT( p_sys->guid ) ); GUID_PRINT( p_sys->guid ) );
if( net_Printf( VLC_OBJECT(p_input), p_sys->fd, "\r\n" ) < 0 ) if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, "\r\n" ) < 0 )
{ {
msg_Err( p_input, "failed to send request" ); msg_Err( p_access, "failed to send request" );
goto error; goto error;
} }
/* Receive the http header */ /* Receive the http header */
if( ( psz = net_Gets( VLC_OBJECT(p_input), p_sys->fd ) ) == NULL ) if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd ) ) == NULL )
{ {
msg_Err( p_input, "failed to read answer" ); msg_Err( p_access, "failed to read answer" );
goto error; goto error;
} }
if( strncmp( psz, "HTTP/1.", 7 ) ) if( strncmp( psz, "HTTP/1.", 7 ) )
{ {
msg_Err( p_input, "invalid HTTP reply '%s'", psz ); msg_Err( p_access, "invalid HTTP reply '%s'", psz );
free( psz ); free( psz );
goto error; goto error;
} }
i_code = atoi( &psz[9] ); i_code = atoi( &psz[9] );
if( i_code >= 400 ) if( i_code >= 400 )
{ {
msg_Err( p_input, "error: %s", psz ); msg_Err( p_access, "error: %s", psz );
free( psz ); free( psz );
goto error; goto error;
} }
msg_Dbg( p_input, "HTTP reply '%s'", psz ); msg_Dbg( p_access, "HTTP reply '%s'", psz );
free( psz ); free( psz );
for( ;; ) for( ;; )
{ {
char *psz = net_Gets( p_input, p_sys->fd ); char *psz = net_Gets( p_access, p_sys->fd );
char *p; char *p;
if( psz == NULL ) if( psz == NULL )
{ {
msg_Err( p_input, "failed to read answer" ); msg_Err( p_access, "failed to read answer" );
goto error; goto error;
} }
...@@ -418,7 +439,7 @@ static int Describe( input_thread_t *p_input, char **ppsz_location ) ...@@ -418,7 +439,7 @@ static int Describe( input_thread_t *p_input, char **ppsz_location )
if( ( p = strchr( psz, ':' ) ) == NULL ) if( ( p = strchr( psz, ':' ) ) == NULL )
{ {
msg_Err( p_input, "malformed header line: %s", psz ); msg_Err( p_access, "malformed header line: %s", psz );
free( psz ); free( psz );
goto error; goto error;
} }
...@@ -434,17 +455,17 @@ static int Describe( input_thread_t *p_input, char **ppsz_location ) ...@@ -434,17 +455,17 @@ static int Describe( input_thread_t *p_input, char **ppsz_location )
/* FIXME, it is a bit badly done here ..... */ /* FIXME, it is a bit badly done here ..... */
if( strstr( p, "broadcast" ) ) if( strstr( p, "broadcast" ) )
{ {
msg_Dbg( p_input, "stream type = broadcast" ); msg_Dbg( p_access, "stream type = broadcast" );
p_sys->b_broadcast = VLC_TRUE; p_sys->b_broadcast = VLC_TRUE;
} }
else if( strstr( p, "seekable" ) ) else if( strstr( p, "seekable" ) )
{ {
msg_Dbg( p_input, "stream type = seekable" ); msg_Dbg( p_access, "stream type = seekable" );
p_sys->b_broadcast = VLC_FALSE; p_sys->b_broadcast = VLC_FALSE;
} }
else else
{ {
msg_Warn( p_input, "unknow stream types (%s)", p ); msg_Warn( p_access, "unknow stream types (%s)", p );
p_sys->b_broadcast = VLC_FALSE; p_sys->b_broadcast = VLC_FALSE;
} }
} }
...@@ -462,7 +483,7 @@ static int Describe( input_thread_t *p_input, char **ppsz_location ) ...@@ -462,7 +483,7 @@ static int Describe( input_thread_t *p_input, char **ppsz_location )
i_code == 303 || i_code == 307 ) && i_code == 303 || i_code == 307 ) &&
psz_location && *psz_location ) psz_location && *psz_location )
{ {
msg_Dbg( p_input, "redirection to %s", psz_location ); msg_Dbg( p_access, "redirection to %s", psz_location );
net_Close( p_sys->fd ); p_sys->fd = -1; net_Close( p_sys->fd ); p_sys->fd = -1;
*ppsz_location = psz_location; *ppsz_location = psz_location;
...@@ -475,7 +496,7 @@ static int Describe( input_thread_t *p_input, char **ppsz_location ) ...@@ -475,7 +496,7 @@ static int Describe( input_thread_t *p_input, char **ppsz_location )
for( ;; ) for( ;; )
{ {
chunk_t ck; chunk_t ck;
if( GetPacket( p_input, &ck ) || if( GetPacket( p_access, &ck ) ||
ck.i_type != 0x4824 ) ck.i_type != 0x4824 )
{ {
break; break;
...@@ -489,10 +510,10 @@ static int Describe( input_thread_t *p_input, char **ppsz_location ) ...@@ -489,10 +510,10 @@ static int Describe( input_thread_t *p_input, char **ppsz_location )
ck.p_data, ck.i_data ); ck.p_data, ck.i_data );
} }
} }
msg_Dbg( p_input, "complete header size=%d", p_sys->i_header ); msg_Dbg( p_access, "complete header size=%d", p_sys->i_header );
if( p_sys->i_header <= 0 ) if( p_sys->i_header <= 0 )
{ {
msg_Err( p_input, "header size == 0" ); msg_Err( p_access, "header size == 0" );
goto error; goto error;
} }
/* close this connection */ /* close this connection */
...@@ -505,15 +526,15 @@ static int Describe( input_thread_t *p_input, char **ppsz_location ) ...@@ -505,15 +526,15 @@ static int Describe( input_thread_t *p_input, char **ppsz_location )
* and bitrate mutual exclusion(optional) */ * and bitrate mutual exclusion(optional) */
E_( asf_HeaderParse )( &p_sys->asfh, E_( asf_HeaderParse )( &p_sys->asfh,
p_sys->p_header, p_sys->i_header ); p_sys->p_header, p_sys->i_header );
msg_Dbg( p_input, "packet count=%lld packet size=%d", msg_Dbg( p_access, "packet count=%lld packet size=%d",
p_sys->asfh.i_data_packets_count, p_sys->asfh.i_data_packets_count,
p_sys->asfh.i_min_data_packet_size ); p_sys->asfh.i_min_data_packet_size );
E_( asf_StreamSelect)( &p_sys->asfh, E_( asf_StreamSelect)( &p_sys->asfh,
config_GetInt( p_input, "mms-maxbitrate" ), config_GetInt( p_access, "mms-maxbitrate" ),
config_GetInt( p_input, "mms-all" ), config_GetInt( p_access, "mms-all" ),
config_GetInt( p_input, "audio" ), config_GetInt( p_access, "audio" ),
config_GetInt( p_input, "video" ) ); config_GetInt( p_access, "video" ) );
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -529,20 +550,20 @@ error: ...@@ -529,20 +550,20 @@ error:
/***************************************************************************** /*****************************************************************************
* *
*****************************************************************************/ *****************************************************************************/
static int Start( input_thread_t *p_input, off_t i_pos ) static int Start( access_t *p_access, off_t i_pos )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
int i_streams = 0; int i_streams = 0;
int i; int i;
char *psz; char *psz;
msg_Dbg( p_input, "starting stream" ); msg_Dbg( p_access, "starting stream" );
if( ( p_sys->fd = net_OpenTCP( p_input, p_sys->url.psz_host, if( ( p_sys->fd = net_OpenTCP( p_access, p_sys->url.psz_host,
p_sys->url.i_port ) ) < 0 ) p_sys->url.i_port ) ) < 0 )
{ {
/* should not occur */ /* should not occur */
msg_Err( p_input, "cannot connect to the server" ); msg_Err( p_access, "cannot connect to the server" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -556,10 +577,10 @@ static int Start( input_thread_t *p_input, off_t i_pos ) ...@@ -556,10 +577,10 @@ static int Start( input_thread_t *p_input, off_t i_pos )
if( i_streams <= 0 ) if( i_streams <= 0 )
{ {
msg_Err( p_input, "no stream selected" ); msg_Err( p_access, "no stream selected" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
net_Printf( VLC_OBJECT(p_input), p_sys->fd, net_Printf( VLC_OBJECT(p_access), p_sys->fd,
"GET %s HTTP/1.0\r\n" "GET %s HTTP/1.0\r\n"
"Accept: */*\r\n" "Accept: */*\r\n"
"User-Agent: NSPlayer/4.1.0.3856\r\n" "User-Agent: NSPlayer/4.1.0.3856\r\n"
...@@ -568,19 +589,19 @@ static int Start( input_thread_t *p_input, off_t i_pos ) ...@@ -568,19 +589,19 @@ static int Start( input_thread_t *p_input, off_t i_pos )
p_sys->url.psz_host, p_sys->url.i_port ); p_sys->url.psz_host, p_sys->url.i_port );
if( p_sys->b_broadcast ) if( p_sys->b_broadcast )
{ {
net_Printf( VLC_OBJECT(p_input), p_sys->fd, net_Printf( VLC_OBJECT(p_access), p_sys->fd,
"Pragma: no-cache,rate=1.000000,request-context=%d\r\n", "Pragma: no-cache,rate=1.000000,request-context=%d\r\n",
p_sys->i_request_context++ ); p_sys->i_request_context++ );
} }
else else
{ {
net_Printf( VLC_OBJECT(p_input), p_sys->fd, net_Printf( VLC_OBJECT(p_access), p_sys->fd,
"Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=%u:%u,request-context=%d,max-duration=0\r\n", "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 >> 32)&0xffffffff),
(uint32_t)(i_pos&0xffffffff), (uint32_t)(i_pos&0xffffffff),
p_sys->i_request_context++ ); p_sys->i_request_context++ );
} }
net_Printf( VLC_OBJECT(p_input), p_sys->fd, net_Printf( VLC_OBJECT(p_access), p_sys->fd,
"Pragma: xPlayStrm=1\r\n" "Pragma: xPlayStrm=1\r\n"
"Pragma: xClientGUID={"GUID_FMT"}\r\n" "Pragma: xClientGUID={"GUID_FMT"}\r\n"
"Pragma: stream-switch-count=%d\r\n" "Pragma: stream-switch-count=%d\r\n"
...@@ -598,40 +619,40 @@ static int Start( input_thread_t *p_input, off_t i_pos ) ...@@ -598,40 +619,40 @@ static int Start( input_thread_t *p_input, off_t i_pos )
i_select = 0; i_select = 0;
} }
net_Printf( VLC_OBJECT(p_input), p_sys->fd, net_Printf( VLC_OBJECT(p_access), p_sys->fd,
"ffff:%d:%d ", i, i_select ); "ffff:%d:%d ", i, i_select );
} }
} }
net_Printf( VLC_OBJECT(p_input), p_sys->fd, "\r\n" ); net_Printf( VLC_OBJECT(p_access), p_sys->fd, "\r\n" );
net_Printf( VLC_OBJECT(p_input), p_sys->fd, "Connection: Close\r\n" ); net_Printf( VLC_OBJECT(p_access), p_sys->fd, "Connection: Close\r\n" );
if( net_Printf( VLC_OBJECT(p_input), p_sys->fd, "\r\n" ) < 0 ) if( net_Printf( VLC_OBJECT(p_access), p_sys->fd, "\r\n" ) < 0 )
{ {
msg_Err( p_input, "failed to send request" ); msg_Err( p_access, "failed to send request" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( ( psz = net_Gets( VLC_OBJECT(p_input), p_sys->fd ) ) == NULL ) if( ( psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd ) ) == NULL )
{ {
msg_Err( p_input, "cannot read data" ); msg_Err( p_access, "cannot read data" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( atoi( &psz[9] ) >= 400 ) if( atoi( &psz[9] ) >= 400 )
{ {
msg_Err( p_input, "error: %s", psz ); msg_Err( p_access, "error: %s", psz );
free( psz ); free( psz );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
msg_Dbg( p_input, "HTTP reply '%s'", psz ); msg_Dbg( p_access, "HTTP reply '%s'", psz );
free( psz ); free( psz );
/* FIXME check HTTP code */ /* FIXME check HTTP code */
for( ;; ) for( ;; )
{ {
char *psz = net_Gets( p_input, p_sys->fd ); char *psz = net_Gets( p_access, p_sys->fd );
if( psz == NULL ) if( psz == NULL )
{ {
msg_Err( p_input, "cannot read data" ); msg_Err( p_access, "cannot read data" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( *psz == '\0' ) if( *psz == '\0' )
...@@ -639,7 +660,7 @@ static int Start( input_thread_t *p_input, off_t i_pos ) ...@@ -639,7 +660,7 @@ static int Start( input_thread_t *p_input, off_t i_pos )
free( psz ); free( psz );
break; break;
} }
msg_Dbg( p_input, "%s", psz ); msg_Dbg( p_access, "%s", psz );
free( psz ); free( psz );
} }
...@@ -652,11 +673,11 @@ static int Start( input_thread_t *p_input, off_t i_pos ) ...@@ -652,11 +673,11 @@ static int Start( input_thread_t *p_input, off_t i_pos )
/***************************************************************************** /*****************************************************************************
* *
*****************************************************************************/ *****************************************************************************/
static void Stop( input_thread_t *p_input ) static void Stop( access_t *p_access )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
msg_Dbg( p_input, "closing stream" ); msg_Dbg( p_access, "closing stream" );
if( p_sys->fd > 0 ) if( p_sys->fd > 0 )
{ {
net_Close( p_sys->fd ); net_Close( p_sys->fd );
...@@ -667,17 +688,17 @@ static void Stop( input_thread_t *p_input ) ...@@ -667,17 +688,17 @@ static void Stop( input_thread_t *p_input )
/***************************************************************************** /*****************************************************************************
* *
*****************************************************************************/ *****************************************************************************/
static int GetPacket( input_thread_t * p_input, chunk_t *p_ck ) static int GetPacket( access_t * p_access, chunk_t *p_ck )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
/* chunk_t */ /* chunk_t */
memset( p_ck, 0, sizeof( chunk_t ) ); memset( p_ck, 0, sizeof( chunk_t ) );
/* Read the chunk header */ /* Read the chunk header */
if( net_Read( p_input, p_sys->fd, p_sys->buffer, 12, VLC_TRUE ) < 12 ) if( net_Read( p_access, p_sys->fd, p_sys->buffer, 12, VLC_TRUE ) < 12 )
{ {
/* msg_Err( p_input, "cannot read data" ); */ /* msg_Err( p_access, "cannot read data" ); */
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -693,32 +714,32 @@ static int GetPacket( input_thread_t * p_input, chunk_t *p_ck ) ...@@ -693,32 +714,32 @@ static int GetPacket( input_thread_t * p_input, chunk_t *p_ck )
{ {
if( p_ck->i_sequence == 0 ) if( p_ck->i_sequence == 0 )
{ {
msg_Warn( p_input, "EOF" ); msg_Warn( p_access, "EOF" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
else else
{ {
msg_Warn( p_input, "Next stream follow but not supported" ); msg_Warn( p_access, "Next stream follow but not supported" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
else if( p_ck->i_type != 0x4824 && p_ck->i_type != 0x4424 ) else if( p_ck->i_type != 0x4824 && p_ck->i_type != 0x4424 )
{ {
msg_Err( p_input, "invalid chunk FATAL (0x%x)", p_ck->i_type ); msg_Err( p_access, "invalid chunk FATAL (0x%x)", p_ck->i_type );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( p_ck->i_data > 0 && if( p_ck->i_data > 0 &&
net_Read( p_input, p_sys->fd, &p_sys->buffer[12], p_ck->i_data, VLC_TRUE ) < p_ck->i_data ) net_Read( p_access, p_sys->fd, &p_sys->buffer[12], p_ck->i_data, VLC_TRUE ) < p_ck->i_data )
{ {
msg_Err( p_input, "cannot read data" ); msg_Err( p_access, "cannot read data" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( p_sys->i_packet_sequence != 0 && if( p_sys->i_packet_sequence != 0 &&
p_ck->i_sequence != p_sys->i_packet_sequence ) p_ck->i_sequence != p_sys->i_packet_sequence )
{ {
msg_Warn( p_input, "packet lost ? (%d != %d)", p_ck->i_sequence, p_sys->i_packet_sequence ); msg_Warn( p_access, "packet lost ? (%d != %d)", p_ck->i_sequence, p_sys->i_packet_sequence );
} }
p_sys->i_packet_sequence = p_ck->i_sequence + 1; p_sys->i_packet_sequence = p_ck->i_sequence + 1;
......
modules/access/mms/mmsh.h
View file @ df3ce87c
...@@ -58,8 +58,7 @@ struct access_sys_t ...@@ -58,8 +58,7 @@ struct access_sys_t
unsigned int i_packet_used; unsigned int i_packet_used;
unsigned int i_packet_length; unsigned int i_packet_length;
off_t i_pos; int64_t i_start;
off_t i_start;
asf_header_t asfh; asf_header_t asfh;
guid_t guid; guid_t guid;
......
modules/access/mms/mmstu.c
View file @ df3ce87c
...@@ -73,32 +73,32 @@ ...@@ -73,32 +73,32 @@
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
int E_( MMSTUOpen ) ( input_thread_t * ); int E_( MMSTUOpen ) ( access_t * );
void E_( MMSTUClose ) ( input_thread_t * ); void E_( MMSTUClose ) ( access_t * );
static ssize_t Read( input_thread_t *, byte_t *, size_t ); static int Read( access_t *, uint8_t *, int );
static void Seek( input_thread_t *, off_t ); static int Seek( access_t *, int64_t );
static int Control( access_t *, int, va_list );
static int MMSOpen ( input_thread_t *, url_t *, int ); static int MMSOpen ( access_t *, vlc_url_t *, int );
static int MMSStart( input_thread_t *, uint32_t ); static int MMSStart( access_t *, uint32_t );
static int MMSStop ( input_thread_t * ); static int MMSStop ( access_t * );
static void MMSClose( input_thread_t * ); static void MMSClose( access_t * );
static int mms_CommandRead( input_thread_t *p_input, int i_command1, int i_command2 ); static int mms_CommandRead( access_t *p_access, int i_command1, int i_command2 );
static int mms_CommandSend( input_thread_t *, int, uint32_t, uint32_t, uint8_t *, int ); static int mms_CommandSend( access_t *, int, uint32_t, uint32_t, uint8_t *, int );
static int mms_HeaderMediaRead( input_thread_t *, int ); static int mms_HeaderMediaRead( access_t *, int );
static int mms_ReceivePacket( input_thread_t * ); static int mms_ReceivePacket( access_t * );
/* /*
* XXX DON'T FREE MY MEMORY !!! XXX * XXX DON'T FREE MY MEMORY !!! XXX
* non mais :P * non mais :P
*/ */
/* /*
* Ok, ok, j'le ferai plus... * Ok, ok, j'le ferai plus...
*/ */
...@@ -115,42 +115,50 @@ static int mms_ReceivePacket( input_thread_t * ); ...@@ -115,42 +115,50 @@ static int mms_ReceivePacket( input_thread_t * );
* signer. Ca mriterait un coup de pied dans le cul a :) * signer. Ca mriterait un coup de pied dans le cul a :)
*/ */
int E_(MMSTUOpen)( input_thread_t *p_input ) int E_(MMSTUOpen)( access_t *p_access )
{ {
access_sys_t *p_sys; access_sys_t *p_sys;
int i_proto; int i_proto;
int i_status; int i_status;
vlc_value_t val; vlc_value_t val;
/* *** allocate p_sys_data *** */ /* Set up p_access */
p_input->p_access_data = p_sys = malloc( sizeof( access_sys_t ) ); 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 = VLC_FALSE;
p_access->info.i_title = 0;
p_access->info.i_seekpoint = 0;
p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
memset( p_sys, 0, sizeof( access_sys_t ) ); memset( p_sys, 0, sizeof( access_sys_t ) );
/* *** Parse URL and get server addr/port and path *** */ /* *** Parse URL and get server addr/port and path *** */
p_sys->p_url = E_( url_new )( p_input->psz_name ); 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->p_url->psz_host == '\0' )
{ {
E_( url_free )( p_sys->p_url ); msg_Err( p_access, "invalid server name" );
msg_Err( p_input, "invalid server name" ); vlc_UrlClean( &p_sys->url );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( p_sys->p_url->i_port <= 0 ) if( p_sys->url.i_port <= 0 )
{ {
p_sys->p_url->i_port = 1755; p_sys->url.i_port = 1755;
} }
/* *** connect to this server *** */ /* *** connect to this server *** */
/* look at requested protocol (udp/tcp) */ /* look at requested protocol (udp/tcp) */
i_proto = MMS_PROTO_AUTO; i_proto = MMS_PROTO_AUTO;
if( *p_input->psz_access ) if( *p_access->psz_access )
{ {
if( !strncmp( p_input->psz_access, "mmsu", 4 ) ) if( !strncmp( p_access->psz_access, "mmsu", 4 ) )
{ {
i_proto = MMS_PROTO_UDP; i_proto = MMS_PROTO_UDP;
} }
else if( !strncmp( p_input->psz_access, "mmst", 4 ) ) else if( !strncmp( p_access->psz_access, "mmst", 4 ) )
{ {
i_proto = MMS_PROTO_TCP; i_proto = MMS_PROTO_TCP;
} }
...@@ -158,38 +166,25 @@ int E_(MMSTUOpen)( input_thread_t *p_input ) ...@@ -158,38 +166,25 @@ int E_(MMSTUOpen)( input_thread_t *p_input )
/* connect */ /* connect */
if( i_proto == MMS_PROTO_AUTO ) if( i_proto == MMS_PROTO_AUTO )
{ /* first try with TCP */ { /* first try with TCP and then UDP*/
if( ( i_status = MMSOpen( p_input, p_sys->p_url, MMS_PROTO_TCP ) ) ) if( ( i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_TCP ) ) )
{ /* then with UDP */ {
i_status = MMSOpen( p_input, p_sys->p_url, MMS_PROTO_UDP ); i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_UDP );
} }
} }
else else
{ {
i_status = MMSOpen( p_input, p_sys->p_url, i_proto ); i_status = MMSOpen( p_access, &p_sys->url, i_proto );
} }
if( i_status ) if( i_status )
{ {
msg_Err( p_input, "cannot connect to server" ); msg_Err( p_access, "cannot connect to server" );
E_( url_free )( p_sys->p_url ); vlc_UrlClean( &p_sys->url );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
msg_Dbg( p_input, "connected to %s:%d", p_sys->p_url->psz_host, p_sys->p_url->i_port ); msg_Dbg( p_access, "connected to %s:%d", p_sys->url.psz_host, p_sys->url.i_port );
/* *** set exported functions *** */
p_input->pf_read = Read;
p_input->pf_seek = Seek;
p_input->pf_set_program = input_SetProgram;
p_input->pf_set_area = NULL;
p_input->p_private = NULL;
/* *** finished to set some variable *** */
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.b_pace_control = 0;
p_input->stream.p_selected_area->i_tell = 0;
/* /*
* i_flags_broadcast * i_flags_broadcast
* yy xx ?? ?? * yy xx ?? ??
...@@ -202,32 +197,27 @@ int E_(MMSTUOpen)( input_thread_t *p_input ) ...@@ -202,32 +197,27 @@ int E_(MMSTUOpen)( input_thread_t *p_input )
} }
if( p_sys->i_packet_count <= 0 || ( p_sys->i_flags_broadcast >> 24 ) == 0x02 ) if( p_sys->i_packet_count <= 0 || ( p_sys->i_flags_broadcast >> 24 ) == 0x02 )
{ {
p_input->stream.b_seekable = 0; p_sys->b_seekable = VLC_FALSE;
p_input->stream.p_selected_area->i_size = 0;
} }
else else
{ {
p_input->stream.b_seekable = 1; p_sys->b_seekable = VLC_TRUE;
p_input->stream.p_selected_area->i_size = p_access->info.i_size =
(uint64_t)p_sys->i_header + (uint64_t)p_sys->i_header +
(uint64_t)p_sys->i_packet_count * (uint64_t)p_sys->i_packet_length; (uint64_t)p_sys->i_packet_count * (uint64_t)p_sys->i_packet_length;
} }
p_input->stream.i_method = INPUT_METHOD_NETWORK;
vlc_mutex_unlock( &p_input->stream.stream_lock );
/* *** Start stream *** */ /* *** Start stream *** */
if( MMSStart( p_input, 0xffffffff ) < 0 ) if( MMSStart( p_access, 0xffffffff ) < 0 )
{ {
msg_Err( p_input, "cannot start stream" ); msg_Err( p_access, "cannot start stream" );
MMSClose( p_input ); MMSClose( p_access );
E_( url_free )( p_sys->p_url ); vlc_UrlClean( &p_sys->url );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
/* Update default_pts to a suitable value for mms access */ /* Update default_pts to a suitable value for mms access */
var_Get( p_input, "mms-caching", &val ); var_Get( p_access, "mms-caching", &val );
p_input->i_pts_delay = val.i_int * 1000;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -235,45 +225,93 @@ int E_(MMSTUOpen)( input_thread_t *p_input ) ...@@ -235,45 +225,93 @@ int E_(MMSTUOpen)( input_thread_t *p_input )
/***************************************************************************** /*****************************************************************************
* Close: free unused data structures * Close: free unused data structures
*****************************************************************************/ *****************************************************************************/
void E_(MMSTUClose)( input_thread_t *p_input ) void E_(MMSTUClose)( access_t *p_access )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
/* close connection with server */ /* close connection with server */
MMSClose( p_input ); MMSClose( p_access );
/* free memory */ /* free memory */
E_( url_free )( p_sys->p_url ); vlc_UrlClean( &p_sys->url );
free( p_sys ); free( p_sys );
} }
/*****************************************************************************
* Control:
*****************************************************************************/
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;
int *pi_int;
int64_t *pi_64;
vlc_value_t val;
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
*pb_bool = p_sys->b_seekable;
break;
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
*pb_bool = VLC_FALSE;
break;
/* */
case ACCESS_GET_MTU:
pi_int = (int*)va_arg( args, int * );
*pi_int = 3 * p_sys->i_packet_length;
break;
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
var_Get( p_access, "mms-caching", &val );
*pi_64 = val.i_int * 1000;
break;
/* */
case ACCESS_SET_PAUSE_STATE:
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
return VLC_EGENERIC;
default:
msg_Err( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
/***************************************************************************** /*****************************************************************************
* Seek: try to go at the right place * Seek: try to go at the right place
*****************************************************************************/ *****************************************************************************/
static void Seek( input_thread_t * p_input, off_t i_pos ) static int Seek( access_t * p_access, int64_t i_pos )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
uint32_t i_packet; uint32_t i_packet;
uint32_t i_offset; uint32_t i_offset;
var_buffer_t buffer; var_buffer_t buffer;
if( i_pos < 0 ) if( i_pos < 0 )
{ return VLC_EGENERIC;
return;
}
vlc_mutex_lock( &p_input->stream.stream_lock );
if( i_pos < p_sys->i_header) if( i_pos < p_sys->i_header)
{ {
if( p_sys->i_pos < p_sys->i_header ) if( p_access->info.i_pos < p_sys->i_header )
{ {
/* no need to restart stream, it was already one /* no need to restart stream, it was already one
* or no stream was yet read */ * or no stream was yet read */
p_sys->i_pos = i_pos; p_access->info.i_pos = i_pos;
return; return VLC_SUCCESS;
} }
else else
{ {
...@@ -286,10 +324,10 @@ static void Seek( input_thread_t * p_input, off_t i_pos ) ...@@ -286,10 +324,10 @@ static void Seek( input_thread_t * p_input, off_t i_pos )
i_packet = ( i_pos - p_sys->i_header ) / p_sys->i_packet_length; i_packet = ( i_pos - p_sys->i_header ) / p_sys->i_packet_length;
i_offset = ( i_pos - p_sys->i_header ) % p_sys->i_packet_length; i_offset = ( i_pos - p_sys->i_header ) % p_sys->i_packet_length;
} }
msg_Dbg( p_input, "seeking to "I64Fd " (packet:%d)", i_pos, i_packet ); msg_Dbg( p_access, "seeking to "I64Fd " (packet:%d)", i_pos, i_packet );
MMSStop( p_input ); MMSStop( p_access );
msg_Dbg( p_input, "stream stopped (seek)" ); msg_Dbg( p_access, "stream stopped (seek)" );
/* *** restart stream *** */ /* *** restart stream *** */
var_buffer_initwrite( &buffer, 0 ); var_buffer_initwrite( &buffer, 0 );
...@@ -302,48 +340,49 @@ static void Seek( input_thread_t * p_input, off_t i_pos ) ...@@ -302,48 +340,49 @@ static void Seek( input_thread_t * p_input, off_t i_pos )
var_buffer_add8( &buffer, 0x00 ); // don't use limit var_buffer_add8( &buffer, 0x00 ); // don't use limit
var_buffer_add32( &buffer, p_sys->i_media_packet_id_type ); var_buffer_add32( &buffer, p_sys->i_media_packet_id_type );
mms_CommandSend( p_input, 0x07, p_sys->i_command_level, 0x0001ffff, mms_CommandSend( p_access, 0x07, p_sys->i_command_level, 0x0001ffff,
buffer.p_data, buffer.i_data ); buffer.p_data, buffer.i_data );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
for( ;; ) while( !p_access->b_die )
{ {
mms_HeaderMediaRead( p_input, MMS_PACKET_CMD ); mms_HeaderMediaRead( p_access, MMS_PACKET_CMD );
if( p_sys->i_command == 0x1e ) if( p_sys->i_command == 0x1e )
{ {
msg_Dbg( p_input, "received 0x1e (seek)" ); msg_Dbg( p_access, "received 0x1e (seek)" );
break; break;
} }
} }
for( ;; ) while( !p_access->b_die )
{ {
mms_HeaderMediaRead( p_input, MMS_PACKET_CMD ); mms_HeaderMediaRead( p_access, MMS_PACKET_CMD );
if( p_sys->i_command == 0x05 ) if( p_sys->i_command == 0x05 )
{ {
msg_Dbg( p_input, "received 0x05 (seek)" ); msg_Dbg( p_access, "received 0x05 (seek)" );
break; break;
} }
} }
/* get a packet */ /* get a packet */
mms_HeaderMediaRead( p_input, MMS_PACKET_MEDIA ); mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA );
msg_Dbg( p_input, "Streaming restarted" ); msg_Dbg( p_access, "Streaming restarted" );
p_sys->i_media_used += i_offset; p_sys->i_media_used += i_offset;
p_sys->i_pos = i_pos; p_access->info.i_pos = i_pos;
p_input->stream.p_selected_area->i_tell = i_pos; p_access->info.b_eof = VLC_FALSE;
vlc_mutex_unlock( &p_input->stream.stream_lock );
return VLC_SUCCESS;
} }
/***************************************************************************** /*****************************************************************************
* Read: * Read:
*****************************************************************************/ *****************************************************************************/
static ssize_t Read( input_thread_t *p_input, byte_t *p_buffer, size_t i_len ) static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
size_t i_data; size_t i_data;
size_t i_copy; size_t i_copy;
...@@ -352,12 +391,12 @@ static ssize_t Read( input_thread_t *p_input, byte_t *p_buffer, size_t i_len ) ...@@ -352,12 +391,12 @@ static ssize_t Read( input_thread_t *p_input, byte_t *p_buffer, size_t i_len )
/* *** now send data if needed *** */ /* *** now send data if needed *** */
while( i_data < i_len ) while( i_data < i_len )
{ {
if( p_sys->i_pos < p_sys->i_header ) if( p_access->info.i_pos < p_sys->i_header )
{ {
i_copy = __MIN( i_len, p_sys->i_header - p_sys->i_pos ); i_copy = __MIN( i_len, p_sys->i_header - p_access->info.i_pos );
memcpy( &p_buffer[i_data], &p_sys->p_header[p_sys->i_pos], i_copy ); memcpy( &p_buffer[i_data], &p_sys->p_header[p_access->info.i_pos], i_copy );
i_data += i_copy; i_data += i_copy;
p_sys->i_pos += i_copy; p_access->info.i_pos += i_copy;
} }
else if( p_sys->i_media_used < p_sys->i_media ) else if( p_sys->i_media_used < p_sys->i_media )
{ {
...@@ -366,7 +405,7 @@ static ssize_t Read( input_thread_t *p_input, byte_t *p_buffer, size_t i_len ) ...@@ -366,7 +405,7 @@ static ssize_t Read( input_thread_t *p_input, byte_t *p_buffer, size_t i_len )
memcpy( &p_buffer[i_data], &p_sys->p_media[p_sys->i_media_used], i_copy ); memcpy( &p_buffer[i_data], &p_sys->p_media[p_sys->i_media_used], i_copy );
i_data += i_copy; i_data += i_copy;
p_sys->i_media_used += i_copy; p_sys->i_media_used += i_copy;
p_sys->i_pos += i_copy; p_access->info.i_pos += i_copy;
} }
else if( p_sys->p_media != NULL && else if( p_sys->p_media != NULL &&
p_sys->i_media_used < p_sys->i_packet_length ) p_sys->i_media_used < p_sys->i_packet_length )
...@@ -377,10 +416,10 @@ static ssize_t Read( input_thread_t *p_input, byte_t *p_buffer, size_t i_len ) ...@@ -377,10 +416,10 @@ static ssize_t Read( input_thread_t *p_input, byte_t *p_buffer, size_t i_len )
i_data += i_copy; i_data += i_copy;
p_sys->i_media_used += i_copy; p_sys->i_media_used += i_copy;
p_sys->i_pos += i_copy; p_access->info.i_pos += i_copy;
} }
else if( p_sys->i_eos || else if( p_access->info.b_eof ||
mms_HeaderMediaRead( p_input, MMS_PACKET_MEDIA ) < 0 ) mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA ) < 0 )
{ {
break; break;
} }
...@@ -392,9 +431,9 @@ static ssize_t Read( input_thread_t *p_input, byte_t *p_buffer, size_t i_len ) ...@@ -392,9 +431,9 @@ static ssize_t Read( input_thread_t *p_input, byte_t *p_buffer, size_t i_len )
/**************************************************************************** /****************************************************************************
* MMSOpen : Open a connection with the server over mmst or mmsu * MMSOpen : Open a connection with the server over mmst or mmsu
****************************************************************************/ ****************************************************************************/
static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
int b_udp = ( i_proto == MMS_PROTO_UDP ) ? 1 : 0; int b_udp = ( i_proto == MMS_PROTO_UDP ) ? 1 : 0;
var_buffer_t buffer; var_buffer_t buffer;
...@@ -410,15 +449,14 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -410,15 +449,14 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
/* *** Open a TCP connection with server *** */ /* *** Open a TCP connection with server *** */
msg_Dbg( p_input, "waiting for connection..." ); msg_Dbg( p_access, "waiting for connection..." );
p_sys->socket_tcp.i_handle = net_OpenTCP( p_input, p_url->psz_host, p_url->i_port ); p_sys->i_handle_tcp = net_OpenTCP( p_access, p_url->psz_host, p_url->i_port );
if( p_sys->socket_tcp.i_handle < 0 ) if( p_sys->i_handle_tcp < 0 )
{ {
msg_Err( p_input, "failed to open a connection (tcp)" ); msg_Err( p_access, "failed to open a connection (tcp)" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
p_input->i_mtu = 0; msg_Dbg( p_access,
msg_Dbg( p_input,
"connection(tcp) with \"%s:%d\" successful", "connection(tcp) with \"%s:%d\" successful",
p_url->psz_host, p_url->psz_host,
p_url->i_port ); p_url->i_port );
...@@ -429,24 +467,22 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -429,24 +467,22 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
struct sockaddr_in name; struct sockaddr_in name;
socklen_t i_namelen = sizeof( struct sockaddr_in ); socklen_t i_namelen = sizeof( struct sockaddr_in );
if( getsockname( p_sys->socket_tcp.i_handle, if( getsockname( p_sys->i_handle_tcp,
(struct sockaddr*)&name, &i_namelen ) < 0 ) (struct sockaddr*)&name, &i_namelen ) < 0 )
{ {
net_Close( p_sys->i_handle_tcp );
msg_Err( p_input, "for udp you have to provide bind address (mms://<server_addr>@<bind_addr/<path> (FIXME)" );
net_Close( p_sys->socket_tcp.i_handle );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
p_sys->psz_bind_addr = inet_ntoa( name.sin_addr ); p_sys->psz_bind_addr = inet_ntoa( name.sin_addr );
p_sys->socket_udp.i_handle = net_OpenUDP( p_input, p_sys->psz_bind_addr, 7000, "", 0 ); p_sys->i_handle_udp = net_OpenUDP( p_access, p_sys->psz_bind_addr, 7000, "", 0 );
if( p_sys->socket_udp.i_handle < 0 ) if( p_sys->i_handle_udp < 0 )
{ {
msg_Err( p_input, "failed to open a connection (udp)" ); msg_Err( p_access, "failed to open a connection (udp)" );
net_Close( p_sys->socket_tcp.i_handle ); net_Close( p_sys->i_handle_tcp );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
msg_Dbg( p_input, msg_Dbg( p_access,
"connection(udp) at \"%s:%d\" successful", "connection(udp) at \"%s:%d\" successful",
p_sys->psz_bind_addr, 7000 ); p_sys->psz_bind_addr, 7000 );
} }
...@@ -457,7 +493,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -457,7 +493,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
/* *** Init context for mms prototcol *** */ /* *** Init context for mms prototcol *** */
E_( GenerateGuid )( &p_sys->guid ); /* used to identify client by server */ E_( GenerateGuid )( &p_sys->guid ); /* used to identify client by server */
msg_Dbg( p_input, msg_Dbg( p_access,
"generated guid: "GUID_FMT, "generated guid: "GUID_FMT,
GUID_PRINT( p_sys->guid ) ); GUID_PRINT( p_sys->guid ) );
p_sys->i_command_level = 1; /* updated after 0x1A command */ p_sys->i_command_level = 1; /* updated after 0x1A command */
...@@ -472,12 +508,12 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -472,12 +508,12 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
p_sys->i_media = 0; p_sys->i_media = 0;
p_sys->i_media_used = 0; p_sys->i_media_used = 0;
p_sys->i_pos = 0; p_access->info.i_pos = 0;
p_sys->i_buffer_tcp = 0; p_sys->i_buffer_tcp = 0;
p_sys->i_buffer_udp = 0; p_sys->i_buffer_udp = 0;
p_sys->p_cmd = NULL; p_sys->p_cmd = NULL;
p_sys->i_cmd = 0; p_sys->i_cmd = 0;
p_sys->i_eos = 0; p_access->info.b_eof = 0;
/* *** send command 1 : connection request *** */ /* *** send command 1 : connection request *** */
var_buffer_initwrite( &buffer, 0 ); var_buffer_initwrite( &buffer, 0 );
...@@ -489,17 +525,17 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -489,17 +525,17 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
p_url->psz_host ); p_url->psz_host );
var_buffer_addUTF16( &buffer, tmp ); var_buffer_addUTF16( &buffer, tmp );
mms_CommandSend( p_input, mms_CommandSend( p_access,
0x01, /* connexion request */ 0x01, /* connexion request */
0x00000000, /* flags, FIXME */ 0x00000000, /* flags, FIXME */
0x0004000b, /* ???? */ 0x0004000b, /* ???? */
buffer.p_data, buffer.p_data,
buffer.i_data ); buffer.i_data );
if( mms_CommandRead( p_input, 0x01, 0 ) < 0 ) if( mms_CommandRead( p_access, 0x01, 0 ) < 0 )
{ {
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_access );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -524,7 +560,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -524,7 +560,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
GETUTF16( p_sys->psz_update_player_url, i_update_player_url ); GETUTF16( p_sys->psz_update_player_url, i_update_player_url );
GETUTF16( p_sys->psz_encryption_type, i_encryption_type ); GETUTF16( p_sys->psz_encryption_type, i_encryption_type );
#undef GETUTF16 #undef GETUTF16
msg_Dbg( p_input, msg_Dbg( p_access,
"0x01 --> server_version:\"%s\" tool_version:\"%s\" update_player_url:\"%s\" encryption_type:\"%s\"", "0x01 --> server_version:\"%s\" tool_version:\"%s\" update_player_url:\"%s\" encryption_type:\"%s\"",
p_sys->psz_server_version, p_sys->psz_server_version,
p_sys->psz_tool_version, p_sys->psz_tool_version,
...@@ -552,7 +588,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -552,7 +588,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
var_buffer_addUTF16( &buffer, tmp ); var_buffer_addUTF16( &buffer, tmp );
var_buffer_add16( &buffer, '0' ); var_buffer_add16( &buffer, '0' );
mms_CommandSend( p_input, mms_CommandSend( p_access,
0x02, /* connexion request */ 0x02, /* connexion request */
0x00000000, /* flags, FIXME */ 0x00000000, /* flags, FIXME */
0xffffffff, /* ???? */ 0xffffffff, /* ???? */
...@@ -560,18 +596,18 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -560,18 +596,18 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
buffer.i_data ); buffer.i_data );
/* *** response from server, should be 0x02 or 0x03 *** */ /* *** response from server, should be 0x02 or 0x03 *** */
mms_CommandRead( p_input, 0x02, 0x03 ); mms_CommandRead( p_access, 0x02, 0x03 );
if( p_sys->i_command == 0x03 ) if( p_sys->i_command == 0x03 )
{ {
msg_Err( p_input, msg_Err( p_access,
"%s protocol selection failed", b_udp ? "UDP" : "TCP" ); "%s protocol selection failed", b_udp ? "UDP" : "TCP" );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_access );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
else if( p_sys->i_command != 0x02 ) else if( p_sys->i_command != 0x02 )
{ {
msg_Warn( p_input, "received command isn't 0x02 in reponse to 0x02" ); msg_Warn( p_access, "received command isn't 0x02 in reponse to 0x02" );
} }
/* *** send command 5 : media file name/path requested *** */ /* *** send command 5 : media file name/path requested *** */
...@@ -579,7 +615,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -579,7 +615,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
var_buffer_add64( &buffer, 0 ); var_buffer_add64( &buffer, 0 );
var_buffer_addUTF16( &buffer, p_url->psz_path ); var_buffer_addUTF16( &buffer, p_url->psz_path );
mms_CommandSend( p_input, mms_CommandSend( p_access,
0x05, 0x05,
p_sys->i_command_level, p_sys->i_command_level,
0xffffffff, 0xffffffff,
...@@ -587,24 +623,24 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -587,24 +623,24 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
buffer.i_data ); buffer.i_data );
/* *** wait for reponse *** */ /* *** wait for reponse *** */
mms_CommandRead( p_input, 0x1a, 0x06 ); mms_CommandRead( p_access, 0x1a, 0x06 );
/* test if server send 0x1A answer */ /* test if server send 0x1A answer */
if( p_sys->i_command == 0x1A ) if( p_sys->i_command == 0x1A )
{ {
msg_Err( p_input, "id/password requested (not yet supported)" ); msg_Err( p_access, "id/password requested (not yet supported)" );
/* FIXME */ /* FIXME */
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_access );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( p_sys->i_command != 0x06 ) if( p_sys->i_command != 0x06 )
{ {
msg_Err( p_input, msg_Err( p_access,
"unknown answer (0x%x instead of 0x06)", "unknown answer (0x%x instead of 0x06)",
p_sys->i_command ); p_sys->i_command );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_access );
return( -1 ); return( -1 );
} }
...@@ -612,17 +648,17 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -612,17 +648,17 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
switch( GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE ) ) switch( GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE ) )
{ {
case 0x0001: case 0x0001:
msg_Dbg( p_input, "Media file name/path accepted" ); msg_Dbg( p_access, "Media file name/path accepted" );
break; break;
case 0x0002: case 0x0002:
msg_Dbg( p_input, "Authentication accepted" ); msg_Dbg( p_access, "Authentication accepted" );
break; break;
case -1: case -1:
default: default:
msg_Err( p_input, "error while asking for file %d", msg_Err( p_access, "error while asking for file %d",
GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE ) ); GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE ) );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_access );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -639,7 +675,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -639,7 +675,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
p_sys->i_header_size = p_sys->i_header_size =
GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 60 ); GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 60 );
msg_Dbg( p_input, msg_Dbg( p_access,
"answer 0x06 flags:0x%8.8x media_length:%ds packet_length:%d packet_count:%d max_bit_rate:%d header_size:%d", "answer 0x06 flags:0x%8.8x media_length:%ds packet_length:%d packet_count:%d max_bit_rate:%d header_size:%d",
p_sys->i_flags_broadcast, p_sys->i_flags_broadcast,
p_sys->i_media_length, p_sys->i_media_length,
...@@ -648,9 +684,6 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -648,9 +684,6 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
p_sys->i_max_bit_rate, p_sys->i_max_bit_rate,
p_sys->i_header_size ); p_sys->i_header_size );
/* XXX XXX dirty hack XXX XXX */
p_input->i_mtu = 3 * p_sys->i_packet_length;
/* *** send command 15 *** */ /* *** send command 15 *** */
var_buffer_reinitwrite( &buffer, 0 ); var_buffer_reinitwrite( &buffer, 0 );
...@@ -663,45 +696,45 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -663,45 +696,45 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
var_buffer_add64( &buffer, (((uint64_t)0x40ac2000)<<32) ); var_buffer_add64( &buffer, (((uint64_t)0x40ac2000)<<32) );
var_buffer_add32( &buffer, p_sys->i_header_packet_id_type ); var_buffer_add32( &buffer, p_sys->i_header_packet_id_type );
var_buffer_add32( &buffer, 0x00 ); var_buffer_add32( &buffer, 0x00 );
mms_CommandSend( p_input, 0x15, p_sys->i_command_level, 0x00, mms_CommandSend( p_access, 0x15, p_sys->i_command_level, 0x00,
buffer.p_data, buffer.i_data ); buffer.p_data, buffer.i_data );
/* *** wait for reponse *** */ /* *** wait for reponse *** */
/* Commented out because it fails on some stream (no 0x11 answer) */ /* Commented out because it fails on some stream (no 0x11 answer) */
#if 0 #if 0
mms_CommandRead( p_input, 0x11, 0 ); mms_CommandRead( p_access, 0x11, 0 );
if( p_sys->i_command != 0x11 ) if( p_sys->i_command != 0x11 )
{ {
msg_Err( p_input, msg_Err( p_access,
"unknown answer (0x%x instead of 0x11)", "unknown answer (0x%x instead of 0x11)",
p_sys->i_command ); p_sys->i_command );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_access );
return( -1 ); return( -1 );
} }
#endif #endif
/* *** now read header packet *** */ /* *** now read header packet *** */
/* XXX could be split over multiples packets */ /* XXX could be split over multiples packets */
msg_Dbg( p_input, "reading header" ); msg_Dbg( p_access, "reading header" );
for( ;; ) for( ;; )
{ {
if( mms_HeaderMediaRead( p_input, MMS_PACKET_HEADER ) < 0 ) if( mms_HeaderMediaRead( p_access, MMS_PACKET_HEADER ) < 0 )
{ {
msg_Err( p_input, "cannot receive header" ); msg_Err( p_access, "cannot receive header" );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_access );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( p_sys->i_header >= p_sys->i_header_size ) if( p_sys->i_header >= p_sys->i_header_size )
{ {
msg_Dbg( p_input, msg_Dbg( p_access,
"header complete(%d)", "header complete(%d)",
p_sys->i_header ); p_sys->i_header );
break; break;
} }
msg_Dbg( p_input, msg_Dbg( p_access,
"header incomplete (%d/%d), reading more", "header incomplete (%d/%d), reading more",
p_sys->i_header, p_sys->i_header,
p_sys->i_header_size ); p_sys->i_header_size );
...@@ -715,10 +748,10 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -715,10 +748,10 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
E_( asf_HeaderParse )( &p_sys->asfh, E_( asf_HeaderParse )( &p_sys->asfh,
p_sys->p_header, p_sys->i_header ); p_sys->p_header, p_sys->i_header );
E_( asf_StreamSelect)( &p_sys->asfh, E_( asf_StreamSelect)( &p_sys->asfh,
config_GetInt( p_input, "mms-maxbitrate" ), config_GetInt( p_access, "mms-maxbitrate" ),
config_GetInt( p_input, "mms-all" ), config_GetInt( p_access, "mms-all" ),
config_GetInt( p_input, "audio" ), config_GetInt( p_access, "audio" ),
config_GetInt( p_input, "video" ) ); config_GetInt( p_access, "video" ) );
/* *** now select stream we want to receive *** */ /* *** now select stream we want to receive *** */
/* TODO take care of stream bitrate TODO */ /* TODO take care of stream bitrate TODO */
...@@ -744,7 +777,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -744,7 +777,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
if( p_sys->asfh.stream[i].i_selected ) if( p_sys->asfh.stream[i].i_selected )
{ {
var_buffer_add16( &buffer, 0x0000 ); var_buffer_add16( &buffer, 0x0000 );
msg_Info( p_input, msg_Info( p_access,
"selecting stream[0x%x] %s (%d kb/s)", "selecting stream[0x%x] %s (%d kb/s)",
i, i,
( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ? ( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ?
...@@ -754,7 +787,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -754,7 +787,7 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
else else
{ {
var_buffer_add16( &buffer, 0x0002 ); var_buffer_add16( &buffer, 0x0002 );
msg_Info( p_input, msg_Info( p_access,
"ignoring stream[0x%x] %s (%d kb/s)", "ignoring stream[0x%x] %s (%d kb/s)",
i, i,
( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ? ( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ?
...@@ -767,31 +800,31 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -767,31 +800,31 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
if( i_streams == 0 ) if( i_streams == 0 )
{ {
msg_Err( p_input, "cannot find any stream" ); msg_Err( p_access, "cannot find any stream" );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_access );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
mms_CommandSend( p_input, 0x33, mms_CommandSend( p_access, 0x33,
i_streams, i_streams,
0xffff | ( i_first << 16 ), 0xffff | ( i_first << 16 ),
buffer.p_data, buffer.i_data ); buffer.p_data, buffer.i_data );
mms_CommandRead( p_input, 0x21, 0 ); mms_CommandRead( p_access, 0x21, 0 );
if( p_sys->i_command != 0x21 ) if( p_sys->i_command != 0x21 )
{ {
msg_Err( p_input, msg_Err( p_access,
"unknown answer (0x%x instead of 0x21)", "unknown answer (0x%x instead of 0x21)",
p_sys->i_command ); p_sys->i_command );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_access );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
var_buffer_free( &buffer ); var_buffer_free( &buffer );
msg_Info( p_input, "connection sucessful" ); msg_Info( p_access, "connection sucessful" );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -799,9 +832,9 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto ) ...@@ -799,9 +832,9 @@ static int MMSOpen( input_thread_t *p_input, url_t *p_url, int i_proto )
/**************************************************************************** /****************************************************************************
* MMSStart : Start streaming * MMSStart : Start streaming
****************************************************************************/ ****************************************************************************/
static int MMSStart( input_thread_t *p_input, uint32_t i_packet ) static int MMSStart( access_t *p_access, uint32_t i_packet )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
var_buffer_t buffer; var_buffer_t buffer;
/* *** start stream from packet 0 *** */ /* *** start stream from packet 0 *** */
...@@ -815,16 +848,16 @@ static int MMSStart( input_thread_t *p_input, uint32_t i_packet ) ...@@ -815,16 +848,16 @@ static int MMSStart( input_thread_t *p_input, uint32_t i_packet )
var_buffer_add8( &buffer, 0x00 ); // don't use limit var_buffer_add8( &buffer, 0x00 ); // don't use limit
var_buffer_add32( &buffer, p_sys->i_media_packet_id_type ); var_buffer_add32( &buffer, p_sys->i_media_packet_id_type );
mms_CommandSend( p_input, 0x07, p_sys->i_command_level, 0x0001ffff, mms_CommandSend( p_access, 0x07, p_sys->i_command_level, 0x0001ffff,
buffer.p_data, buffer.i_data ); buffer.p_data, buffer.i_data );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
mms_CommandRead( p_input, 0x05, 0 ); mms_CommandRead( p_access, 0x05, 0 );
if( p_sys->i_command != 0x05 ) if( p_sys->i_command != 0x05 )
{ {
msg_Err( p_input, msg_Err( p_access,
"unknown answer (0x%x instead of 0x05)", "unknown answer (0x%x instead of 0x05)",
p_sys->i_command ); p_sys->i_command );
return( -1 ); return( -1 );
...@@ -832,8 +865,8 @@ static int MMSStart( input_thread_t *p_input, uint32_t i_packet ) ...@@ -832,8 +865,8 @@ static int MMSStart( input_thread_t *p_input, uint32_t i_packet )
else else
{ {
/* get a packet */ /* get a packet */
mms_HeaderMediaRead( p_input, MMS_PACKET_MEDIA ); mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA );
msg_Dbg( p_input, "Streaming started" ); msg_Dbg( p_access, "Streaming started" );
return( 0 ); return( 0 );
} }
} }
...@@ -841,12 +874,12 @@ static int MMSStart( input_thread_t *p_input, uint32_t i_packet ) ...@@ -841,12 +874,12 @@ static int MMSStart( input_thread_t *p_input, uint32_t i_packet )
/**************************************************************************** /****************************************************************************
* MMSStop : Stop streaming * MMSStop : Stop streaming
****************************************************************************/ ****************************************************************************/
static int MMSStop( input_thread_t *p_input ) static int MMSStop( access_t *p_access )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
/* *** stop stream but keep connection alive *** */ /* *** stop stream but keep connection alive *** */
mms_CommandSend( p_input, mms_CommandSend( p_access,
0x09, 0x09,
p_sys->i_command_level, p_sys->i_command_level,
0x001fffff, 0x001fffff,
...@@ -857,24 +890,24 @@ static int MMSStop( input_thread_t *p_input ) ...@@ -857,24 +890,24 @@ static int MMSStop( input_thread_t *p_input )
/**************************************************************************** /****************************************************************************
* MMSClose : Close streaming and connection * MMSClose : Close streaming and connection
****************************************************************************/ ****************************************************************************/
static void MMSClose( input_thread_t *p_input ) static void MMSClose( access_t *p_access )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
msg_Dbg( p_input, "Connection closed" ); msg_Dbg( p_access, "Connection closed" );
/* *** tell server that we will disconnect *** */ /* *** tell server that we will disconnect *** */
mms_CommandSend( p_input, mms_CommandSend( p_access,
0x0d, 0x0d,
p_sys->i_command_level, p_sys->i_command_level,
0x00000001, 0x00000001,
NULL, 0 ); NULL, 0 );
/* *** close sockets *** */ /* *** close sockets *** */
net_Close( p_sys->socket_tcp.i_handle ); net_Close( p_sys->i_handle_tcp );
if( p_sys->i_proto == MMS_PROTO_UDP ) if( p_sys->i_proto == MMS_PROTO_UDP )
{ {
net_Close( p_sys->socket_udp.i_handle ); net_Close( p_sys->i_handle_udp );
} }
FREE( p_sys->p_cmd ); FREE( p_sys->p_cmd );
...@@ -892,14 +925,14 @@ static void MMSClose( input_thread_t *p_input ) ...@@ -892,14 +925,14 @@ static void MMSClose( input_thread_t *p_input )
* MMS specific functions * MMS specific functions
* *
****************************************************************************/ ****************************************************************************/
static int mms_CommandSend( input_thread_t *p_input, static int mms_CommandSend( access_t *p_access,
int i_command, int i_command,
uint32_t i_prefix1, uint32_t i_prefix2, uint32_t i_prefix1, uint32_t i_prefix2,
uint8_t *p_data, int i_data ) uint8_t *p_data, int i_data )
{ {
var_buffer_t buffer; var_buffer_t buffer;
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
int i_data_by8; int i_data_by8;
i_data_by8 = ( i_data + 7 ) / 8; i_data_by8 = ( i_data + 7 ) / 8;
...@@ -927,12 +960,12 @@ static int mms_CommandSend( input_thread_t *p_input, ...@@ -927,12 +960,12 @@ static int mms_CommandSend( input_thread_t *p_input,
} }
/* send it */ /* send it */
if( send( p_sys->socket_tcp.i_handle, if( send( p_sys->i_handle_tcp,
buffer.p_data, buffer.p_data,
buffer.i_data, buffer.i_data,
0 ) == -1 ) 0 ) == -1 )
{ {
msg_Err( p_input, "failed to send command" ); msg_Err( p_access, "failed to send command" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -940,13 +973,13 @@ static int mms_CommandSend( input_thread_t *p_input, ...@@ -940,13 +973,13 @@ static int mms_CommandSend( input_thread_t *p_input,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
static int NetFillBuffer( input_thread_t *p_input ) static int NetFillBuffer( access_t *p_access )
{ {
#ifdef UNDER_CE #ifdef UNDER_CE
return -1; return -1;
#else #else
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
struct timeval timeout; struct timeval timeout;
fd_set fds_r, fds_e; fd_set fds_r, fds_e;
int i_ret; int i_ret;
...@@ -971,18 +1004,18 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -971,18 +1004,18 @@ static int NetFillBuffer( input_thread_t *p_input )
i_handle_max = 0; i_handle_max = 0;
if( i_tcp > 0 ) if( i_tcp > 0 )
i_handle_max = __MAX( i_handle_max, p_sys->socket_tcp.i_handle ); i_handle_max = __MAX( i_handle_max, p_sys->i_handle_tcp );
if( i_udp > 0 ) if( i_udp > 0 )
i_handle_max = __MAX( i_handle_max, p_sys->socket_udp.i_handle ); i_handle_max = __MAX( i_handle_max, p_sys->i_handle_udp );
if( i_handle_max == 0 ) if( i_handle_max == 0 )
{ {
msg_Warn( p_input, "nothing to read %d:%d", i_tcp, i_udp ); msg_Warn( p_access, "nothing to read %d:%d", i_tcp, i_udp );
return 0; return 0;
} }
else else
{ {
/* msg_Warn( p_input, "ask for tcp:%d udp:%d", i_tcp, i_udp ); */ /* msg_Warn( p_access, "ask for tcp:%d udp:%d", i_tcp, i_udp ); */
} }
/* Find if some data is available */ /* Find if some data is available */
...@@ -996,13 +1029,13 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -996,13 +1029,13 @@ static int NetFillBuffer( input_thread_t *p_input )
if( i_tcp > 0 ) if( i_tcp > 0 )
{ {
FD_SET( p_sys->socket_tcp.i_handle, &fds_r ); FD_SET( p_sys->i_handle_tcp, &fds_r );
FD_SET( p_sys->socket_tcp.i_handle, &fds_e ); FD_SET( p_sys->i_handle_tcp, &fds_e );
} }
if( i_udp > 0 ) if( i_udp > 0 )
{ {
FD_SET( p_sys->socket_udp.i_handle, &fds_r ); FD_SET( p_sys->i_handle_udp, &fds_r );
FD_SET( p_sys->socket_udp.i_handle, &fds_e ); FD_SET( p_sys->i_handle_udp, &fds_e );
} }
/* We'll wait 0.5 second if nothing happens */ /* We'll wait 0.5 second if nothing happens */
...@@ -1014,32 +1047,32 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1014,32 +1047,32 @@ static int NetFillBuffer( input_thread_t *p_input )
return -1; return -1;
} }
if( p_input->b_die || p_input->b_error ) return -1; if( p_access->b_die || p_access->b_error ) return -1;
//msg_Dbg( p_input, "NetFillBuffer: trying again (select)" ); //msg_Dbg( p_access, "NetFillBuffer: trying again (select)" );
} while( !(i_ret = select(i_handle_max +1, &fds_r, 0, &fds_e, &timeout)) || } while( !(i_ret = select(i_handle_max +1, &fds_r, 0, &fds_e, &timeout)) ||
(i_ret < 0 && errno == EINTR) ); (i_ret < 0 && errno == EINTR) );
if( i_ret < 0 ) if( i_ret < 0 )
{ {
msg_Err( p_input, "network select error (%s)", strerror(errno) ); msg_Err( p_access, "network select error (%s)", strerror(errno) );
return -1; return -1;
} }
i_tcp_read = i_udp_read = 0; i_tcp_read = i_udp_read = 0;
if( i_tcp > 0 && FD_ISSET( p_sys->socket_tcp.i_handle, &fds_r ) ) if( i_tcp > 0 && FD_ISSET( p_sys->i_handle_tcp, &fds_r ) )
{ {
i_tcp_read = i_tcp_read =
recv( p_sys->socket_tcp.i_handle, recv( p_sys->i_handle_tcp,
p_sys->buffer_tcp + p_sys->i_buffer_tcp, p_sys->buffer_tcp + p_sys->i_buffer_tcp,
i_tcp + MMS_BUFFER_SIZE/2, 0 ); i_tcp + MMS_BUFFER_SIZE/2, 0 );
} }
if( i_udp > 0 && FD_ISSET( p_sys->socket_udp.i_handle, &fds_r ) ) if( i_udp > 0 && FD_ISSET( p_sys->i_handle_udp, &fds_r ) )
{ {
i_udp_read = recv( p_sys->socket_udp.i_handle, i_udp_read = recv( p_sys->i_handle_udp,
p_sys->buffer_udp + p_sys->i_buffer_udp, p_sys->buffer_udp + p_sys->i_buffer_udp,
i_udp + MMS_BUFFER_SIZE/2, 0 ); i_udp + MMS_BUFFER_SIZE/2, 0 );
} }
...@@ -1047,13 +1080,13 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1047,13 +1080,13 @@ static int NetFillBuffer( input_thread_t *p_input )
#if MMS_DEBUG #if MMS_DEBUG
if( p_sys->i_proto == MMS_PROTO_UDP ) if( p_sys->i_proto == MMS_PROTO_UDP )
{ {
msg_Dbg( p_input, "filling buffer TCP:%d+%d UDP:%d+%d", msg_Dbg( p_access, "filling buffer TCP:%d+%d UDP:%d+%d",
p_sys->i_buffer_tcp, i_tcp_read, p_sys->i_buffer_tcp, i_tcp_read,
p_sys->i_buffer_udp, i_udp_read ); p_sys->i_buffer_udp, i_udp_read );
} }
else else
{ {
msg_Dbg( p_input, "filling buffer TCP:%d+%d", msg_Dbg( p_access, "filling buffer TCP:%d+%d",
p_sys->i_buffer_tcp, i_tcp_read ); p_sys->i_buffer_tcp, i_tcp_read );
} }
#endif #endif
...@@ -1065,7 +1098,7 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1065,7 +1098,7 @@ static int NetFillBuffer( input_thread_t *p_input )
#endif #endif
} }
static int mms_ParseCommand( input_thread_t *p_input, static int mms_ParseCommand( access_t *p_access,
uint8_t *p_data, uint8_t *p_data,
int i_data, int i_data,
int *pi_used ) int *pi_used )
...@@ -1075,7 +1108,7 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1075,7 +1108,7 @@ static int mms_ParseCommand( input_thread_t *p_input,
( p_sys->p_cmd[i_pos + 2] << 16 ) + \ ( p_sys->p_cmd[i_pos + 2] << 16 ) + \
( p_sys->p_cmd[i_pos + 3] << 24 ) ) ( p_sys->p_cmd[i_pos + 3] << 24 ) )
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
int i_length; int i_length;
uint32_t i_id; uint32_t i_id;
...@@ -1091,7 +1124,7 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1091,7 +1124,7 @@ static int mms_ParseCommand( input_thread_t *p_input,
if( i_data < MMS_CMD_HEADERSIZE ) if( i_data < MMS_CMD_HEADERSIZE )
{ {
msg_Warn( p_input, "truncated command (header incomplete)" ); msg_Warn( p_access, "truncated command (header incomplete)" );
p_sys->i_command = 0; p_sys->i_command = 0;
return -1; return -1;
} }
...@@ -1100,7 +1133,7 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1100,7 +1133,7 @@ static int mms_ParseCommand( input_thread_t *p_input,
if( i_id != 0xb00bface ) if( i_id != 0xb00bface )
{ {
msg_Err( p_input, msg_Err( p_access,
"incorrect command header (0x%x)", i_id ); "incorrect command header (0x%x)", i_id );
p_sys->i_command = 0; p_sys->i_command = 0;
return -1; return -1;
...@@ -1108,7 +1141,7 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1108,7 +1141,7 @@ static int mms_ParseCommand( input_thread_t *p_input,
if( i_length > p_sys->i_cmd ) if( i_length > p_sys->i_cmd )
{ {
msg_Warn( p_input, msg_Warn( p_access,
"truncated command (missing %d bytes)", "truncated command (missing %d bytes)",
i_length - i_data ); i_length - i_data );
p_sys->i_command = 0; p_sys->i_command = 0;
...@@ -1120,7 +1153,7 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1120,7 +1153,7 @@ static int mms_ParseCommand( input_thread_t *p_input,
*pi_used = i_length; *pi_used = i_length;
} }
msg_Dbg( p_input, msg_Dbg( p_access,
"recv command start_sequence:0x%8.8x command_id:0x%8.8x length:%d len8:%d sequence 0x%8.8x len8_II:%d dir_comm:0x%8.8x", "recv command start_sequence:0x%8.8x command_id:0x%8.8x length:%d len8:%d sequence 0x%8.8x len8_II:%d dir_comm:0x%8.8x",
GET32( 0 ), GET32( 0 ),
GET32( 4 ), GET32( 4 ),
...@@ -1141,11 +1174,11 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1141,11 +1174,11 @@ static int mms_ParseCommand( input_thread_t *p_input,
return MMS_PACKET_CMD; return MMS_PACKET_CMD;
} }
static int mms_ParsePacket( input_thread_t *p_input, static int mms_ParsePacket( access_t *p_access,
uint8_t *p_data, size_t i_data, uint8_t *p_data, size_t i_data,
int *pi_used ) int *pi_used )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
int i_packet_seq_num; int i_packet_seq_num;
size_t i_packet_length; size_t i_packet_length;
uint32_t i_packet_id; uint32_t i_packet_id;
...@@ -1156,7 +1189,7 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1156,7 +1189,7 @@ static int mms_ParsePacket( input_thread_t *p_input,
*pi_used = i_data; /* default */ *pi_used = i_data; /* default */
if( i_data <= 8 ) if( i_data <= 8 )
{ {
msg_Warn( p_input, "truncated packet (header incomplete)" ); msg_Warn( p_access, "truncated packet (header incomplete)" );
return -1; return -1;
} }
...@@ -1164,11 +1197,11 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1164,11 +1197,11 @@ static int mms_ParsePacket( input_thread_t *p_input,
i_packet_seq_num = GetDWLE( p_data ); i_packet_seq_num = GetDWLE( p_data );
i_packet_length = GetWLE( p_data + 6 ); i_packet_length = GetWLE( p_data + 6 );
//msg_Warn( p_input, "------->i_packet_length=%d, i_data=%d", i_packet_length, i_data ); //msg_Warn( p_access, "------->i_packet_length=%d, i_data=%d", i_packet_length, i_data );
if( i_packet_length > i_data || i_packet_length <= 8) if( i_packet_length > i_data || i_packet_length <= 8)
{ {
msg_Dbg( p_input, msg_Dbg( p_access,
"truncated packet (missing %d bytes)", "truncated packet (missing %d bytes)",
i_packet_length - i_data ); i_packet_length - i_data );
*pi_used = 0; *pi_used = 0;
...@@ -1181,7 +1214,7 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1181,7 +1214,7 @@ static int mms_ParsePacket( input_thread_t *p_input,
if( i_packet_id == 0xff ) if( i_packet_id == 0xff )
{ {
msg_Warn( p_input, msg_Warn( p_access,
"receive MMS UDP pair timing" ); "receive MMS UDP pair timing" );
return( MMS_PACKET_UDP_TIMING ); return( MMS_PACKET_UDP_TIMING );
} }
...@@ -1189,7 +1222,7 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1189,7 +1222,7 @@ static int mms_ParsePacket( input_thread_t *p_input,
if( i_packet_id != p_sys->i_header_packet_id_type && if( i_packet_id != p_sys->i_header_packet_id_type &&
i_packet_id != p_sys->i_media_packet_id_type ) i_packet_id != p_sys->i_media_packet_id_type )
{ {
msg_Warn( p_input, "incorrect Packet Id Type (0x%x)", i_packet_id ); msg_Warn( p_access, "incorrect Packet Id Type (0x%x)", i_packet_id );
return -1; return -1;
} }
...@@ -1200,7 +1233,7 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1200,7 +1233,7 @@ static int mms_ParsePacket( input_thread_t *p_input,
if( i_packet_seq_num != p_sys->i_packet_seq_num ) if( i_packet_seq_num != p_sys->i_packet_seq_num )
{ {
/* FIXME for udp could be just wrong order ? */ /* FIXME for udp could be just wrong order ? */
msg_Warn( p_input, msg_Warn( p_access,
"detected packet lost (%d != %d)", "detected packet lost (%d != %d)",
i_packet_seq_num, i_packet_seq_num,
p_sys->i_packet_seq_num ); p_sys->i_packet_seq_num );
...@@ -1226,7 +1259,7 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1226,7 +1259,7 @@ static int mms_ParsePacket( input_thread_t *p_input,
p_sys->p_header = p_packet; p_sys->p_header = p_packet;
p_sys->i_header = i_packet_length - 8; p_sys->i_header = i_packet_length - 8;
} }
/* msg_Dbg( p_input, /* msg_Dbg( p_access,
"receive header packet (%d bytes)", "receive header packet (%d bytes)",
i_packet_length - 8 ); */ i_packet_length - 8 ); */
...@@ -1238,7 +1271,7 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1238,7 +1271,7 @@ static int mms_ParsePacket( input_thread_t *p_input,
p_sys->p_media = p_packet; p_sys->p_media = p_packet;
p_sys->i_media = i_packet_length - 8; p_sys->i_media = i_packet_length - 8;
p_sys->i_media_used = 0; p_sys->i_media_used = 0;
/* msg_Dbg( p_input, /* msg_Dbg( p_access,
"receive media packet (%d bytes)", "receive media packet (%d bytes)",
i_packet_length - 8 ); */ i_packet_length - 8 ); */
...@@ -1246,9 +1279,9 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1246,9 +1279,9 @@ static int mms_ParsePacket( input_thread_t *p_input,
} }
} }
static int mms_ReceivePacket( input_thread_t *p_input ) static int mms_ReceivePacket( access_t *p_access )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
int i_packet_tcp_type; int i_packet_tcp_type;
int i_packet_udp_type; int i_packet_udp_type;
...@@ -1278,9 +1311,9 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1278,9 +1311,9 @@ static int mms_ReceivePacket( input_thread_t *p_input )
b_refill = VLC_FALSE; b_refill = VLC_FALSE;
} }
if( b_refill && NetFillBuffer( p_input ) < 0 ) if( b_refill && NetFillBuffer( p_access ) < 0 )
{ {
msg_Warn( p_input, "cannot fill buffer" ); msg_Warn( p_access, "cannot fill buffer" );
return -1; return -1;
} }
...@@ -1294,14 +1327,14 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1294,14 +1327,14 @@ static int mms_ReceivePacket( input_thread_t *p_input )
if( GetDWLE( p_sys->buffer_tcp + 4 ) == 0xb00bface ) if( GetDWLE( p_sys->buffer_tcp + 4 ) == 0xb00bface )
{ {
i_packet_tcp_type = i_packet_tcp_type =
mms_ParseCommand( p_input, p_sys->buffer_tcp, mms_ParseCommand( p_access, p_sys->buffer_tcp,
p_sys->i_buffer_tcp, &i_used ); p_sys->i_buffer_tcp, &i_used );
} }
else else
{ {
i_packet_tcp_type = i_packet_tcp_type =
mms_ParsePacket( p_input, p_sys->buffer_tcp, mms_ParsePacket( p_access, p_sys->buffer_tcp,
p_sys->i_buffer_tcp, &i_used ); p_sys->i_buffer_tcp, &i_used );
} }
if( i_used > 0 && i_used < MMS_BUFFER_SIZE ) if( i_used > 0 && i_used < MMS_BUFFER_SIZE )
...@@ -1316,7 +1349,7 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1316,7 +1349,7 @@ static int mms_ReceivePacket( input_thread_t *p_input )
int i_used; int i_used;
i_packet_udp_type = i_packet_udp_type =
mms_ParsePacket( p_input, p_sys->buffer_udp, mms_ParsePacket( p_access, p_sys->buffer_udp,
p_sys->i_buffer_udp, &i_used ); p_sys->i_buffer_udp, &i_used );
if( i_used > 0 && i_used < MMS_BUFFER_SIZE ) if( i_used > 0 && i_used < MMS_BUFFER_SIZE )
...@@ -1329,7 +1362,7 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1329,7 +1362,7 @@ static int mms_ReceivePacket( input_thread_t *p_input )
if( i_packet_tcp_type == MMS_PACKET_CMD && p_sys->i_command == 0x1b ) if( i_packet_tcp_type == MMS_PACKET_CMD && p_sys->i_command == 0x1b )
{ {
mms_CommandSend( p_input, 0x1b, 0, 0, NULL, 0 ); mms_CommandSend( p_access, 0x1b, 0, 0, NULL, 0 );
i_packet_tcp_type = -1; i_packet_tcp_type = -1;
} }
...@@ -1344,23 +1377,23 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1344,23 +1377,23 @@ static int mms_ReceivePacket( input_thread_t *p_input )
} }
} }
static int mms_ReceiveCommand( input_thread_t *p_input ) static int mms_ReceiveCommand( access_t *p_access )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
for( ;; ) for( ;; )
{ {
int i_used; int i_used;
int i_status; int i_status;
if( NetFillBuffer( p_input ) < 0 ) if( NetFillBuffer( p_access ) < 0 )
{ {
msg_Warn( p_input, "cannot fill buffer" ); msg_Warn( p_access, "cannot fill buffer" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
if( p_sys->i_buffer_tcp > 0 ) if( p_sys->i_buffer_tcp > 0 )
{ {
i_status = mms_ParseCommand( p_input, p_sys->buffer_tcp, i_status = mms_ParseCommand( p_access, p_sys->buffer_tcp,
p_sys->i_buffer_tcp, &i_used ); p_sys->i_buffer_tcp, &i_used );
if( i_used < MMS_BUFFER_SIZE ) if( i_used < MMS_BUFFER_SIZE )
{ {
...@@ -1376,7 +1409,7 @@ static int mms_ReceiveCommand( input_thread_t *p_input ) ...@@ -1376,7 +1409,7 @@ static int mms_ReceiveCommand( input_thread_t *p_input )
if( p_sys->i_command == 0x1b ) if( p_sys->i_command == 0x1b )
{ {
mms_CommandSend( p_input, 0x1b, 0, 0, NULL, 0 ); mms_CommandSend( p_access, 0x1b, 0, 0, NULL, 0 );
} }
else else
{ {
...@@ -1395,16 +1428,16 @@ static int mms_ReceiveCommand( input_thread_t *p_input ) ...@@ -1395,16 +1428,16 @@ static int mms_ReceiveCommand( input_thread_t *p_input )
#define MMS_RETRY_MAX 10 #define MMS_RETRY_MAX 10
#define MMS_RETRY_SLEEP 50000 #define MMS_RETRY_SLEEP 50000
static int mms_CommandRead( input_thread_t *p_input, int i_command1, static int mms_CommandRead( access_t *p_access, int i_command1,
int i_command2 ) int i_command2 )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
int i_count; int i_count;
int i_status; int i_status;
for( i_count = 0; i_count < MMS_RETRY_MAX; ) for( i_count = 0; i_count < MMS_RETRY_MAX; )
{ {
i_status = mms_ReceiveCommand( p_input ); i_status = mms_ReceiveCommand( p_access );
if( i_status < 0 || p_sys->i_command == 0 ) if( i_status < 0 || p_sys->i_command == 0 )
{ {
i_count++; i_count++;
...@@ -1424,38 +1457,41 @@ static int mms_CommandRead( input_thread_t *p_input, int i_command1, ...@@ -1424,38 +1457,41 @@ static int mms_CommandRead( input_thread_t *p_input, int i_command1,
switch( p_sys->i_command ) switch( p_sys->i_command )
{ {
case 0x03: case 0x03:
msg_Warn( p_input, "socket closed by server" ); msg_Warn( p_access, "socket closed by server" );
p_sys->i_eos = 1; p_access->info.b_eof = 1;
return VLC_EGENERIC; return VLC_EGENERIC;
case 0x1e: case 0x1e:
msg_Warn( p_input, "end of media stream" ); msg_Warn( p_access, "end of media stream" );
p_sys->i_eos = 1; p_access->info.b_eof = 1;
return VLC_EGENERIC; return VLC_EGENERIC;
default: default:
break; break;
} }
} }
} }
msg_Warn( p_input, "failed to receive command (aborting)" ); msg_Warn( p_access, "failed to receive command (aborting)" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type ) static int mms_HeaderMediaRead( access_t *p_access, int i_type )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_access->p_sys;
int i_count; int i_count;
for( i_count = 0; i_count < MMS_RETRY_MAX; ) for( i_count = 0; i_count < MMS_RETRY_MAX; )
{ {
int i_status; int i_status;
i_status = mms_ReceivePacket( p_input ); if( p_access->b_die )
return -1;
i_status = mms_ReceivePacket( p_access );
if( i_status < 0 ) if( i_status < 0 )
{ {
i_count++; i_count++;
msg_Warn( p_input, "cannot receive header (%d/%d)", msg_Warn( p_access, "cannot receive header (%d/%d)",
i_count, MMS_RETRY_MAX ); i_count, MMS_RETRY_MAX );
msleep( MMS_RETRY_SLEEP ); msleep( MMS_RETRY_SLEEP );
} }
...@@ -1468,20 +1504,20 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type ) ...@@ -1468,20 +1504,20 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type )
switch( p_sys->i_command ) switch( p_sys->i_command )
{ {
case 0x03: case 0x03:
msg_Warn( p_input, "socket closed by server" ); msg_Warn( p_access, "socket closed by server" );
p_sys->i_eos = 1; p_access->info.b_eof = 1;
return -1; return -1;
case 0x1e: case 0x1e:
msg_Warn( p_input, "end of media stream" ); msg_Warn( p_access, "end of media stream" );
p_sys->i_eos = 1; p_access->info.b_eof = 1;
return -1; return -1;
case 0x20: case 0x20:
/* XXX not too dificult to be done EXCEPT that we /* XXX not too dificult to be done EXCEPT that we
* need to restart demuxer... and I don't see how we * need to restart demuxer... and I don't see how we
* could do that :p */ * could do that :p */
msg_Err( p_input, msg_Err( p_access,
"reinitialization needed --> unsupported" ); "reinitialization needed --> unsupported" );
p_sys->i_eos = 1; p_access->info.b_eof = VLC_TRUE;
return -1; return -1;
default: default:
break; break;
...@@ -1489,9 +1525,8 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type ) ...@@ -1489,9 +1525,8 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type )
} }
} }
msg_Err( p_input, "cannot receive %s (aborting)", msg_Err( p_access, "cannot receive %s (aborting)",
( i_type == MMS_PACKET_HEADER ) ? "header" : "media data" ); ( i_type == MMS_PACKET_HEADER ) ? "header" : "media data" );
return -1; return -1;
} }
modules/access/mms/mmstu.h
View file @ df3ce87c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mms.h: MMS access plug-in * mms.h: MMS access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: mmstu.h,v 1.1 2003/04/20 19:29:43 fenrir Exp $ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -21,23 +21,6 @@ ...@@ -21,23 +21,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
#if 0
/* url: [/]host[:port][/path] */
typedef struct url_s
{
char *psz_server_addr;
int i_server_port;
char *psz_bind_addr;
int i_bind_port;
char *psz_path;
/* private */
char *psz_private;
} url_t;
#endif
#define MMS_PACKET_ANY 0 #define MMS_PACKET_ANY 0
#define MMS_PACKET_CMD 1 #define MMS_PACKET_CMD 1
#define MMS_PACKET_HEADER 2 #define MMS_PACKET_HEADER 2
...@@ -47,36 +30,19 @@ typedef struct url_s ...@@ -47,36 +30,19 @@ typedef struct url_s
#define MMS_CMD_HEADERSIZE 48 #define MMS_CMD_HEADERSIZE 48
#if 0
#define MMS_STREAM_VIDEO 0x0001
#define MMS_STREAM_AUDIO 0x0002
#define MMS_STREAM_UNKNOWN 0xffff
typedef struct mms_stream_s
{
int i_id; /* 1 -> 127 */
int i_cat; /* MMS_STREAM_VIDEO, MMS_STREAM_AUDIO */
int i_bitrate; /* -1 if unknown */
int i_selected;
} mms_stream_t;
#endif
#define MMS_BUFFER_SIZE 100000 #define MMS_BUFFER_SIZE 100000
struct access_sys_t struct access_sys_t
{ {
int i_proto; /* MMS_PROTO_TCP, MMS_PROTO_UDP */ int i_proto; /* MMS_PROTO_TCP, MMS_PROTO_UDP */
input_socket_t socket_tcp; /* TCP socket for communication with server */ int i_handle_tcp; /* TCP socket for communication with server */
input_socket_t socket_udp; /* Optional UDP socket for data(media/header packet) */ int i_handle_udp; /* Optional UDP socket for data(media/header packet) */
/* send by server */ /* send by server */
char *psz_bind_addr; /* used by udp */ char *psz_bind_addr; /* used by udp */
url_t *p_url; /* connect to this server */ vlc_url_t url;
//asf_stream_t stream[128]; /* in asf never more than 1->127 streams */
asf_header_t asfh; asf_header_t asfh;
off_t i_pos; /* position of next byte to be read */
/* */ /* */
uint8_t buffer_tcp[MMS_BUFFER_SIZE]; uint8_t buffer_tcp[MMS_BUFFER_SIZE];
int i_buffer_tcp; int i_buffer_tcp;
...@@ -105,7 +71,6 @@ struct access_sys_t ...@@ -105,7 +71,6 @@ struct access_sys_t
/* extracted informations */ /* extracted informations */
int i_command; int i_command;
int i_eos;
/* from 0x01 answer (not yet set) */ /* from 0x01 answer (not yet set) */
char *psz_server_version; char *psz_server_version;
...@@ -121,5 +86,7 @@ struct access_sys_t ...@@ -121,5 +86,7 @@ struct access_sys_t
int i_max_bit_rate; int i_max_bit_rate;
int i_header_size; int i_header_size;
/* */
vlc_bool_t b_seekable;
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment