Skip to content

V
vlc-2-2
Commit 64310cf3 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./modules/access/mms/mms.c: fixed signed/unsigned comparisons, and fixed 

    a bug I found in Read(). No idea whether it was triggered before nor what
    it was doing, though :)
parent ee0a2449
Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 228 deletions
modules/access/mms/buffer.c
View file @ 64310cf3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* buffer.c: MMS access plug-in * buffer.c: MMS access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: buffer.c,v 1.2 2002/11/25 00:22:04 fenrir Exp $ * $Id: buffer.c,v 1.3 2002/12/06 13:05:22 sam Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...@@ -49,7 +49,7 @@ int var_buffer_initwrite( var_buffer_t *p_buf, int i_default_size ) ...@@ -49,7 +49,7 @@ int var_buffer_initwrite( var_buffer_t *p_buf, int i_default_size )
int var_buffer_reinitwrite( var_buffer_t *p_buf, int i_default_size ) int var_buffer_reinitwrite( var_buffer_t *p_buf, int i_default_size )
{ {
p_buf->i_data = 0; p_buf->i_data = 0;
if( p_buf->i_size < i_default_size ) if( p_buf->i_size < i_default_size )
{ {
p_buf->i_size = i_default_size; p_buf->i_size = i_default_size;
if( p_buf->p_data ) if( p_buf->p_data )
...@@ -102,14 +102,14 @@ void var_buffer_add64( var_buffer_t *p_buf, uint64_t i_long ) ...@@ -102,14 +102,14 @@ void var_buffer_add64( var_buffer_t *p_buf, uint64_t i_long )
void var_buffer_addmemory( var_buffer_t *p_buf, void *p_mem, int i_mem ) void var_buffer_addmemory( var_buffer_t *p_buf, void *p_mem, int i_mem )
{ {
/* check if there is enough data */ /* check if there is enough data */
if( p_buf->i_data + i_mem >= p_buf->i_size ) if( p_buf->i_data + i_mem >= p_buf->i_size )
{ {
p_buf->i_size += i_mem + 1024; p_buf->i_size += i_mem + 1024;
p_buf->p_data = realloc( p_buf->p_data, p_buf->i_size ); p_buf->p_data = realloc( p_buf->p_data, p_buf->i_size );
} }
memcpy( p_buf->p_data + p_buf->i_data, memcpy( p_buf->p_data + p_buf->i_data,
p_mem, p_mem,
i_mem ); i_mem );
...@@ -118,7 +118,7 @@ void var_buffer_addmemory( var_buffer_t *p_buf, void *p_mem, int i_mem ) ...@@ -118,7 +118,7 @@ void var_buffer_addmemory( var_buffer_t *p_buf, void *p_mem, int i_mem )
void var_buffer_addUTF16( var_buffer_t *p_buf, char *p_str ) void var_buffer_addUTF16( var_buffer_t *p_buf, char *p_str )
{ {
int i; unsigned int i;
if( !p_str ) if( !p_str )
{ {
var_buffer_add16( p_buf, 0 ); var_buffer_add16( p_buf, 0 );
...@@ -165,7 +165,7 @@ uint8_t var_buffer_get8 ( var_buffer_t *p_buf ) ...@@ -165,7 +165,7 @@ uint8_t var_buffer_get8 ( var_buffer_t *p_buf )
uint16_t var_buffer_get16( var_buffer_t *p_buf ) uint16_t var_buffer_get16( var_buffer_t *p_buf )
{ {
uint16_t i_b1, i_b2; uint16_t i_b1, i_b2;
i_b1 = var_buffer_get8( p_buf ); i_b1 = var_buffer_get8( p_buf );
i_b2 = var_buffer_get8( p_buf ); i_b2 = var_buffer_get8( p_buf );
...@@ -176,7 +176,7 @@ uint16_t var_buffer_get16( var_buffer_t *p_buf ) ...@@ -176,7 +176,7 @@ uint16_t var_buffer_get16( var_buffer_t *p_buf )
uint32_t var_buffer_get32( var_buffer_t *p_buf ) uint32_t var_buffer_get32( var_buffer_t *p_buf )
{ {
uint32_t i_w1, i_w2; uint32_t i_w1, i_w2;
i_w1 = var_buffer_get16( p_buf ); i_w1 = var_buffer_get16( p_buf );
i_w2 = var_buffer_get16( p_buf ); i_w2 = var_buffer_get16( p_buf );
...@@ -186,7 +186,7 @@ uint32_t var_buffer_get32( var_buffer_t *p_buf ) ...@@ -186,7 +186,7 @@ uint32_t var_buffer_get32( var_buffer_t *p_buf )
uint64_t var_buffer_get64( var_buffer_t *p_buf ) uint64_t var_buffer_get64( var_buffer_t *p_buf )
{ {
uint64_t i_dw1, i_dw2; uint64_t i_dw1, i_dw2;
i_dw1 = var_buffer_get32( p_buf ); i_dw1 = var_buffer_get32( p_buf );
i_dw2 = var_buffer_get32( p_buf ); i_dw2 = var_buffer_get32( p_buf );
...@@ -219,7 +219,7 @@ int var_buffer_readempty( var_buffer_t *p_buf ) ...@@ -219,7 +219,7 @@ int var_buffer_readempty( var_buffer_t *p_buf )
void var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid ) void var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid )
{ {
int i; int i;
p_guid->v1 = var_buffer_get32( p_buf ); p_guid->v1 = var_buffer_get32( p_buf );
p_guid->v2 = var_buffer_get16( p_buf ); p_guid->v2 = var_buffer_get16( p_buf );
p_guid->v3 = var_buffer_get16( p_buf ); p_guid->v3 = var_buffer_get16( p_buf );
......
modules/access/mms/mms.c
View file @ 64310cf3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mms.c: MMS access plug-in * mms.c: MMS access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: mms.c,v 1.11 2002/12/04 06:23:08 titer Exp $ * $Id: mms.c,v 1.12 2002/12/06 13:05:22 sam Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#include "mms.h" #include "mms.h"
/**************************************************************************** /****************************************************************************
* NOTES: * NOTES:
* MMSProtocole documentation found at http://get.to/sdp * MMSProtocole documentation found at http://get.to/sdp
****************************************************************************/ ****************************************************************************/
...@@ -83,7 +83,7 @@ static void Close ( vlc_object_t * ); ...@@ -83,7 +83,7 @@ static void Close ( vlc_object_t * );
static int Read ( input_thread_t * p_input, byte_t * p_buffer, static int Read ( input_thread_t * p_input, byte_t * p_buffer,
size_t i_len ); size_t i_len );
static void Seek ( input_thread_t *, off_t ); static void Seek ( input_thread_t *, off_t );
static int SetProgram ( input_thread_t *, pgrm_descriptor_t * ); static int SetProgram ( input_thread_t *, pgrm_descriptor_t * );
static int MMSOpen( input_thread_t *, url_t *, int, char * ); static int MMSOpen( input_thread_t *, url_t *, int, char * );
...@@ -100,21 +100,21 @@ static int mms_CommandSend( input_thread_t *, int, uint32_t, uint32_t, uint8_t ...@@ -100,21 +100,21 @@ static int mms_CommandSend( input_thread_t *, int, uint32_t, uint32_t, uint8_t
static int mms_HeaderMediaRead( input_thread_t *, int ); static int mms_HeaderMediaRead( input_thread_t *, int );
static int mms_ReceivePacket( input_thread_t * ); static int mms_ReceivePacket( input_thread_t * );
static void mms_ParseURL( url_t *p_url, char *psz_url ); static void mms_ParseURL( url_t *p_url, char *psz_url );
/* /*
* 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...
*/ */
/* /*
* Merci :)) * Merci :))
*/ */
/***************************************************************************** /*****************************************************************************
...@@ -124,14 +124,14 @@ vlc_module_begin(); ...@@ -124,14 +124,14 @@ vlc_module_begin();
set_description( _("MMS access module") ); set_description( _("MMS access module") );
set_capability( "access", 0 ); set_capability( "access", 0 );
add_category_hint( "stream", NULL ); add_category_hint( "stream", NULL );
add_bool( "mms-all", 0, NULL, add_bool( "mms-all", 0, NULL,
"force selection of all streams", "force selection of all streams",
"force selection of all streams" ); "force selection of all streams" );
add_string( "mms-stream", NULL, NULL, add_string( "mms-stream", NULL, NULL,
"streams selection", "streams selection",
"force this stream selection" ); "force this stream selection" );
add_integer( "mms-maxbitrate", 0, NULL, add_integer( "mms-maxbitrate", 0, NULL,
"max bitrate", "max bitrate",
"set max bitrate for auto streams selections" ); "set max bitrate for auto streams selections" );
add_shortcut( "mms" ); add_shortcut( "mms" );
...@@ -152,14 +152,14 @@ static int Open( vlc_object_t *p_this ) ...@@ -152,14 +152,14 @@ static int Open( vlc_object_t *p_this )
input_thread_t *p_input = (input_thread_t*)p_this; input_thread_t *p_input = (input_thread_t*)p_this;
/* *** allocate p_access_data *** */ /* *** allocate p_access_data *** */
p_input->p_access_data = p_input->p_access_data =
(void*)p_access = malloc( sizeof( access_t ) ); (void*)p_access = malloc( sizeof( access_t ) );
memset( p_access, 0, sizeof( access_t ) ); memset( p_access, 0, sizeof( access_t ) );
/* *** Parse URL and get server addr/port and path *** */ /* *** Parse URL and get server addr/port and path *** */
mms_ParseURL( &p_access->url, p_input->psz_name ); mms_ParseURL( &p_access->url, p_input->psz_name );
if( p_access->url.psz_server_addr == NULL || if( p_access->url.psz_server_addr == NULL ||
!( *p_access->url.psz_server_addr ) ) !( *p_access->url.psz_server_addr ) )
{ {
FREE( p_access->url.psz_private ); FREE( p_access->url.psz_private );
...@@ -167,14 +167,14 @@ static int Open( vlc_object_t *p_this ) ...@@ -167,14 +167,14 @@ static int Open( vlc_object_t *p_this )
return( -1 ); return( -1 );
} }
if( p_access->url.i_server_port == 0 ) if( p_access->url.i_server_port == 0 )
{ {
p_access->url.i_server_port = 1755; /* default port */ p_access->url.i_server_port = 1755; /* default port */
} }
if( p_access->url.i_bind_port == 0 ) if( p_access->url.i_bind_port == 0 )
{ {
p_access->url.i_bind_port = 7000; /* default port */ p_access->url.i_bind_port = 7000; /* default port */
} }
/* *** connect to this server *** */ /* *** connect to this server *** */
/* 1: look at requested protocol (udp/tcp) */ /* 1: look at requested protocol (udp/tcp) */
...@@ -203,18 +203,18 @@ static int Open( vlc_object_t *p_this ) ...@@ -203,18 +203,18 @@ static int Open( vlc_object_t *p_this )
/* 3: connect */ /* 3: connect */
if( i_proto == MMS_PROTO_AUTO ) if( i_proto == MMS_PROTO_AUTO )
{ /* first try with TCP */ { /* first try with TCP */
i_status = i_status =
MMSOpen( p_input, &p_access->url, MMS_PROTO_TCP, psz_network ); MMSOpen( p_input, &p_access->url, MMS_PROTO_TCP, psz_network );
if( i_status < 0 ) if( i_status < 0 )
{ /* then with UDP */ { /* then with UDP */
i_status = i_status =
MMSOpen( p_input, &p_access->url, MMS_PROTO_UDP, psz_network ); MMSOpen( p_input, &p_access->url, MMS_PROTO_UDP, psz_network );
} }
} }
else else
{ {
i_status = i_status =
MMSOpen( p_input, &p_access->url, i_proto, psz_network ); MMSOpen( p_input, &p_access->url, i_proto, psz_network );
} }
...@@ -226,13 +226,13 @@ static int Open( vlc_object_t *p_this ) ...@@ -226,13 +226,13 @@ static int Open( vlc_object_t *p_this )
} }
msg_Dbg( p_input, "connected to %s", p_access->url.psz_server_addr ); msg_Dbg( p_input, "connected to %s", p_access->url.psz_server_addr );
/* *** set exported functions *** */ /* *** set exported functions *** */
p_input->pf_read = Read; p_input->pf_read = Read;
p_input->pf_seek = Seek; p_input->pf_seek = Seek;
p_input->pf_set_program = SetProgram; p_input->pf_set_program = SetProgram;
p_input->pf_set_area = NULL; p_input->pf_set_area = NULL;
p_input->p_private = NULL; p_input->p_private = NULL;
/* *** finished to set some variable *** */ /* *** finished to set some variable *** */
...@@ -254,11 +254,11 @@ static int Open( vlc_object_t *p_this ) ...@@ -254,11 +254,11 @@ static int Open( vlc_object_t *p_this )
else else
{ {
p_input->stream.b_seekable = 1; p_input->stream.b_seekable = 1;
p_input->stream.p_selected_area->i_size = p_input->stream.p_selected_area->i_size =
p_access->i_header + p_access->i_header +
p_access->i_packet_count * p_access->i_packet_length; p_access->i_packet_count * p_access->i_packet_length;
} }
p_input->stream.i_method = INPUT_METHOD_NETWORK; p_input->stream.i_method = INPUT_METHOD_NETWORK;
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
...@@ -270,7 +270,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -270,7 +270,7 @@ static int Open( vlc_object_t *p_this )
FREE( p_access->url.psz_private ); FREE( p_access->url.psz_private );
return( -1 ); return( -1 );
} }
return( 0 ); return( 0 );
} }
...@@ -281,10 +281,10 @@ static void Close( vlc_object_t *p_this ) ...@@ -281,10 +281,10 @@ static void Close( vlc_object_t *p_this )
{ {
input_thread_t * p_input = (input_thread_t *)p_this; input_thread_t * p_input = (input_thread_t *)p_this;
access_t *p_access = (access_t*)p_input->p_access_data; access_t *p_access = (access_t*)p_input->p_access_data;
/* close connection with server */ /* close connection with server */
MMSClose( p_input ); MMSClose( p_input );
/* free memory */ /* free memory */
FREE( p_access->url.psz_private ); FREE( p_access->url.psz_private );
} }
...@@ -303,12 +303,12 @@ static int SetProgram( input_thread_t * p_input, ...@@ -303,12 +303,12 @@ static int SetProgram( input_thread_t * p_input,
*****************************************************************************/ *****************************************************************************/
static void Seek( input_thread_t * p_input, off_t i_pos ) static void Seek( input_thread_t * p_input, off_t i_pos )
{ {
/* /*
* FIXME * FIXME
* Don't work * Don't work
* Probably some bad or missing command * Probably some bad or missing command
* *
* *
*/ */
#if 1 #if 1
...@@ -316,20 +316,20 @@ static void Seek( input_thread_t * p_input, off_t i_pos ) ...@@ -316,20 +316,20 @@ static void Seek( input_thread_t * p_input, off_t i_pos )
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; return;
} }
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
if( i_pos < p_access->i_header) if( i_pos < p_access->i_header)
{ {
if( p_access->i_pos < p_access->i_header ) if( p_access->i_pos < p_access->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_access->i_pos = i_pos; p_access->i_pos = i_pos;
return; return;
...@@ -353,19 +353,19 @@ static void Seek( input_thread_t * p_input, off_t i_pos ) ...@@ -353,19 +353,19 @@ static void Seek( input_thread_t * p_input, off_t i_pos )
/* *** restart stream *** */ /* *** restart stream *** */
var_buffer_initwrite( &buffer, 0 ); var_buffer_initwrite( &buffer, 0 );
var_buffer_add64( &buffer, 0 ); /* seek point in second */ var_buffer_add64( &buffer, 0 ); /* seek point in second */
var_buffer_add32( &buffer, 0xffffffff ); var_buffer_add32( &buffer, 0xffffffff );
var_buffer_add32( &buffer, i_packet ); // begin from start var_buffer_add32( &buffer, i_packet ); // begin from start
var_buffer_add8( &buffer, 0xff ); // stream time limit var_buffer_add8( &buffer, 0xff ); // stream time limit
var_buffer_add8( &buffer, 0xff ); // on 3bytes ... var_buffer_add8( &buffer, 0xff ); // on 3bytes ...
var_buffer_add8( &buffer, 0xff ); // var_buffer_add8( &buffer, 0xff ); //
var_buffer_add8( &buffer, 0x00 ); // don't use limit var_buffer_add8( &buffer, 0x00 ); // don't use limit
var_buffer_add32( &buffer, p_access->i_media_packet_id_type ); var_buffer_add32( &buffer, p_access->i_media_packet_id_type );
mms_CommandSend( p_input, 0x07, p_access->i_command_level, 0x0001ffff, mms_CommandSend( p_input, 0x07, p_access->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( ;; ) for( ;; )
{ {
...@@ -376,7 +376,7 @@ static void Seek( input_thread_t * p_input, off_t i_pos ) ...@@ -376,7 +376,7 @@ static void Seek( input_thread_t * p_input, off_t i_pos )
break; break;
} }
} }
for( ;; ) for( ;; )
{ {
mms_HeaderMediaRead( p_input, MMS_PACKET_CMD ); mms_HeaderMediaRead( p_input, MMS_PACKET_CMD );
...@@ -386,11 +386,11 @@ static void Seek( input_thread_t * p_input, off_t i_pos ) ...@@ -386,11 +386,11 @@ static void Seek( input_thread_t * p_input, off_t i_pos )
break; break;
} }
} }
/* get a packet */ /* get a packet */
mms_HeaderMediaRead( p_input, MMS_PACKET_MEDIA ); mms_HeaderMediaRead( p_input, MMS_PACKET_MEDIA );
msg_Dbg( p_input, "Streaming restarted" ); msg_Dbg( p_input, "Streaming restarted" );
p_access->i_media_used += i_offset; p_access->i_media_used += i_offset;
p_access->i_pos = i_pos; p_access->i_pos = i_pos;
p_input->stream.p_selected_area->i_tell = i_pos; p_input->stream.p_selected_area->i_tell = i_pos;
...@@ -407,14 +407,14 @@ static int Read ( input_thread_t * p_input, byte_t * p_buffer, ...@@ -407,14 +407,14 @@ static int Read ( input_thread_t * p_input, byte_t * p_buffer,
size_t i_copy; size_t i_copy;
i_data = 0; i_data = 0;
/* *** send header if needed ** */ /* *** send header if needed ** */
if( p_access->i_pos < p_access->i_header ) if( p_access->i_pos < p_access->i_header )
{ {
i_copy = __MIN( i_len, p_access->i_header - p_access->i_pos ); i_copy = __MIN( i_len, p_access->i_header - p_access->i_pos );
if( i_copy > 0 ) if( i_copy > 0 )
{ {
memcpy( p_buffer, memcpy( p_buffer,
p_access->p_header + p_access->i_pos, p_access->p_header + p_access->i_pos,
i_copy ); i_copy );
} }
...@@ -426,15 +426,15 @@ static int Read ( input_thread_t * p_input, byte_t * p_buffer, ...@@ -426,15 +426,15 @@ static int Read ( input_thread_t * p_input, byte_t * p_buffer,
{ {
if( p_access->i_media_used < p_access->i_media ) if( p_access->i_media_used < p_access->i_media )
{ {
i_copy = __MIN( i_len - i_data , i_copy = __MIN( i_len - i_data ,
p_access->i_media - p_access->i_media_used ); p_access->i_media - p_access->i_media_used );
memcpy( p_buffer + i_data, memcpy( p_buffer + i_data,
p_access->p_media + p_access->i_media_used, p_access->p_media + p_access->i_media_used,
i_copy ); i_copy );
i_data += i_copy; i_data += i_copy;
p_access->i_media_used += i_copy; p_access->i_media_used += i_copy;
} }
else if( p_access->p_media != NULL && else if( p_access->p_media != NULL &&
p_access->i_media_used < p_access->i_packet_length ) p_access->i_media_used < p_access->i_packet_length )
{ {
i_copy = __MIN( i_len - i_data, i_copy = __MIN( i_len - i_data,
...@@ -446,7 +446,8 @@ static int Read ( input_thread_t * p_input, byte_t * p_buffer, ...@@ -446,7 +446,8 @@ static int Read ( input_thread_t * p_input, byte_t * p_buffer,
} }
else else
{ {
if( p_access->i_eos || mms_HeaderMediaRead( p_input, MMS_PACKET_MEDIA ) < 0 ); if( p_access->i_eos
|| mms_HeaderMediaRead( p_input, MMS_PACKET_MEDIA ) < 0 )
{ {
p_access->i_pos += i_data; p_access->i_pos += i_data;
return( i_data ); return( i_data );
...@@ -465,7 +466,7 @@ static void asf_HeaderParse( mms_stream_t stream[128], ...@@ -465,7 +466,7 @@ static void asf_HeaderParse( mms_stream_t stream[128],
guid_t guid; guid_t guid;
uint64_t i_size; uint64_t i_size;
int i; int i;
for( i = 0; i < 128; i++ ) for( i = 0; i < 128; i++ )
{ {
stream[i].i_cat = MMS_STREAM_UNKNOWN; stream[i].i_cat = MMS_STREAM_UNKNOWN;
...@@ -473,7 +474,7 @@ static void asf_HeaderParse( mms_stream_t stream[128], ...@@ -473,7 +474,7 @@ static void asf_HeaderParse( mms_stream_t stream[128],
// fprintf( stderr, " ---------------------header:%d\n", i_header ); // fprintf( stderr, " ---------------------header:%d\n", i_header );
var_buffer_initread( &buffer, p_header, i_header ); var_buffer_initread( &buffer, p_header, i_header );
var_buffer_getguid( &buffer, &guid ); var_buffer_getguid( &buffer, &guid );
if( !CmpGuid( &guid, &asf_object_header_guid ) ) if( !CmpGuid( &guid, &asf_object_header_guid ) )
...@@ -482,7 +483,7 @@ static void asf_HeaderParse( mms_stream_t stream[128], ...@@ -482,7 +483,7 @@ static void asf_HeaderParse( mms_stream_t stream[128],
// fprintf( stderr, " ---------------------ERROR------\n" ); // fprintf( stderr, " ---------------------ERROR------\n" );
} }
var_buffer_getmemory( &buffer, NULL, 30 - 16 ); var_buffer_getmemory( &buffer, NULL, 30 - 16 );
for( ;; ) for( ;; )
{ {
// fprintf( stderr, " ---------------------data:%d\n", buffer.i_data ); // fprintf( stderr, " ---------------------data:%d\n", buffer.i_data );
...@@ -498,14 +499,14 @@ static void asf_HeaderParse( mms_stream_t stream[128], ...@@ -498,14 +499,14 @@ static void asf_HeaderParse( mms_stream_t stream[128],
int i_stream_id; int i_stream_id;
guid_t stream_type; guid_t stream_type;
// msg_Dbg( p_input, "found stream_properties" ); // 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 );
i_stream_id = var_buffer_get8( &buffer ) & 0x7f; i_stream_id = var_buffer_get8( &buffer ) & 0x7f;
// fprintf( stderr, " 1---------------------skip:%lld\n", i_size - 24 - 32 - 16 - 1 ); // fprintf( stderr, " 1---------------------skip:%lld\n", i_size - 24 - 32 - 16 - 1 );
var_buffer_getmemory( &buffer, NULL, i_size - 24 - 32 - 16 - 1); var_buffer_getmemory( &buffer, NULL, i_size - 24 - 32 - 16 - 1);
if( CmpGuid( &stream_type, &asf_object_stream_type_video ) ) if( CmpGuid( &stream_type, &asf_object_stream_type_video ) )
{ {
// msg_Dbg( p_input, "video stream[%d] found", i_stream_id ); // msg_Dbg( p_input, "video stream[%d] found", i_stream_id );
...@@ -526,7 +527,7 @@ static void asf_HeaderParse( mms_stream_t stream[128], ...@@ -526,7 +527,7 @@ static void asf_HeaderParse( mms_stream_t stream[128],
{ {
int i_count; int i_count;
uint8_t i_stream_id; uint8_t i_stream_id;
i_count = var_buffer_get16( &buffer ); i_count = var_buffer_get16( &buffer );
i_size -= 2; i_size -= 2;
while( i_count > 0 ) while( i_count > 0 )
...@@ -539,7 +540,7 @@ static void asf_HeaderParse( mms_stream_t stream[128], ...@@ -539,7 +540,7 @@ static void asf_HeaderParse( mms_stream_t stream[128],
// fprintf( stderr, " 2---------------------skip:%lld\n", i_size - 24); // fprintf( stderr, " 2---------------------skip:%lld\n", i_size - 24);
var_buffer_getmemory( &buffer, NULL, i_size - 24 ); var_buffer_getmemory( &buffer, NULL, i_size - 24 );
} }
else else
{ {
// skip unknown guid // skip unknown guid
var_buffer_getmemory( &buffer, NULL, i_size - 24 ); var_buffer_getmemory( &buffer, NULL, i_size - 24 );
...@@ -548,7 +549,7 @@ static void asf_HeaderParse( mms_stream_t stream[128], ...@@ -548,7 +549,7 @@ static void asf_HeaderParse( mms_stream_t stream[128],
} }
} }
static void mms_StreamSelect( input_thread_t * p_input, static void mms_StreamSelect( input_thread_t * p_input,
mms_stream_t stream[128] ) mms_stream_t stream[128] )
{ {
/* XXX FIXME use mututal eclusion information */ /* XXX FIXME use mututal eclusion information */
...@@ -617,18 +618,18 @@ static void mms_StreamSelect( input_thread_t * p_input, ...@@ -617,18 +618,18 @@ static void mms_StreamSelect( input_thread_t * p_input,
FREE( psz_stream ); FREE( psz_stream );
/* big test: /* big test:
* select a stream if * select a stream if
* - no audio nor video stream * - no audio nor video stream
* - or: * - or:
* - if i_bitrate_max not set keep the highest bitrate * - if i_bitrate_max not set keep the highest bitrate
* - if i_bitrate_max is set, keep stream that make we used best * - if i_bitrate_max is set, keep stream that make we used best
* quality regarding i_bitrate_max * quality regarding i_bitrate_max
* *
* XXX: little buggy: * XXX: little buggy:
* - it doesn't use mutual exclusion info.. * - it doesn't use mutual exclusion info..
* - when selecting a better stream we could select * - when selecting a better stream we could select
* something that make i_bitrate_total> i_bitrate_max * something that make i_bitrate_total> i_bitrate_max
*/ */
for( i = 1; i < 128; i++ ) for( i = 1; i < 128; i++ )
{ {
if( stream[i].i_cat == MMS_STREAM_UNKNOWN ) if( stream[i].i_cat == MMS_STREAM_UNKNOWN )
...@@ -636,11 +637,11 @@ static void mms_StreamSelect( input_thread_t * p_input, ...@@ -636,11 +637,11 @@ static void mms_StreamSelect( input_thread_t * p_input,
continue; continue;
} }
else if( stream[i].i_cat == MMS_STREAM_AUDIO && b_audio && else if( stream[i].i_cat == MMS_STREAM_AUDIO && b_audio &&
( i_audio <= 0 || ( i_audio <= 0 ||
( ( ( stream[i].i_bitrate > stream[i_audio].i_bitrate && ( ( ( stream[i].i_bitrate > stream[i_audio].i_bitrate &&
( i_bitrate_total + stream[i].i_bitrate - stream[i_audio].i_bitrate ( i_bitrate_total + stream[i].i_bitrate - stream[i_audio].i_bitrate
< i_bitrate_max || !i_bitrate_max) ) || < i_bitrate_max || !i_bitrate_max) ) ||
( stream[i].i_bitrate < stream[i_audio].i_bitrate && ( stream[i].i_bitrate < stream[i_audio].i_bitrate &&
i_bitrate_max != 0 && i_bitrate_total > i_bitrate_max ) i_bitrate_max != 0 && i_bitrate_total > i_bitrate_max )
) ) ) ) ) ) ) )
{ {
...@@ -662,12 +663,12 @@ static void mms_StreamSelect( input_thread_t * p_input, ...@@ -662,12 +663,12 @@ static void mms_StreamSelect( input_thread_t * p_input,
i_audio = i; i_audio = i;
} }
else if( stream[i].i_cat == MMS_STREAM_VIDEO && b_video && else if( stream[i].i_cat == MMS_STREAM_VIDEO && b_video &&
( i_video <= 0 || ( i_video <= 0 ||
( (
( ( stream[i].i_bitrate > stream[i_video].i_bitrate && ( ( stream[i].i_bitrate > stream[i_video].i_bitrate &&
( i_bitrate_total + stream[i].i_bitrate - stream[i_video].i_bitrate ( i_bitrate_total + stream[i].i_bitrate - stream[i_video].i_bitrate
< i_bitrate_max || !i_bitrate_max) ) || < i_bitrate_max || !i_bitrate_max) ) ||
( stream[i].i_bitrate < stream[i_video].i_bitrate && ( stream[i].i_bitrate < stream[i_video].i_bitrate &&
i_bitrate_max != 0 && i_bitrate_total > i_bitrate_max ) i_bitrate_max != 0 && i_bitrate_total > i_bitrate_max )
) ) ) ) ) ) ) )
{ {
...@@ -690,14 +691,14 @@ static void mms_StreamSelect( input_thread_t * p_input, ...@@ -690,14 +691,14 @@ static void mms_StreamSelect( input_thread_t * p_input,
} }
if( i_bitrate_max > 0 ) if( i_bitrate_max > 0 )
{ {
msg_Dbg( p_input, msg_Dbg( p_input,
"requested bitrate:%d real bitrate:%d", "requested bitrate:%d real bitrate:%d",
i_bitrate_max, i_bitrate_total ); i_bitrate_max, i_bitrate_total );
} }
else else
{ {
msg_Dbg( p_input, msg_Dbg( p_input,
"total bitrate:%d", "total bitrate:%d",
i_bitrate_total ); i_bitrate_total );
} }
} }
...@@ -744,7 +745,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -744,7 +745,7 @@ static int MMSOpen( input_thread_t *p_input,
module_Unneed( p_input, p_network ); module_Unneed( p_input, p_network );
p_access->socket_tcp.i_handle = socket_desc.i_handle; p_access->socket_tcp.i_handle = socket_desc.i_handle;
p_input->i_mtu = 0; /*socket_desc.i_mtu;*/ p_input->i_mtu = 0; /*socket_desc.i_mtu;*/
msg_Dbg( p_input, msg_Dbg( p_input,
"connection(tcp) with \"%s:%d\" successful", "connection(tcp) with \"%s:%d\" successful",
p_url->psz_server_addr, p_url->psz_server_addr,
p_url->i_server_port ); p_url->i_server_port );
...@@ -757,7 +758,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -757,7 +758,7 @@ static int MMSOpen( input_thread_t *p_input,
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_access->socket_tcp.i_handle, if( getsockname( p_access->socket_tcp.i_handle,
(struct sockaddr*)&name, &i_namelen ) < 0 ) (struct sockaddr*)&name, &i_namelen ) < 0 )
{ {
...@@ -807,8 +808,8 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -807,8 +808,8 @@ static int MMSOpen( input_thread_t *p_input,
/* *** Init context for mms prototcol *** */ /* *** Init context for mms prototcol *** */
GenerateGuid( &p_access->guid ); /* used to identify client by server */ GenerateGuid( &p_access->guid ); /* used to identify client by server */
msg_Dbg( p_input, msg_Dbg( p_input,
"generated guid: "GUID_FMT, "generated guid: "GUID_FMT,
GUID_PRINT( p_access->guid ) ); GUID_PRINT( p_access->guid ) );
p_access->i_command_level = 1; /* updated after 0x1A command */ p_access->i_command_level = 1; /* updated after 0x1A command */
p_access->i_seq_num = 0; p_access->i_seq_num = 0;
...@@ -833,12 +834,12 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -833,12 +834,12 @@ static int MMSOpen( input_thread_t *p_input,
var_buffer_initwrite( &buffer, 0 ); var_buffer_initwrite( &buffer, 0 );
var_buffer_add16( &buffer, 0x001c ); var_buffer_add16( &buffer, 0x001c );
var_buffer_add16( &buffer, 0x0003 ); var_buffer_add16( &buffer, 0x0003 );
sprintf( tmp, sprintf( tmp,
"NSPlayer/7.0.0.1956; {"GUID_FMT"}; Host: %s", "NSPlayer/7.0.0.1956; {"GUID_FMT"}; Host: %s",
GUID_PRINT( p_access->guid ), GUID_PRINT( p_access->guid ),
p_url->psz_server_addr ); p_url->psz_server_addr );
var_buffer_addUTF16( &buffer, tmp ); var_buffer_addUTF16( &buffer, tmp );
mms_CommandSend( p_input, mms_CommandSend( p_input,
0x01, /* connexion request */ 0x01, /* connexion request */
0x00000000, /* flags, FIXME */ 0x00000000, /* flags, FIXME */
...@@ -868,7 +869,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -868,7 +869,7 @@ static int MMSOpen( input_thread_t *p_input,
GETUTF16( p_access->psz_update_player_url, i_update_player_url ); GETUTF16( p_access->psz_update_player_url, i_update_player_url );
GETUTF16( p_access->psz_encryption_type, i_encryption_type ); GETUTF16( p_access->psz_encryption_type, i_encryption_type );
#undef GETUTF16 #undef GETUTF16
msg_Dbg( p_input, msg_Dbg( p_input,
"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_access->psz_server_version, p_access->psz_server_version,
p_access->psz_tool_version, p_access->psz_tool_version,
...@@ -876,7 +877,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -876,7 +877,7 @@ static int MMSOpen( input_thread_t *p_input,
p_access->psz_encryption_type ); p_access->psz_encryption_type );
/* *** should make an 18 command to make data timing *** */ /* *** should make an 18 command to make data timing *** */
/* *** send command 2 : transport protocol selection *** */ /* *** send command 2 : transport protocol selection *** */
var_buffer_reinitwrite( &buffer, 0 ); var_buffer_reinitwrite( &buffer, 0 );
var_buffer_add32( &buffer, 0x00000000 ); var_buffer_add32( &buffer, 0x00000000 );
...@@ -884,7 +885,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -884,7 +885,7 @@ static int MMSOpen( input_thread_t *p_input,
var_buffer_add32( &buffer, 0x00000002 ); var_buffer_add32( &buffer, 0x00000002 );
if( b_udp ) if( b_udp )
{ {
sprintf( tmp, sprintf( tmp,
"\\\\%s\\UDP\\%d", "\\\\%s\\UDP\\%d",
p_access->psz_bind_addr, p_access->psz_bind_addr,
p_url->i_bind_port ); p_url->i_bind_port );
...@@ -895,7 +896,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -895,7 +896,7 @@ static int MMSOpen( input_thread_t *p_input,
} }
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_input,
0x02, /* connexion request */ 0x02, /* connexion request */
0x00000000, /* flags, FIXME */ 0x00000000, /* flags, FIXME */
...@@ -907,7 +908,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -907,7 +908,7 @@ static int MMSOpen( input_thread_t *p_input,
mms_CommandRead( p_input, 0x02, 0x03 ); mms_CommandRead( p_input, 0x02, 0x03 );
if( p_access->i_command == 0x03 ) if( p_access->i_command == 0x03 )
{ {
msg_Err( p_input, msg_Err( p_input,
"%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_input );
...@@ -917,13 +918,13 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -917,13 +918,13 @@ static int MMSOpen( input_thread_t *p_input,
{ {
msg_Warn( p_input, "received command isn't 0x02 in reponse to 0x02" ); msg_Warn( p_input, "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 *** */
var_buffer_reinitwrite( &buffer, 0 ); var_buffer_reinitwrite( &buffer, 0 );
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_input,
0x05, 0x05,
p_access->i_command_level, p_access->i_command_level,
0xffffffff, 0xffffffff,
...@@ -932,7 +933,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -932,7 +933,7 @@ static int MMSOpen( input_thread_t *p_input,
/* *** wait for reponse *** */ /* *** wait for reponse *** */
mms_CommandRead( p_input, 0x1a, 0x06 ); mms_CommandRead( p_input, 0x1a, 0x06 );
/* test if server send 0x1A answer */ /* test if server send 0x1A answer */
if( p_access->i_command == 0x1A ) if( p_access->i_command == 0x1A )
{ {
...@@ -944,7 +945,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -944,7 +945,7 @@ static int MMSOpen( input_thread_t *p_input,
} }
if( p_access->i_command != 0x06 ) if( p_access->i_command != 0x06 )
{ {
msg_Err( p_input, msg_Err( p_input,
"unknown answer (0x%x instead of 0x06)", "unknown answer (0x%x instead of 0x06)",
p_access->i_command ); p_access->i_command );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
...@@ -970,7 +971,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -970,7 +971,7 @@ static int MMSOpen( input_thread_t *p_input,
return( -1 ); return( -1 );
} }
p_access->i_flags_broadcast = p_access->i_flags_broadcast =
GetDWLE( p_access->p_cmd + MMS_CMD_HEADERSIZE + 12 ); GetDWLE( p_access->p_cmd + MMS_CMD_HEADERSIZE + 12 );
p_access->i_media_length = p_access->i_media_length =
GetDWLE( p_access->p_cmd + MMS_CMD_HEADERSIZE + 24 ); GetDWLE( p_access->p_cmd + MMS_CMD_HEADERSIZE + 24 );
...@@ -991,12 +992,12 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -991,12 +992,12 @@ static int MMSOpen( input_thread_t *p_input,
p_access->i_packet_count, p_access->i_packet_count,
p_access->i_max_bit_rate, p_access->i_max_bit_rate,
p_access->i_header_size ); p_access->i_header_size );
/* XXX XXX dirty hack XXX XXX */ /* XXX XXX dirty hack XXX XXX */
p_input->i_mtu = 3 * p_access->i_packet_length; p_input->i_mtu = 3 * p_access->i_packet_length;
/* *** send command 15 *** */ /* *** send command 15 *** */
var_buffer_reinitwrite( &buffer, 0 ); var_buffer_reinitwrite( &buffer, 0 );
var_buffer_add32( &buffer, 0 ); var_buffer_add32( &buffer, 0 );
var_buffer_add32( &buffer, 0x8000 ); var_buffer_add32( &buffer, 0x8000 );
...@@ -1006,7 +1007,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -1006,7 +1007,7 @@ static int MMSOpen( input_thread_t *p_input,
var_buffer_add32( &buffer, 0x00 ); var_buffer_add32( &buffer, 0x00 );
var_buffer_add64( &buffer, 0x40ac200000000000 ); var_buffer_add64( &buffer, 0x40ac200000000000 );
var_buffer_add32( &buffer, p_access->i_header_packet_id_type ); var_buffer_add32( &buffer, p_access->i_header_packet_id_type );
mms_CommandSend( p_input, 0x15, p_access->i_command_level, 0x00, mms_CommandSend( p_input, 0x15, p_access->i_command_level, 0x00,
buffer.p_data, buffer.i_data ); buffer.p_data, buffer.i_data );
/* *** wait for reponse *** */ /* *** wait for reponse *** */
...@@ -1014,7 +1015,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -1014,7 +1015,7 @@ static int MMSOpen( input_thread_t *p_input,
if( p_access->i_command != 0x11 ) if( p_access->i_command != 0x11 )
{ {
msg_Err( p_input, msg_Err( p_input,
"unknown answer (0x%x instead of 0x11)", "unknown answer (0x%x instead of 0x11)",
p_access->i_command ); p_access->i_command );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
...@@ -1031,10 +1032,10 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -1031,10 +1032,10 @@ static int MMSOpen( input_thread_t *p_input,
} }
/* *** parse header and get stream and their id *** */ /* *** parse header and get stream and their id *** */
/* get all streams properties, /* get all streams properties,
* *
* TODO : stream bitrates properties(optional) * TODO : stream bitrates properties(optional)
* and bitrate mutual exclusion(optional) */ * and bitrate mutual exclusion(optional) */
asf_HeaderParse( p_access->stream, asf_HeaderParse( p_access->stream,
p_access->p_header, p_access->i_header ); p_access->p_header, p_access->i_header );
mms_StreamSelect( p_input, p_access->stream ); mms_StreamSelect( p_input, p_access->stream );
/* *** now select stream we want to receive *** */ /* *** now select stream we want to receive *** */
...@@ -1045,7 +1046,7 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -1045,7 +1046,7 @@ static int MMSOpen( input_thread_t *p_input,
/* for now, select first audio and video stream */ /* for now, select first audio and video stream */
for( i = 1; i < 128; i++ ) for( i = 1; i < 128; i++ )
{ {
if( p_access->stream[i].i_cat != MMS_STREAM_UNKNOWN ) if( p_access->stream[i].i_cat != MMS_STREAM_UNKNOWN )
{ {
i_streams++; i_streams++;
...@@ -1061,26 +1062,26 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -1061,26 +1062,26 @@ static int MMSOpen( input_thread_t *p_input,
if( p_access->stream[i].i_selected ) if( p_access->stream[i].i_selected )
{ {
var_buffer_add16( &buffer, 0x0000 ); var_buffer_add16( &buffer, 0x0000 );
msg_Info( p_input, msg_Info( p_input,
"selecting stream[0x%x] %s (%d kb/s)", "selecting stream[0x%x] %s (%d kb/s)",
i, i,
( p_access->stream[i].i_cat == MMS_STREAM_AUDIO ) ? ( p_access->stream[i].i_cat == MMS_STREAM_AUDIO ) ?
"audio" : "video" , "audio" : "video" ,
p_access->stream[i].i_bitrate / 1024); p_access->stream[i].i_bitrate / 1024);
} }
else else
{ {
var_buffer_add16( &buffer, 0x0002 ); var_buffer_add16( &buffer, 0x0002 );
msg_Info( p_input, msg_Info( p_input,
"ignoring stream[0x%x] %s (%d kb/s)", "ignoring stream[0x%x] %s (%d kb/s)",
i, i,
( p_access->stream[i].i_cat == MMS_STREAM_AUDIO ) ? ( p_access->stream[i].i_cat == MMS_STREAM_AUDIO ) ?
"audio" : "video" , "audio" : "video" ,
p_access->stream[i].i_bitrate / 1024); p_access->stream[i].i_bitrate / 1024);
} }
} }
} }
if( i_streams == 0 ) if( i_streams == 0 )
{ {
...@@ -1093,12 +1094,12 @@ static int MMSOpen( input_thread_t *p_input, ...@@ -1093,12 +1094,12 @@ static int MMSOpen( input_thread_t *p_input,
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_input, 0x21, 0 );
if( p_access->i_command != 0x21 ) if( p_access->i_command != 0x21 )
{ {
msg_Err( p_input, msg_Err( p_input,
"unknown answer (0x%x instead of 0x21)", "unknown answer (0x%x instead of 0x21)",
p_access->i_command ); p_access->i_command );
var_buffer_free( &buffer ); var_buffer_free( &buffer );
MMSClose( p_input ); MMSClose( p_input );
...@@ -1124,30 +1125,30 @@ static int MMSStart ( input_thread_t *p_input, uint32_t i_packet ) ...@@ -1124,30 +1125,30 @@ static int MMSStart ( input_thread_t *p_input, uint32_t i_packet )
/* *** start stream from packet 0 *** */ /* *** start stream from packet 0 *** */
var_buffer_initwrite( &buffer, 0 ); var_buffer_initwrite( &buffer, 0 );
var_buffer_add64( &buffer, 0 ); /* seek point in second */ var_buffer_add64( &buffer, 0 ); /* seek point in second */
var_buffer_add32( &buffer, 0xffffffff ); var_buffer_add32( &buffer, 0xffffffff );
var_buffer_add32( &buffer, i_packet ); // begin from start var_buffer_add32( &buffer, i_packet ); // begin from start
var_buffer_add8( &buffer, 0xff ); // stream time limit var_buffer_add8( &buffer, 0xff ); // stream time limit
var_buffer_add8( &buffer, 0xff ); // on 3bytes ... var_buffer_add8( &buffer, 0xff ); // on 3bytes ...
var_buffer_add8( &buffer, 0xff ); // var_buffer_add8( &buffer, 0xff ); //
var_buffer_add8( &buffer, 0x00 ); // don't use limit var_buffer_add8( &buffer, 0x00 ); // don't use limit
var_buffer_add32( &buffer, p_access->i_media_packet_id_type ); var_buffer_add32( &buffer, p_access->i_media_packet_id_type );
mms_CommandSend( p_input, 0x07, p_access->i_command_level, 0x0001ffff, mms_CommandSend( p_input, 0x07, p_access->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_input, 0x05, 0 );
if( p_access->i_command != 0x05 ) if( p_access->i_command != 0x05 )
{ {
msg_Err( p_input, msg_Err( p_input,
"unknown answer (0x%x instead of 0x05)", "unknown answer (0x%x instead of 0x05)",
p_access->i_command ); p_access->i_command );
return( -1 ); return( -1 );
} }
else else
{ {
/* get a packet */ /* get a packet */
mms_HeaderMediaRead( p_input, MMS_PACKET_MEDIA ); mms_HeaderMediaRead( p_input, MMS_PACKET_MEDIA );
msg_Dbg( p_input, "Streaming started" ); msg_Dbg( p_input, "Streaming started" );
...@@ -1162,7 +1163,7 @@ static int MMSStop ( input_thread_t *p_input ) ...@@ -1162,7 +1163,7 @@ static int MMSStop ( input_thread_t *p_input )
{ {
access_t *p_access = (access_t*)p_input->p_access_data; access_t *p_access = (access_t*)p_input->p_access_data;
/* *** stop stream but keep connection alive *** */ /* *** stop stream but keep connection alive *** */
mms_CommandSend( p_input, mms_CommandSend( p_input,
0x09, 0x09,
p_access->i_command_level, p_access->i_command_level,
...@@ -1180,7 +1181,7 @@ static int MMSClose ( input_thread_t *p_input ) ...@@ -1180,7 +1181,7 @@ static int MMSClose ( input_thread_t *p_input )
msg_Dbg( p_input, "Connection closed" ); msg_Dbg( p_input, "Connection closed" );
/* *** tell server that we will disconnect *** */ /* *** tell server that we will disconnect *** */
mms_CommandSend( p_input, mms_CommandSend( p_input,
0x0d, 0x0d,
p_access->i_command_level, p_access->i_command_level,
...@@ -1205,7 +1206,7 @@ static int MMSClose ( input_thread_t *p_input ) ...@@ -1205,7 +1206,7 @@ static int MMSClose ( input_thread_t *p_input )
close( p_access->socket_udp.i_handle ); close( p_access->socket_udp.i_handle );
#endif #endif
} }
FREE( p_access->p_cmd ); FREE( p_access->p_cmd );
FREE( p_access->p_media ); FREE( p_access->p_media );
FREE( p_access->p_header ); FREE( p_access->p_header );
...@@ -1219,7 +1220,7 @@ static int MMSClose ( input_thread_t *p_input ) ...@@ -1219,7 +1220,7 @@ static int MMSClose ( input_thread_t *p_input )
} }
/***************************************************************************** /*****************************************************************************
* mms_ParseURL : parse an url string and fill an url_t * mms_ParseURL : parse an url string and fill an url_t
*****************************************************************************/ *****************************************************************************/
static void mms_ParseURL( url_t *p_url, char *psz_url ) static void mms_ParseURL( url_t *p_url, char *psz_url )
{ {
...@@ -1227,20 +1228,20 @@ static void mms_ParseURL( url_t *p_url, char *psz_url ) ...@@ -1227,20 +1228,20 @@ static void mms_ParseURL( url_t *p_url, char *psz_url )
char *psz_server_port; char *psz_server_port;
p_url->psz_private = strdup( psz_url ); p_url->psz_private = strdup( psz_url );
psz_parser = p_url->psz_private; psz_parser = p_url->psz_private;
while( *psz_parser == '/' ) while( *psz_parser == '/' )
{ {
psz_parser++; psz_parser++;
} }
p_url->psz_server_addr = psz_parser; p_url->psz_server_addr = psz_parser;
while( *psz_parser && while( *psz_parser &&
*psz_parser != ':' && *psz_parser != '/' && *psz_parser != '@' ) *psz_parser != ':' && *psz_parser != '/' && *psz_parser != '@' )
{ {
psz_parser++; psz_parser++;
} }
if( *psz_parser == ':' ) if( *psz_parser == ':' )
{ {
...@@ -1261,16 +1262,16 @@ static void mms_ParseURL( url_t *p_url, char *psz_url ) ...@@ -1261,16 +1262,16 @@ static void mms_ParseURL( url_t *p_url, char *psz_url )
if( *psz_parser == '@' ) if( *psz_parser == '@' )
{ {
char *psz_bind_port; char *psz_bind_port;
*psz_parser = '\0'; *psz_parser = '\0';
psz_parser++; psz_parser++;
p_url->psz_bind_addr = psz_parser; p_url->psz_bind_addr = psz_parser;
while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' ) while( *psz_parser && *psz_parser != ':' && *psz_parser != '/' )
{ {
psz_parser++; psz_parser++;
} }
if( *psz_parser == ':' ) if( *psz_parser == ':' )
{ {
...@@ -1308,7 +1309,7 @@ static void mms_ParseURL( url_t *p_url, char *psz_url ) ...@@ -1308,7 +1309,7 @@ static void mms_ParseURL( url_t *p_url, char *psz_url )
psz_parser++; psz_parser++;
p_url->psz_path = psz_parser; p_url->psz_path = psz_parser;
} }
if( *psz_server_port ) if( *psz_server_port )
{ {
p_url->i_server_port = strtol( psz_server_port, &psz_parser, 10 ); p_url->i_server_port = strtol( psz_server_port, &psz_parser, 10 );
...@@ -1325,16 +1326,16 @@ static void mms_ParseURL( url_t *p_url, char *psz_url ) ...@@ -1325,16 +1326,16 @@ static void mms_ParseURL( url_t *p_url, char *psz_url )
* *
****************************************************************************/ ****************************************************************************/
static int mms_CommandSend( input_thread_t *p_input, static int mms_CommandSend( input_thread_t *p_input,
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_t *p_access = (access_t*)p_input->p_access_data; access_t *p_access = (access_t*)p_input->p_access_data;
int i_data_by8; int i_data_by8;
i_data_by8 = ( i_data + 7 ) / 8; i_data_by8 = ( i_data + 7 ) / 8;
/* first init uffer */ /* first init uffer */
...@@ -1343,7 +1344,7 @@ static int mms_CommandSend( input_thread_t *p_input, ...@@ -1343,7 +1344,7 @@ static int mms_CommandSend( input_thread_t *p_input,
var_buffer_add32( &buffer, 0x00000001 ); /* start sequence */ var_buffer_add32( &buffer, 0x00000001 ); /* start sequence */
var_buffer_add32( &buffer, 0xB00BFACE ); var_buffer_add32( &buffer, 0xB00BFACE );
/* size after protocol type */ /* size after protocol type */
var_buffer_add32( &buffer, i_data + MMS_CMD_HEADERSIZE - 16 ); var_buffer_add32( &buffer, i_data + MMS_CMD_HEADERSIZE - 16 );
var_buffer_add32( &buffer, 0x20534d4d ); /* protocol "MMS " */ var_buffer_add32( &buffer, 0x20534d4d ); /* protocol "MMS " */
var_buffer_add32( &buffer, i_data_by8 + 4 ); var_buffer_add32( &buffer, i_data_by8 + 4 );
var_buffer_add32( &buffer, p_access->i_seq_num ); p_access->i_seq_num++; var_buffer_add32( &buffer, p_access->i_seq_num ); p_access->i_seq_num++;
...@@ -1360,8 +1361,8 @@ static int mms_CommandSend( input_thread_t *p_input, ...@@ -1360,8 +1361,8 @@ static int mms_CommandSend( input_thread_t *p_input,
} }
/* send it */ /* send it */
if( send( p_access->socket_tcp.i_handle, if( send( p_access->socket_tcp.i_handle,
buffer.p_data, buffer.p_data,
buffer.i_data, buffer.i_data,
0 ) == -1 ) 0 ) == -1 )
{ {
...@@ -1371,7 +1372,7 @@ static int mms_CommandSend( input_thread_t *p_input, ...@@ -1371,7 +1372,7 @@ static int mms_CommandSend( input_thread_t *p_input,
var_buffer_free( &buffer ); var_buffer_free( &buffer );
return( 0 ); return( 0 );
} }
static int NetFillBuffer( input_thread_t *p_input ) static int NetFillBuffer( input_thread_t *p_input )
{ {
...@@ -1392,7 +1393,7 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1392,7 +1393,7 @@ static int NetFillBuffer( input_thread_t *p_input )
FD_ZERO( &fds ); FD_ZERO( &fds );
i_tcp = MMS_BUFFER_SIZE/2 - p_access->i_buffer_tcp; i_tcp = MMS_BUFFER_SIZE/2 - p_access->i_buffer_tcp;
if( p_access->i_proto == MMS_PROTO_UDP ) if( p_access->i_proto == MMS_PROTO_UDP )
{ {
i_udp = MMS_BUFFER_SIZE/2 - p_access->i_buffer_udp; i_udp = MMS_BUFFER_SIZE/2 - p_access->i_buffer_udp;
...@@ -1401,7 +1402,7 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1401,7 +1402,7 @@ static int NetFillBuffer( input_thread_t *p_input )
{ {
i_udp = 0; /* there isn't udp socket */ i_udp = 0; /* there isn't udp socket */
} }
i_handle_max = 0; i_handle_max = 0;
if( i_tcp > 0 ) if( i_tcp > 0 )
{ {
...@@ -1413,7 +1414,7 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1413,7 +1414,7 @@ static int NetFillBuffer( input_thread_t *p_input )
FD_SET( p_access->socket_udp.i_handle, &fds ); FD_SET( p_access->socket_udp.i_handle, &fds );
i_handle_max = __MAX( i_handle_max, p_access->socket_udp.i_handle ); i_handle_max = __MAX( i_handle_max, p_access->socket_udp.i_handle );
} }
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_input, "nothing to read %d:%d", i_tcp, i_udp );
...@@ -1429,7 +1430,7 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1429,7 +1430,7 @@ static int NetFillBuffer( input_thread_t *p_input )
timeout.tv_usec = 500000; timeout.tv_usec = 500000;
/* Find if some data is available */ /* Find if some data is available */
i_ret = select( i_handle_max + 1, i_ret = select( i_handle_max + 1,
&fds, &fds,
NULL, NULL, &timeout ); NULL, NULL, &timeout );
...@@ -1438,23 +1439,23 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1438,23 +1439,23 @@ static int NetFillBuffer( input_thread_t *p_input )
msg_Err( p_input, "network select error (%s)", strerror(errno) ); msg_Err( p_input, "network select error (%s)", strerror(errno) );
return -1; return -1;
} }
if( i_tcp > 0 && FD_ISSET( p_access->socket_tcp.i_handle, &fds ) ) if( i_tcp > 0 && FD_ISSET( p_access->socket_tcp.i_handle, &fds ) )
{ {
i_tcp_read = i_tcp_read =
recv( p_access->socket_tcp.i_handle, recv( p_access->socket_tcp.i_handle,
p_access->buffer_tcp + p_access->i_buffer_tcp, p_access->buffer_tcp + p_access->i_buffer_tcp,
i_tcp + MMS_BUFFER_SIZE/2, 0 ); i_tcp + MMS_BUFFER_SIZE/2, 0 );
} }
else else
{ {
i_tcp_read = 0; i_tcp_read = 0;
} }
if( i_udp > 0 && FD_ISSET( p_access->socket_udp.i_handle, &fds ) ) if( i_udp > 0 && FD_ISSET( p_access->socket_udp.i_handle, &fds ) )
{ {
i_udp_read = recv( p_access->socket_udp.i_handle, i_udp_read = recv( p_access->socket_udp.i_handle,
p_access->buffer_udp + p_access->i_buffer_udp, p_access->buffer_udp + p_access->i_buffer_udp,
i_udp + MMS_BUFFER_SIZE/2, 0 ); i_udp + MMS_BUFFER_SIZE/2, 0 );
} }
else else
...@@ -1465,8 +1466,8 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1465,8 +1466,8 @@ static int NetFillBuffer( input_thread_t *p_input )
#if 1 #if 1
if( p_access->i_proto == MMS_PROTO_UDP ) if( p_access->i_proto == MMS_PROTO_UDP )
{ {
msg_Dbg( p_input, msg_Dbg( p_input,
"filling buffer TCP:%d+%d UDP:%d+%d", "filling buffer TCP:%d+%d UDP:%d+%d",
p_access->i_buffer_tcp, p_access->i_buffer_tcp,
i_tcp_read, i_tcp_read,
p_access->i_buffer_udp, p_access->i_buffer_udp,
...@@ -1474,8 +1475,8 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1474,8 +1475,8 @@ static int NetFillBuffer( input_thread_t *p_input )
} }
else else
{ {
msg_Dbg( p_input, msg_Dbg( p_input,
"filling buffer TCP:%d+%d", "filling buffer TCP:%d+%d",
p_access->i_buffer_tcp, p_access->i_buffer_tcp,
i_tcp_read ); i_tcp_read );
} }
...@@ -1487,8 +1488,8 @@ static int NetFillBuffer( input_thread_t *p_input ) ...@@ -1487,8 +1488,8 @@ static int NetFillBuffer( input_thread_t *p_input )
#endif #endif
} }
static int mms_ParseCommand( input_thread_t *p_input, static int mms_ParseCommand( input_thread_t *p_input,
uint8_t *p_data, uint8_t *p_data,
int i_data, int i_data,
int *pi_used ) int *pi_used )
{ {
...@@ -1500,7 +1501,7 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1500,7 +1501,7 @@ static int mms_ParseCommand( input_thread_t *p_input,
access_t *p_access = (access_t*)p_input->p_access_data; access_t *p_access = (access_t*)p_input->p_access_data;
int i_length; int i_length;
uint32_t i_id; uint32_t i_id;
if( p_access->p_cmd ) if( p_access->p_cmd )
{ {
free( p_access->p_cmd ); free( p_access->p_cmd );
...@@ -1508,7 +1509,7 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1508,7 +1509,7 @@ static int mms_ParseCommand( input_thread_t *p_input,
p_access->i_cmd = i_data; p_access->i_cmd = i_data;
p_access->p_cmd = malloc( i_data ); p_access->p_cmd = malloc( i_data );
memcpy( p_access->p_cmd, p_data, i_data ); memcpy( p_access->p_cmd, p_data, i_data );
*pi_used = i_data; /* by default */ *pi_used = i_data; /* by default */
if( i_data < MMS_CMD_HEADERSIZE ) if( i_data < MMS_CMD_HEADERSIZE )
...@@ -1519,18 +1520,18 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1519,18 +1520,18 @@ static int mms_ParseCommand( input_thread_t *p_input,
} }
i_id = GetDWLE( p_data + 4 ); i_id = GetDWLE( p_data + 4 );
i_length = GetDWLE( p_data + 8 ) + 16; i_length = GetDWLE( p_data + 8 ) + 16;
if( i_id != 0xb00bface ) if( i_id != 0xb00bface )
{ {
msg_Err( p_input, msg_Err( p_input,
"incorrect command header (0x%x)", i_id ); "incorrect command header (0x%x)", i_id );
p_access->i_command = 0; p_access->i_command = 0;
return( -1 ); return( -1 );
} }
if( i_length > p_access->i_cmd ) if( i_length > p_access->i_cmd )
{ {
msg_Warn( p_input, msg_Warn( p_input,
"truncated command (missing %d bytes)", "truncated command (missing %d bytes)",
i_length - i_data ); i_length - i_data );
p_access->i_command = 0; p_access->i_command = 0;
...@@ -1542,7 +1543,7 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1542,7 +1543,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_input,
"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 ),
...@@ -1558,14 +1559,14 @@ static int mms_ParseCommand( input_thread_t *p_input, ...@@ -1558,14 +1559,14 @@ 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( input_thread_t *p_input,
uint8_t *p_data, int i_data, uint8_t *p_data, size_t i_data,
int *pi_used ) int *pi_used )
{ {
access_t *p_access = (access_t*)p_input->p_access_data; access_t *p_access = (access_t*)p_input->p_access_data;
int i_packet_seq_num; int i_packet_seq_num;
int i_packet_length; size_t i_packet_length;
int i_packet_id; uint32_t i_packet_id;
uint8_t *p_packet; uint8_t *p_packet;
...@@ -1577,15 +1578,15 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1577,15 +1578,15 @@ static int mms_ParsePacket( input_thread_t *p_input,
msg_Warn( p_input, "truncated packet (header incomplete)" ); msg_Warn( p_input, "truncated packet (header incomplete)" );
return( -1 ); return( -1 );
} }
i_packet_id = p_data[4]; i_packet_id = p_data[4];
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 );
if( i_packet_length > i_data || i_packet_length <= 8) if( i_packet_length > i_data || i_packet_length <= 8)
{ {
msg_Warn( p_input, msg_Warn( p_input,
"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;
...@@ -1602,7 +1603,7 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1602,7 +1603,7 @@ static int mms_ParsePacket( input_thread_t *p_input,
"receive MMS UDP pair timing" ); "receive MMS UDP pair timing" );
return( MMS_PACKET_UDP_TIMING ); return( MMS_PACKET_UDP_TIMING );
} }
if( i_packet_id != p_access->i_header_packet_id_type && if( i_packet_id != p_access->i_header_packet_id_type &&
i_packet_id != p_access->i_media_packet_id_type ) i_packet_id != p_access->i_media_packet_id_type )
{ {
...@@ -1613,11 +1614,11 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1613,11 +1614,11 @@ static int mms_ParsePacket( input_thread_t *p_input,
/* we now have a media or a header packet */ /* we now have a media or a header packet */
p_packet = malloc( i_packet_length - 8 ); // don't bother with preheader p_packet = malloc( i_packet_length - 8 ); // don't bother with preheader
memcpy( p_packet, p_data + 8, i_packet_length - 8 ); memcpy( p_packet, p_data + 8, i_packet_length - 8 );
if( i_packet_seq_num != p_access->i_packet_seq_num ) if( i_packet_seq_num != p_access->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_input,
"detected packet lost (%d != %d)", "detected packet lost (%d != %d)",
i_packet_seq_num, i_packet_seq_num,
p_access->i_packet_seq_num ); p_access->i_packet_seq_num );
...@@ -1630,8 +1631,8 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1630,8 +1631,8 @@ static int mms_ParsePacket( input_thread_t *p_input,
FREE( p_access->p_header ); FREE( p_access->p_header );
p_access->p_header = p_packet; p_access->p_header = p_packet;
p_access->i_header = i_packet_length - 8; p_access->i_header = i_packet_length - 8;
/* msg_Dbg( p_input, /* msg_Dbg( p_input,
"receive header packet (%d bytes)", "receive header packet (%d bytes)",
i_packet_length - 8 ); */ i_packet_length - 8 ); */
return( MMS_PACKET_HEADER ); return( MMS_PACKET_HEADER );
...@@ -1642,10 +1643,10 @@ static int mms_ParsePacket( input_thread_t *p_input, ...@@ -1642,10 +1643,10 @@ static int mms_ParsePacket( input_thread_t *p_input,
p_access->p_media = p_packet; p_access->p_media = p_packet;
p_access->i_media = i_packet_length - 8; p_access->i_media = i_packet_length - 8;
p_access->i_media_used = 0; p_access->i_media_used = 0;
/* msg_Dbg( p_input, /* msg_Dbg( p_input,
"receive media packet (%d bytes)", "receive media packet (%d bytes)",
i_packet_length - 8 ); */ i_packet_length - 8 ); */
return( MMS_PACKET_MEDIA ); return( MMS_PACKET_MEDIA );
} }
} }
...@@ -1664,18 +1665,18 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1664,18 +1665,18 @@ static int mms_ReceivePacket( input_thread_t *p_input )
continue; continue;
} }
/* TODO udp */ /* TODO udp */
i_packet_tcp_type = -1; i_packet_tcp_type = -1;
i_packet_udp_type = -1; i_packet_udp_type = -1;
if( p_access->i_buffer_tcp > 0 ) if( p_access->i_buffer_tcp > 0 )
{ {
int i_used; int i_used;
if( GetDWLE( p_access->buffer_tcp + 4 ) == 0xb00bface ) if( GetDWLE( p_access->buffer_tcp + 4 ) == 0xb00bface )
{ {
i_packet_tcp_type = i_packet_tcp_type =
mms_ParseCommand( p_input, mms_ParseCommand( p_input,
p_access->buffer_tcp, p_access->buffer_tcp,
p_access->i_buffer_tcp, p_access->i_buffer_tcp,
&i_used ); &i_used );
...@@ -1683,7 +1684,7 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1683,7 +1684,7 @@ static int mms_ReceivePacket( input_thread_t *p_input )
} }
else else
{ {
i_packet_tcp_type = i_packet_tcp_type =
mms_ParsePacket( p_input, mms_ParsePacket( p_input,
p_access->buffer_tcp, p_access->buffer_tcp,
p_access->i_buffer_tcp, p_access->i_buffer_tcp,
...@@ -1703,8 +1704,8 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1703,8 +1704,8 @@ static int mms_ReceivePacket( input_thread_t *p_input )
#if 0 #if 0
if( GetDWLE( p_access->buffer_tcp + 4 ) == 0xb00bface ) if( GetDWLE( p_access->buffer_tcp + 4 ) == 0xb00bface )
{ {
i_packet_tcp_type = i_packet_tcp_type =
mms_ParseCommand( p_input, mms_ParseCommand( p_input,
p_access->buffer_tcp, p_access->buffer_tcp,
p_access->i_buffer_tcp, p_access->i_buffer_tcp,
&i_used ); &i_used );
...@@ -1713,7 +1714,7 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1713,7 +1714,7 @@ static int mms_ReceivePacket( input_thread_t *p_input )
else else
#endif #endif
{ {
i_packet_tcp_type = i_packet_tcp_type =
mms_ParsePacket( p_input, mms_ParsePacket( p_input,
p_access->buffer_udp, p_access->buffer_udp,
p_access->i_buffer_udp, p_access->i_buffer_udp,
...@@ -1732,7 +1733,7 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1732,7 +1733,7 @@ static int mms_ReceivePacket( input_thread_t *p_input )
i_packet_udp_type = -1; i_packet_udp_type = -1;
} }
if( i_packet_tcp_type == MMS_PACKET_CMD && if( i_packet_tcp_type == MMS_PACKET_CMD &&
p_access->i_command == 0x1b ) p_access->i_command == 0x1b )
{ {
mms_CommandSend( p_input, 0x1b, 0, 0, NULL, 0 ); mms_CommandSend( p_input, 0x1b, 0, 0, NULL, 0 );
...@@ -1742,11 +1743,11 @@ static int mms_ReceivePacket( input_thread_t *p_input ) ...@@ -1742,11 +1743,11 @@ static int mms_ReceivePacket( input_thread_t *p_input )
if( i_packet_tcp_type != -1 ) if( i_packet_tcp_type != -1 )
{ {
return( i_packet_tcp_type ); return( i_packet_tcp_type );
} }
else if( i_packet_udp_type != -1 ) else if( i_packet_udp_type != -1 )
{ {
return( i_packet_udp_type ); return( i_packet_udp_type );
} }
} }
} }
...@@ -1761,8 +1762,8 @@ static int mms_ReceiveCommand( input_thread_t *p_input ) ...@@ -1761,8 +1762,8 @@ static int mms_ReceiveCommand( input_thread_t *p_input )
int i_status; int i_status;
NetFillBuffer( p_input ); NetFillBuffer( p_input );
i_status = mms_ParseCommand( p_input, i_status = mms_ParseCommand( p_input,
p_access->buffer_tcp, p_access->buffer_tcp,
p_access->i_buffer_tcp, p_access->i_buffer_tcp,
&i_used ); &i_used );
if( i_used < MMS_BUFFER_SIZE ) if( i_used < MMS_BUFFER_SIZE )
...@@ -1777,7 +1778,7 @@ static int mms_ReceiveCommand( input_thread_t *p_input ) ...@@ -1777,7 +1778,7 @@ static int mms_ReceiveCommand( input_thread_t *p_input )
{ {
return( -1 ); return( -1 );
} }
if( p_access->i_command == 0x1b ) if( p_access->i_command == 0x1b )
{ {
mms_CommandSend( p_input, 0x1b, 0, 0, NULL, 0 ); mms_CommandSend( p_input, 0x1b, 0, 0, NULL, 0 );
...@@ -1815,7 +1816,7 @@ static int mms_CommandRead( input_thread_t *p_input, int i_command1, int i_comma ...@@ -1815,7 +1816,7 @@ static int mms_CommandRead( input_thread_t *p_input, int i_command1, int i_comma
} }
else if( p_access->i_command == i_command1 || p_access->i_command == i_command2 ) else if( p_access->i_command == i_command1 || p_access->i_command == i_command2 )
{ {
return( 0 ); return( 0 );
} }
else else
{ {
...@@ -1844,7 +1845,7 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type ) ...@@ -1844,7 +1845,7 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type )
{ {
access_t *p_access = (access_t*)p_input->p_access_data; access_t *p_access = (access_t*)p_input->p_access_data;
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;
...@@ -1853,7 +1854,7 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type ) ...@@ -1853,7 +1854,7 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type )
if( i_status < 0 ) if( i_status < 0 )
{ {
i_count++; i_count++;
msg_Warn( p_input, msg_Warn( p_input,
"cannot receive header (%d/%d)", i_count, MMS_RETRY_MAX ); "cannot receive header (%d/%d)", i_count, MMS_RETRY_MAX );
msleep( MMS_RETRY_SLEEP ); msleep( MMS_RETRY_SLEEP );
} }
...@@ -1874,10 +1875,10 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type ) ...@@ -1874,10 +1875,10 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type )
p_access->i_eos = 1; p_access->i_eos = 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_input,
"reinitialization needed --> unsupported" ); "reinitialization needed --> unsupported" );
p_access->i_eos = 1; p_access->i_eos = 1;
return( -1 ); return( -1 );
...@@ -1886,7 +1887,7 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type ) ...@@ -1886,7 +1887,7 @@ static int mms_HeaderMediaRead( input_thread_t *p_input, int i_type )
} }
} }
} }
msg_Err( p_input, msg_Err( p_input,
"cannot receive %s (abording)", "cannot receive %s (abording)",
( i_type == MMS_PACKET_HEADER ) ? "header" : "media data" ); ( i_type == MMS_PACKET_HEADER ) ? "header" : "media data" );
return( -1 ); return( -1 );
......
modules/access/mms/mms.h
View file @ 64310cf3
...@@ -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.5 2002/11/25 15:08:34 fenrir Exp $ * $Id: mms.h,v 1.6 2002/12/06 13:05:22 sam Exp $
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...@@ -29,7 +29,7 @@ typedef struct url_s ...@@ -29,7 +29,7 @@ typedef struct url_s
char *psz_bind_addr; char *psz_bind_addr;
int i_bind_port; int i_bind_port;
char *psz_path; char *psz_path;
/* private */ /* private */
...@@ -48,7 +48,7 @@ typedef struct url_s ...@@ -48,7 +48,7 @@ typedef struct url_s
#define MMS_PACKET_HEADER 2 #define MMS_PACKET_HEADER 2
#define MMS_PACKET_MEDIA 3 #define MMS_PACKET_MEDIA 3
#define MMS_PACKET_UDP_TIMING 4 #define MMS_PACKET_UDP_TIMING 4
#define MMS_STREAM_VIDEO 0x0001 #define MMS_STREAM_VIDEO 0x0001
#define MMS_STREAM_AUDIO 0x0002 #define MMS_STREAM_AUDIO 0x0002
...@@ -63,7 +63,7 @@ typedef struct mms_stream_s ...@@ -63,7 +63,7 @@ typedef struct mms_stream_s
int i_cat; /* MMS_STREAM_VIDEO, MMS_STREAM_AUDIO */ int i_cat; /* MMS_STREAM_VIDEO, MMS_STREAM_AUDIO */
int i_bitrate; /* -1 if unknown */ int i_bitrate; /* -1 if unknown */
int i_selected; int i_selected;
} mms_stream_t; } mms_stream_t;
#define MMS_BUFFER_SIZE 100000 #define MMS_BUFFER_SIZE 100000
...@@ -76,15 +76,15 @@ typedef struct access_s ...@@ -76,15 +76,15 @@ typedef struct access_s
char *psz_bind_addr; /* used by udp */ char *psz_bind_addr; /* used by udp */
url_t url; /* connect to this server */ url_t url; /* connect to this server */
mms_stream_t stream[128]; /* in asf never more than 1->127 streams */ mms_stream_t stream[128]; /* in asf never more than 1->127 streams */
off_t i_pos; /* position of next byte to be read */ 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;
uint8_t buffer_udp[MMS_BUFFER_SIZE]; uint8_t buffer_udp[MMS_BUFFER_SIZE];
int i_buffer_udp; int i_buffer_udp;
...@@ -96,17 +96,17 @@ typedef struct access_s ...@@ -96,17 +96,17 @@ typedef struct access_s
uint32_t i_media_packet_id_type; uint32_t i_media_packet_id_type;
int i_packet_seq_num; int i_packet_seq_num;
uint8_t *p_cmd; /* latest command read */ uint8_t *p_cmd; /* latest command read */
int i_cmd; /* allocated at the begining */ int i_cmd; /* allocated at the begining */
uint8_t *p_header; /* allocated by mms_ReadPacket */ uint8_t *p_header; /* allocated by mms_ReadPacket */
int i_header; int i_header;
uint8_t *p_media; /* allocated by mms_ReadPacket */ uint8_t *p_media; /* allocated by mms_ReadPacket */
int i_media; size_t i_media;
int i_media_used; size_t i_media_used;
/* extracted informations */ /* extracted informations */
int i_command; int i_command;
int i_eos; int i_eos;
...@@ -120,20 +120,20 @@ typedef struct access_s ...@@ -120,20 +120,20 @@ typedef struct access_s
/* from 0x06 answer */ /* from 0x06 answer */
uint32_t i_flags_broadcast; uint32_t i_flags_broadcast;
uint32_t i_media_length; uint32_t i_media_length;
int i_packet_length; size_t i_packet_length;
uint32_t i_packet_count; uint32_t i_packet_count;
int i_max_bit_rate; int i_max_bit_rate;
int i_header_size; size_t i_header_size;
} access_t; } access_t;
static inline uint16_t GetWLE( u8 *p_buff ) static inline uint16_t GetWLE( uint8_t *p_buff )
{ {
return( (p_buff[0]) + ( p_buff[1] <<8 ) ); return( (p_buff[0]) + ( p_buff[1] <<8 ) );
} }
static inline uint32_t GetDWLE( u8 *p_buff ) static inline uint32_t GetDWLE( uint8_t *p_buff )
{ {
return( p_buff[0] + ( p_buff[1] <<8 ) + return( p_buff[0] + ( p_buff[1] <<8 ) +
( p_buff[2] <<16 ) + ( p_buff[3] <<24 ) ); ( p_buff[2] <<16 ) + ( p_buff[3] <<24 ) );
......
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