/*****************************************************************************
- * mms.c: MMS access plug-in
+ * mmstu.c: MMS access plug-in
*****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <errno.h>
#include <assert.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
#ifdef HAVE_POLL
# include <poll.h>
#endif
#include <vlc_network.h>
-#include "vlc_url.h"
+#include <vlc_url.h>
#include "asf.h"
#include "buffer.h"
void MMSTUClose ( access_t * );
-static ssize_t Read( access_t *, uint8_t *, size_t );
-static int Seek( access_t *, int64_t );
+static block_t *Block( access_t * );
+static int Seek( access_t *, uint64_t );
static int Control( access_t *, int, va_list );
static int MMSOpen ( access_t *, vlc_url_t *, int );
static int mms_ReceivePacket( access_t * );
-static void* KeepAliveThread( void * );
+static void KeepAliveStart( access_t * );
+static void KeepAliveStop( access_t * );
int MMSTUOpen( access_t *p_access )
{
int i_status;
/* Set up p_access */
- p_access->pf_read = Read;
- p_access->pf_block = NULL;
+ access_InitFields( p_access );
+ p_access->pf_read = NULL;
+ p_access->pf_block = Block;
p_access->pf_control = Control;
p_access->pf_seek = Seek;
- p_access->info.i_update = 0;
- p_access->info.i_size = 0;
- p_access->info.i_pos = 0;
- p_access->info.b_eof = false;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
- p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
+
+ p_access->p_sys = p_sys = calloc( 1, sizeof( access_sys_t ) );
if( !p_sys ) return VLC_ENOMEM;
- memset( p_sys, 0, sizeof( access_sys_t ) );
p_sys->i_timeout = var_CreateGetInteger( p_access, "mms-timeout" );
vlc_mutex_init( &p_sys->lock_netwrite );
/* *** Parse URL and get server addr/port and path *** */
- vlc_UrlParse( &p_sys->url, p_access->psz_path, 0 );
+ vlc_UrlParse( &p_sys->url, p_access->psz_location, 0 );
if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' )
{
msg_Err( p_access, "invalid server name" );
{ /* first try with TCP and then UDP*/
if( ( i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_TCP ) ) )
{
- if( !p_access->b_die )
+ if( vlc_object_alive(p_access) )
i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_UDP );
}
}
else
{
p_sys->b_seekable = true;
- p_access->info.i_size =
+ p_sys->i_size =
(uint64_t)p_sys->i_header +
(uint64_t)p_sys->i_packet_count * (uint64_t)p_sys->i_packet_length;
}
+ p_sys->b_keep_alive = false;
/* *** Start stream *** */
if( MMSStart( p_access, 0xffffffff ) < 0 )
return VLC_EGENERIC;
}
- /* Keep the connection alive when paused */
- p_sys->p_keepalive = malloc( sizeof( mmstu_keepalive_t ) );
- p_sys->p_keepalive->p_access = p_access;
- vlc_mutex_init( &p_sys->p_keepalive->lock );
- vlc_cond_init( &p_sys->p_keepalive->wait );
- p_sys->p_keepalive->b_paused = false;
- if( vlc_clone( &p_sys->p_keepalive->handle, KeepAliveThread,
- p_sys->p_keepalive, VLC_THREAD_PRIORITY_LOW ) )
- {
- vlc_cond_destroy( &p_sys->p_keepalive->wait );
- vlc_mutex_destroy( &p_sys->p_keepalive->lock );
- free( p_sys->p_keepalive );
- p_sys->p_keepalive = NULL;
- }
-
return VLC_SUCCESS;
}
{
access_sys_t *p_sys = p_access->p_sys;
- if( p_sys->p_keepalive )
- {
- vlc_cancel( p_sys->p_keepalive->handle );
- vlc_join( p_sys->p_keepalive->handle, NULL );
- vlc_cond_destroy( &p_sys->p_keepalive->wait );
- vlc_mutex_destroy( &p_sys->p_keepalive->lock );
- free( p_sys->p_keepalive );
- }
+ KeepAliveStop( p_access );
/* close connection with server */
MMSClose( p_access );
/* free memory */
vlc_UrlClean( &p_sys->url );
- vlc_mutex_destroy( &p_sys->lock_netwrite );
free( p_sys );
}
access_sys_t *p_sys = p_access->p_sys;
bool *pb_bool;
bool b_bool;
- int *pi_int;
int64_t *pi_64;
int i_int;
- vlc_value_t val;
switch( i_query )
{
- /* */
case ACCESS_CAN_SEEK:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = p_sys->b_seekable;
*pb_bool = true;
break;
- /* */
- case ACCESS_GET_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = 3 * p_sys->i_packet_length;
+ case ACCESS_GET_SIZE:
+ *va_arg( args, uint64_t * ) = p_sys->i_size;
break;
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- var_Get( p_access, "mms-caching", &val );
- *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
+ *pi_64 = INT64_C(1000)
+ * var_InheritInteger( p_access, "network-caching" );
break;
case ACCESS_GET_PRIVATE_ID_STATE:
*pb_bool = p_sys->asfh.stream[i_int].i_selected ? true : false;
break;
- /* */
case ACCESS_SET_PAUSE_STATE:
b_bool = (bool)va_arg( args, int );
if( b_bool )
+ {
MMSStop( p_access );
+ KeepAliveStart( p_access );
+ }
else
+ {
+ KeepAliveStop( p_access );
Seek( p_access, p_access->info.i_pos );
-
- vlc_mutex_lock( &p_sys->p_keepalive->lock );
- p_sys->p_keepalive->b_paused = b_bool;
- if( b_bool )
- vlc_cond_signal( &p_sys->p_keepalive->wait );
- vlc_mutex_unlock( &p_sys->p_keepalive->lock );
+ }
break;
- case ACCESS_GET_TITLE_INFO:
- case ACCESS_SET_TITLE:
- case ACCESS_SET_SEEKPOINT:
- case ACCESS_SET_PRIVATE_ID_STATE:
- case ACCESS_GET_CONTENT_TYPE:
- return VLC_EGENERIC;
-
-
default:
- msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
-
}
return VLC_SUCCESS;
}
/*****************************************************************************
* Seek: try to go at the right place
*****************************************************************************/
-static int Seek( access_t * p_access, int64_t i_pos )
+static int Seek( access_t * p_access, uint64_t i_pos )
{
access_sys_t *p_sys = p_access->p_sys;
uint32_t i_packet;
uint32_t i_offset;
var_buffer_t buffer;
- if( i_pos < 0 )
- return VLC_EGENERIC;
-
if( 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
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;
}
- msg_Dbg( p_access, "seeking to %"PRId64 " (packet:%d)", i_pos, i_packet );
+ if( p_sys->b_seekable && i_packet >= p_sys->i_packet_count )
+ return VLC_EGENERIC;
+
+ msg_Dbg( p_access, "seeking to %"PRIu64 " (packet:%u)", i_pos, i_packet );
MMSStop( p_access );
msg_Dbg( p_access, "stream stopped (seek)" );
}
/*****************************************************************************
- * Read:
+ * Block:
*****************************************************************************/
-static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
+static block_t *Block( access_t *p_access )
{
access_sys_t *p_sys = p_access->p_sys;
- size_t i_data;
- size_t i_copy;
if( p_access->info.b_eof )
+ return NULL;
+
+ if( p_access->info.i_pos < p_sys->i_header )
{
- return 0;
- }
+ const size_t i_copy = p_sys->i_header - p_access->info.i_pos;
- i_data = 0;
+ block_t *p_block = block_Alloc( i_copy );
+ if( !p_block )
+ return NULL;
- /* *** now send data if needed *** */
- while( i_data < i_len )
+ memcpy( p_block->p_buffer, &p_sys->p_header[p_access->info.i_pos], i_copy );
+ p_access->info.i_pos += i_copy;
+ return p_block;
+ }
+ else if( p_sys->p_media && p_sys->i_media_used < __MAX( p_sys->i_media, p_sys->i_packet_length ) )
{
- if( p_access->info.i_pos < p_sys->i_header )
- {
- i_copy = __MIN( i_len, p_sys->i_header - p_access->info.i_pos );
- memcpy( &p_buffer[i_data], &p_sys->p_header[p_access->info.i_pos], i_copy );
- i_data += i_copy;
- p_access->info.i_pos += i_copy;
- }
- else if( p_sys->i_media_used < p_sys->i_media )
- {
- i_copy = __MIN( i_len - i_data ,
- p_sys->i_media - p_sys->i_media_used );
- memcpy( &p_buffer[i_data], &p_sys->p_media[p_sys->i_media_used], i_copy );
- i_data += i_copy;
- p_sys->i_media_used += i_copy;
- p_access->info.i_pos += i_copy;
- }
- else if( p_sys->p_media != NULL &&
- p_sys->i_media_used < p_sys->i_packet_length )
- {
- i_copy = __MIN( i_len - i_data,
- p_sys->i_packet_length - p_sys->i_media_used);
- memset( &p_buffer[i_data], 0, i_copy );
+ size_t i_copy = 0;
+ size_t i_padding = 0;
- i_data += i_copy;
- p_sys->i_media_used += i_copy;
- p_access->info.i_pos += i_copy;
- }
- else if( p_access->info.b_eof ||
- mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA ) < 0 )
- {
- break;
- }
+ if( p_sys->i_media_used < p_sys->i_media )
+ i_copy = p_sys->i_media - p_sys->i_media_used;
+ if( __MAX( p_sys->i_media, p_sys->i_media_used ) < p_sys->i_packet_length )
+ i_padding = p_sys->i_packet_length - __MAX( p_sys->i_media, p_sys->i_media_used );
+
+ block_t *p_block = block_Alloc( i_copy + i_padding );
+ if( !p_block )
+ return NULL;
+
+ if( i_copy > 0 )
+ memcpy( &p_block->p_buffer[0], &p_sys->p_media[p_sys->i_media_used], i_copy );
+ if( i_padding > 0 )
+ memset( &p_block->p_buffer[i_copy], 0, i_padding );
+
+ p_sys->i_media_used += i_copy + i_padding;
+ p_access->info.i_pos += i_copy + i_padding;
+ return p_block;
}
- return i_data;
+ mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA );
+ return NULL;
}
/****************************************************************************
int b_udp = ( i_proto == MMS_PROTO_UDP ) ? 1 : 0;
var_buffer_t buffer;
- char tmp[4096];
+ char *tmp;
uint16_t *p;
int i_server_version;
int i_tool_version;
var_buffer_initwrite( &buffer, 0 );
var_buffer_add16( &buffer, 0x001c );
var_buffer_add16( &buffer, 0x0003 );
- sprintf( tmp,
+ if( asprintf( &tmp,
"NSPlayer/7.0.0.1956; {"GUID_FMT"}; Host: %s",
GUID_PRINT( p_sys->guid ),
- p_url->psz_host );
- var_buffer_addUTF16( &buffer, tmp );
+ p_url->psz_host ) < 0 )
+ {
+ var_buffer_free( &buffer );
+ net_Close( p_sys->i_handle_tcp );
+ return VLC_ENOMEM;
+ }
+
+ var_buffer_addUTF16( p_access, &buffer, tmp );
+ free( tmp );
mms_CommandSend( p_access,
0x01, /* connexion request */
#define GETUTF16( psz, size ) \
{ \
int i; \
- psz = malloc( size + 1); \
+ psz = xmalloc( size + 1); \
for( i = 0; i < size; i++ ) \
{ \
psz[i] = p[i]; \
var_buffer_add32( &buffer, 0x00000002 );
if( b_udp )
{
- sprintf( tmp,
- "\\\\%s\\UDP\\%d",
- p_sys->sz_bind_addr,
- 7000 ); // FIXME
+ if( asprintf( &tmp,
+ "\\\\%s\\UDP\\%d",
+ p_sys->sz_bind_addr,
+ 7000 ) < 0) // FIXME
+ {
+ var_buffer_free( &buffer );
+ MMSClose( p_access );
+ return VLC_EGENERIC;
+ }
}
else
{
- sprintf( tmp, "\\\\192.168.0.1\\TCP\\1242" );
+ if( asprintf( &tmp, "\\\\192.168.0.1\\TCP\\1242" ) < 0 )
+ {
+ var_buffer_free( &buffer );
+ MMSClose( p_access );
+ return VLC_EGENERIC;
+ }
}
- var_buffer_addUTF16( &buffer, tmp );
+ var_buffer_addUTF16( p_access, &buffer, tmp );
var_buffer_add16( &buffer, '0' );
+ free( tmp );
mms_CommandSend( p_access,
0x02, /* connexion request */
/* media file path shouldn't start with / character */
mediapath = p_url->psz_path;
- if ( *mediapath == '/' )
+ if ( mediapath && *mediapath == '/' )
{
mediapath++;
}
- var_buffer_addUTF16( &buffer, mediapath );
+ var_buffer_addUTF16( p_access, &buffer, mediapath );
mms_CommandSend( p_access,
0x05,
msg_Dbg( p_access,
"answer 0x06 flags:0x%8.8"PRIx32" media_length:%"PRIu32"s "
- "packet_length:%zul packet_count:%"PRId32" max_bit_rate:%d "
+ "packet_length:%zu packet_count:%"PRIu32" max_bit_rate:%d "
"header_size:%zu",
p_sys->i_flags_broadcast,
p_sys->i_media_length,
- (unsigned)p_sys->i_packet_length,
+ p_sys->i_packet_length,
p_sys->i_packet_count,
p_sys->i_max_bit_rate,
p_sys->i_header_size );
asf_HeaderParse ( &p_sys->asfh,
p_sys->p_header, p_sys->i_header );
asf_StreamSelect( &p_sys->asfh,
- var_CreateGetInteger( p_access, "mms-maxbitrate" ),
- var_CreateGetInteger( p_access, "mms-all" ),
- var_CreateGetInteger( p_access, "audio" ),
- var_CreateGetInteger( p_access, "video" ) );
+ var_InheritInteger( p_access, "mms-maxbitrate" ),
+ var_InheritBool( p_access, "mms-all" ),
+ var_InheritBool( p_access, "audio" ),
+ var_InheritBool( p_access, "video" ) );
/* *** now select stream we want to receive *** */
/* TODO take care of stream bitrate TODO */
for( i = 1; i < 128; i++ )
{
- if( p_sys->asfh.stream[i].i_cat != ASF_STREAM_UNKNOWN )
+ if( p_sys->asfh.stream[i].i_cat != ASF_CODEC_TYPE_UNKNOWN )
{
i_streams++;
if( i_first != -1 )
{
var_buffer_add16( &buffer, 0x0000 );
msg_Info( p_access,
- "selecting stream[0x%x] %s (%d kb/s)",
+ "selecting stream[0x%x] %s (%d Kib/s)",
i,
- ( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ?
+ ( p_sys->asfh.stream[i].i_cat == ASF_CODEC_TYPE_AUDIO ) ?
"audio" : "video" ,
p_sys->asfh.stream[i].i_bitrate / 1024);
}
{
var_buffer_add16( &buffer, 0x0002 );
msg_Info( p_access,
- "ignoring stream[0x%x] %s (%d kb/s)",
+ "ignoring stream[0x%x] %s (%d Kib/s)",
i,
- ( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ?
+ ( p_sys->asfh.stream[i].i_cat == ASF_CODEC_TYPE_AUDIO ) ?
"audio" : "video" ,
p_sys->asfh.stream[i].i_bitrate / 1024);
i_ret = net_Write( p_access, p_sys->i_handle_tcp, NULL, buffer.p_data,
buffer.i_data - ( 8 - ( i_data - i_data_old ) ) );
vlc_mutex_unlock( &p_sys->lock_netwrite );
+
if( i_ret != buffer.i_data - ( 8 - ( i_data - i_data_old ) ) )
{
+ var_buffer_free( &buffer );
msg_Err( p_access, "failed to send command" );
return VLC_EGENERIC;
}
static int NetFillBuffer( access_t *p_access )
{
-#ifdef UNDER_CE
- return -1;
-
-#else
access_sys_t *p_sys = p_access->p_sys;
int i_ret;
struct pollfd ufd[2];
}
if( i_udp > 0 )
{
- ufd[nfd].fd = p_sys->i_handle_tcp;
+ ufd[nfd].fd = p_sys->i_handle_udp;
ufd[nfd].events = POLLIN;
nfd++;
}
/* We'll wait 0.5 second if nothing happens */
- timeout = 500;
+ timeout = __MIN( 500, p_sys->i_timeout );
if( i_try * timeout > p_sys->i_timeout )
{
return -1;
}
- if( !vlc_object_alive (p_access) || p_access->b_error ) return -1;
+ if( !vlc_object_alive (p_access) )
+ return -1;
//msg_Dbg( p_access, "NetFillBuffer: trying again (select)" );
if( i_ret < 0 )
{
- msg_Err( p_access, "network poll error (%m)" );
+ msg_Err( p_access, "network poll error: %s", vlc_strerror_c(errno) );
return -1;
}
if( i_udp_read > 0 ) p_sys->i_buffer_udp += i_udp_read;
return i_tcp_read + i_udp_read;
-#endif
}
static int mms_ParseCommand( access_t *p_access,
free( p_sys->p_cmd );
p_sys->i_cmd = i_data;
- p_sys->p_cmd = malloc( i_data );
+ p_sys->p_cmd = xmalloc( i_data );
memcpy( p_sys->p_cmd, p_data, i_data );
*pi_used = i_data; /* by default */
size_t i_packet_length;
uint32_t i_packet_id;
- uint8_t *p_packet;
-
-
*pi_used = i_data; /* default */
if( i_data <= 8 )
{
}
/* we now have a media or a header packet */
- p_packet = malloc( i_packet_length - 8 ); // don't bother with preheader
- memcpy( p_packet, p_data + 8, i_packet_length - 8 );
-
if( i_packet_seq_num != p_sys->i_packet_seq_num )
{
#if 0
{
if( p_sys->p_header )
{
- p_sys->p_header = realloc( p_sys->p_header,
- p_sys->i_header + i_packet_length - 8 );
+ p_sys->p_header = xrealloc( p_sys->p_header,
+ p_sys->i_header + i_packet_length - 8 );
memcpy( &p_sys->p_header[p_sys->i_header],
- p_packet,
- i_packet_length - 8 );
+ p_data + 8, i_packet_length - 8 );
p_sys->i_header += i_packet_length - 8;
- free( p_packet );
}
else
{
+ uint8_t* p_packet = xmalloc( i_packet_length - 8 ); // don't bother with preheader
+ memcpy( p_packet, p_data + 8, i_packet_length - 8 );
p_sys->p_header = p_packet;
p_sys->i_header = i_packet_length - 8;
}
}
else
{
+ uint8_t* p_packet = xmalloc( i_packet_length - 8 ); // don't bother with preheader
+ memcpy( p_packet, p_data + 8, i_packet_length - 8 );
FREENULL( p_sys->p_media );
p_sys->p_media = p_packet;
p_sys->i_media = i_packet_length - 8;
return -1;
}
-static void* KeepAliveThread( void *p_data )
+VLC_NORETURN
+static void *KeepAliveThread( void *p_data )
{
- mmstu_keepalive_t *p_thread = (mmstu_keepalive_t *) p_data;
- access_t *p_access = p_thread->p_access;
-
- vlc_mutex_lock( &p_thread->lock );
- mutex_cleanup_push( &p_thread->lock );
+ access_t *p_access = p_data;
for( ;; )
{
- /* Do nothing until paused (if ever) */
- while( !p_thread->b_paused )
- vlc_cond_wait( &p_thread->wait, &p_thread->lock );
+ /* Send keep-alive every ten seconds */
+ int canc = vlc_savecancel();
- do
- {
- int canc;
+ mms_CommandSend( p_access, 0x1b, 0, 0, NULL, 0 );
- /* Send keep-alive every ten seconds */
- vlc_mutex_unlock( &p_thread->lock );
- canc = vlc_savecancel();
+ vlc_restorecancel( canc );
- mms_CommandSend( p_access, 0x1b, 0, 0, NULL, 0 );
+ msleep( 10 * CLOCK_FREQ );
+ }
+ vlc_assert_unreachable();
+}
- vlc_restorecancel( canc );
- vlc_mutex_lock( &p_thread->lock );
+static void KeepAliveStart( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ if( p_sys->b_keep_alive )
+ return;
- msleep( 10 * CLOCK_FREQ );
- }
- while( p_thread->b_paused );
- }
+ p_sys->b_keep_alive = !vlc_clone( &p_sys->keep_alive,
+ KeepAliveThread, p_access,
+ VLC_THREAD_PRIORITY_LOW );
+}
+
+static void KeepAliveStop( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ if( !p_sys->b_keep_alive )
+ return;
- vlc_cleanup_pop();
- assert(0);
+ vlc_cancel( p_sys->keep_alive );
+ vlc_join( p_sys->keep_alive, NULL );
+ p_sys->b_keep_alive = false;
}
projects / vlc / blobdiff