X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmisc%2Frtsp.c;h=a8ebc4310166c7b510d70feabcfc664527119530;hb=bf472b10b5b217259a1d6fabcf438c5d196096c4;hp=ca1b5bfe79b098485944f27f86d5deb7ef480022;hpb=bdb6d9864f5c045115b8831618b003b28694922e;p=vlc diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c index ca1b5bfe79..a8ebc43101 100644 --- a/modules/misc/rtsp.c +++ b/modules/misc/rtsp.c @@ -42,8 +42,7 @@ #include #include #include - -#include +#include #ifndef WIN32 # include @@ -133,7 +132,9 @@ struct media_es_t es_format_t fmt; uint8_t i_payload_type; - char *psz_rtpmap; + const char *psz_ptname; + unsigned i_clock_rate; + unsigned i_channels; char *psz_fmtp; }; @@ -153,15 +154,12 @@ struct vod_media_t int i_payload_type; - int64_t i_sdp_id; - int i_sdp_version; - vlc_mutex_t lock; /* ES list */ int i_es; media_es_t **es; - char *psz_mux; + const char *psz_mux; bool b_raw; /* RTSP client */ @@ -186,7 +184,6 @@ struct vod_sys_t int i_session_timeout; /* List of media */ - vlc_mutex_t lock_media; int i_media_id; int i_media; vod_media_t **media; @@ -246,9 +243,8 @@ static char *SDPGenerate( const vod_media_t *, httpd_client_t *cl ); static void sprintf_hexa( char *s, uint8_t *p_data, int i_data ) { static const char hex[16] = "0123456789abcdef"; - int i; - for( i = 0; i < i_data; i++ ) + for( int i = 0; i < i_data; i++ ) { s[2*i+0] = hex[(p_data[i]>>4)&0xf]; s[2*i+1] = hex[(p_data[i] )&0xf]; @@ -266,7 +262,7 @@ static int Open( vlc_object_t *p_this ) char *psz_url = NULL; vlc_url_t url; - psz_url = config_GetPsz( p_vod, "rtsp-host" ); + psz_url = var_InheritString( p_vod, "rtsp-host" ); vlc_UrlParse( &url, psz_url, 0 ); free( psz_url ); @@ -298,8 +294,6 @@ static int Open( vlc_object_t *p_this ) vlc_UrlClean( &url ); - vlc_mutex_init( &p_sys->lock_media ); - TAB_INIT( p_sys->i_media, p_sys->media ); p_sys->i_media_id = 0; @@ -339,8 +333,6 @@ static void Close( vlc_object_t * p_this ) { vod_t *p_vod = (vod_t *)p_this; vod_sys_t *p_sys = p_vod->p_sys; - block_t *p_block_cmd; - rtsp_cmd_t cmd; /* Stop command thread */ vlc_object_kill( p_vod ); @@ -349,13 +341,14 @@ static void Close( vlc_object_t * p_this ) while( block_FifoCount( p_sys->p_fifo_cmd ) > 0 ) { - p_block_cmd = block_FifoGet( p_sys->p_fifo_cmd ); - memcpy( &cmd, p_block_cmd->p_buffer, sizeof(cmd) ); - block_Release( p_block_cmd ); - if ( cmd.i_type == RTSP_CMD_TYPE_DEL ) - MediaDel(p_vod, cmd.p_media); - free( cmd.psz_session ); - free( cmd.psz_arg ); + rtsp_cmd_t cmd; + block_t *p_block_cmd = block_FifoGet( p_sys->p_fifo_cmd ); + memcpy( &cmd, p_block_cmd->p_buffer, sizeof(cmd) ); + block_Release( p_block_cmd ); + if ( cmd.i_type == RTSP_CMD_TYPE_DEL ) + MediaDel(p_vod, cmd.p_media); + free( cmd.psz_session ); + free( cmd.psz_arg ); } block_FifoRelease( p_sys->p_fifo_cmd ); @@ -369,8 +362,6 @@ static void Close( vlc_object_t * p_this ) msg_Err( p_vod, "rtsp vod leaking %d medias", p_sys->i_media ); TAB_CLEAN( p_sys->i_media, p_sys->media ); - vlc_mutex_destroy( &p_sys->lock_media ); - free( p_sys->psz_path ); free( p_sys->psz_raw_mux ); free( p_sys ); @@ -382,7 +373,6 @@ static void Close( vlc_object_t * p_this ) static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name, input_item_t *p_item ) { - int i; vod_sys_t *p_sys = p_vod->p_sys; vod_media_t *p_media = calloc( 1, sizeof(vod_media_t) ); @@ -413,7 +403,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name, msg_Dbg( p_vod, "created RTSP url: %s", p_media->psz_rtsp_path ); if( asprintf( &p_media->psz_rtsp_control_v4, - "a=control:rtsp://%%s:%d%s/trackID=%%d\r\n", + "rtsp://%%s:%d%s/trackID=%%d", p_sys->i_port, p_media->psz_rtsp_path ) < 0 ) { httpd_UrlDelete( p_media->p_rtsp_url ); @@ -422,7 +412,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name, return NULL; } if( asprintf( &p_media->psz_rtsp_control_v6, - "a=control:rtsp://[%%s]:%d%s/trackID=%%d\r\n", + "rtsp://[%%s]:%d%s/trackID=%%d", p_sys->i_port, p_media->psz_rtsp_path ) < 0 ) { httpd_UrlDelete( p_media->p_rtsp_url ); @@ -450,13 +440,11 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name, p_media->i_payload_type = 96; - p_media->i_sdp_id = mdate(); - p_media->i_sdp_version = 1; p_media->i_length = input_item_GetDuration( p_item ); vlc_mutex_lock( &p_item->lock ); msg_Dbg( p_vod, "media has %i declared ES", p_item->i_es ); - for( i = 0; i < p_item->i_es; i++ ) + for( int i = 0; i < p_item->i_es; i++ ) { MediaAddES( p_vod, p_media, p_item->es[i] ); } @@ -477,9 +465,7 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media ) msg_Dbg( p_vod, "deleting media: %s", p_media->psz_rtsp_path ); - vlc_mutex_lock( &p_sys->lock_media ); TAB_REMOVE( p_sys->i_media, p_sys->media, p_media ); - vlc_mutex_unlock( &p_sys->lock_media ); httpd_UrlDelete( p_media->p_rtsp_url ); @@ -497,18 +483,23 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media ) vlc_mutex_destroy( &p_media->lock ); - free( p_media->psz_mux ); free( p_media ); } static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) { char *psz_urlc; + + if( p_media->i_payload_type >= 128 ) + { + msg_Err( p_vod, "too many elementary streams"); + return VLC_EGENERIC; + } + media_es_t *p_es = calloc( 1, sizeof(media_es_t) ); if( !p_es ) return VLC_ENOMEM; - free( p_media->psz_mux ); p_media->psz_mux = NULL; /* TODO: update SDP, etc... */ @@ -520,6 +511,9 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) } msg_Dbg( p_vod, " - ES %4.4s (%s)", (char *)&p_fmt->i_codec, psz_urlc ); + p_es->i_clock_rate = 90000; + p_es->i_channels = 1; + switch( p_fmt->i_codec ) { case VLC_CODEC_S16B: @@ -536,36 +530,36 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) { p_es->i_payload_type = p_media->i_payload_type++; } - if( asprintf( &p_es->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate, - p_fmt->audio.i_channels ) == -1 ) - p_es->psz_rtpmap = NULL; + p_es->psz_ptname = "L16"; + p_es->i_clock_rate = p_fmt->audio.i_rate; + p_es->i_channels = p_fmt->audio.i_channels; break; case VLC_CODEC_U8: p_es->i_payload_type = p_media->i_payload_type++; - if( asprintf( &p_es->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate, - p_fmt->audio.i_channels ) == -1 ) - p_es->psz_rtpmap = NULL; + p_es->psz_ptname = "L8"; + p_es->i_clock_rate = p_fmt->audio.i_rate; + p_es->i_channels = p_fmt->audio.i_channels; break; case VLC_CODEC_MPGA: p_es->i_payload_type = 14; - p_es->psz_rtpmap = strdup( "MPA/90000" ); + p_es->psz_ptname = "MPA"; break; case VLC_CODEC_MPGV: p_es->i_payload_type = 32; - p_es->psz_rtpmap = strdup( "MPV/90000" ); + p_es->psz_ptname = "MPV"; break; case VLC_CODEC_A52: p_es->i_payload_type = p_media->i_payload_type++; - if( asprintf( &p_es->psz_rtpmap, "ac3/%d", p_fmt->audio.i_rate ) == -1 ) - p_es->psz_rtpmap = NULL; + p_es->psz_ptname = "ac3"; + p_es->i_clock_rate = p_fmt->audio.i_rate; break; case VLC_CODEC_H263: p_es->i_payload_type = p_media->i_payload_type++; - p_es->psz_rtpmap = strdup( "H263-1998/90000" ); + p_es->psz_ptname = "H263-1998"; break; case VLC_CODEC_H264: p_es->i_payload_type = p_media->i_payload_type++; - p_es->psz_rtpmap = strdup( "H264/90000" ); + p_es->psz_ptname = "H264"; p_es->psz_fmtp = NULL; /* FIXME AAAAAAAAAAAARRRRRRRRGGGG copied from stream_out/rtp.c */ if( p_fmt->i_extra > 0 ) @@ -576,34 +570,59 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) char *p_64_pps = NULL; char hexa[6+1]; - while( i_buffer > 4 && - p_buffer[0] == 0 && p_buffer[1] == 0 && - p_buffer[2] == 0 && p_buffer[3] == 1 ) + while( i_buffer > 4 ) { - const int i_nal_type = p_buffer[4]&0x1f; - int i_offset; + int i_offset = 0; int i_size = 0; + while( p_buffer[0] != 0 || p_buffer[1] != 0 || + p_buffer[2] != 1 ) + { + p_buffer++; + i_buffer--; + if( i_buffer == 0 ) break; + } + + if( i_buffer < 4 || memcmp(p_buffer, "\x00\x00\x01", 3 ) ) + { + /* No startcode found.. */ + break; + } + p_buffer += 3; + i_buffer -= 3; + + const int i_nal_type = p_buffer[0]&0x1f; + i_size = i_buffer; - for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++) + for( i_offset = 0; i_offset+2 < i_buffer ; i_offset++) { - if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 ) + if( !memcmp(p_buffer + i_offset, "\x00\x00\x01", 3 ) ) { /* we found another startcode */ + while( i_offset > 0 && 0 == p_buffer[ i_offset - 1 ] ) + i_offset--; i_size = i_offset; break; } } + + if( i_size == 0 ) + { + /* No-info found in nal */ + continue; + } + if( i_nal_type == 7 ) { free( p_64_sps ); - p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 ); - sprintf_hexa( hexa, &p_buffer[5], 3 ); + p_64_sps = vlc_b64_encode_binary( p_buffer, i_size ); + /* XXX: nothing ensures that i_size >= 4 ?? */ + sprintf_hexa( hexa, &p_buffer[1], 3 ); } else if( i_nal_type == 8 ) { free( p_64_pps ); - p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 ); + p_64_pps = vlc_b64_encode_binary( p_buffer, i_size ); } i_buffer -= i_size; p_buffer += i_size; @@ -631,7 +650,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) break; case VLC_CODEC_MP4V: p_es->i_payload_type = p_media->i_payload_type++; - p_es->psz_rtpmap = strdup( "MP4V-ES/90000" ); + p_es->psz_ptname = "MP4V-ES"; if( p_fmt->i_extra > 0 ) { char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 ); @@ -644,8 +663,8 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) break; case VLC_CODEC_MP4A: p_es->i_payload_type = p_media->i_payload_type++; - if( asprintf( &p_es->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate ) == -1 ) - p_es->psz_rtpmap = NULL; + p_es->psz_ptname = "mpeg4-generic"; + p_es->i_clock_rate = p_fmt->audio.i_rate; if( p_fmt->i_extra > 0 ) { char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 ); @@ -659,25 +678,29 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) } break; case VLC_FOURCC( 'm', 'p', '2', 't' ): - p_media->psz_mux = strdup("ts"); + p_media->psz_mux = "ts"; p_es->i_payload_type = 33; - p_es->psz_rtpmap = strdup( "MP2T/90000" ); + p_es->psz_ptname = "MP2T"; break; case VLC_FOURCC( 'm', 'p', '2', 'p' ): - p_media->psz_mux = strdup("ps"); + p_media->psz_mux = "ps"; p_es->i_payload_type = p_media->i_payload_type++; - p_es->psz_rtpmap = strdup( "MP2P/90000" ); + p_es->psz_ptname = "MP2P"; break; case VLC_CODEC_AMR_NB: p_es->i_payload_type = p_media->i_payload_type++; - p_es->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ? - "AMR/8000/2" : "AMR/8000" ); + p_es->psz_ptname = "AMR"; + p_es->i_clock_rate = 8000; + if(p_fmt->audio.i_channels == 2 ) + p_es->i_channels = 2; p_es->psz_fmtp = strdup( "octet-align=1" ); break; case VLC_CODEC_AMR_WB: p_es->i_payload_type = p_media->i_payload_type++; - p_es->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ? - "AMR-WB/16000/2" : "AMR-WB/16000" ); + p_es->psz_ptname = "AMR-WB"; + p_es->i_clock_rate = 16000; + if(p_fmt->audio.i_channels == 2 ) + p_es->i_channels = 2; p_es->psz_fmtp = strdup( "octet-align=1" ); break; @@ -719,18 +742,15 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) TAB_APPEND( p_media->i_es, p_media->es, p_es ); vlc_mutex_unlock( &p_media->lock ); - p_media->i_sdp_version++; - return VLC_SUCCESS; } static void MediaDelES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt) { media_es_t *p_es = NULL; - int i; /* Find the ES */ - for( i = 0; i < p_media->i_es; i++ ) + for( int i = 0; i < p_media->i_es; i++ ) { if( p_media->es[i]->fmt.i_cat == p_fmt->i_cat && p_media->es[i]->fmt.i_codec == p_fmt->i_codec && @@ -747,9 +767,7 @@ static void MediaDelES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt) TAB_REMOVE( p_media->i_es, p_media->es, p_es ); vlc_mutex_unlock( &p_media->lock ); - free( p_es->psz_rtpmap ); free( p_es->psz_fmtp ); - p_media->i_sdp_version++; if( p_es->p_rtsp_url ) httpd_UrlDelete( p_es->p_rtsp_url ); es_format_Clean( &p_es->fmt ); @@ -803,9 +821,7 @@ static void* CommandThread( vlc_object_t *p_this ) if ( cmd.i_type == RTSP_CMD_TYPE_ADD ) { - vlc_mutex_lock( &p_sys->lock_media ); TAB_APPEND( p_sys->i_media, p_sys->media, cmd.p_media ); - vlc_mutex_unlock( &p_sys->lock_media ); goto next; } @@ -816,7 +832,6 @@ static void* CommandThread( vlc_object_t *p_this ) } /* */ - vlc_mutex_lock( &p_sys->lock_media ); for( i = 0; i < p_sys->i_media; i++ ) { if( p_sys->media[i]->id == cmd.i_media_id ) @@ -824,7 +839,6 @@ static void* CommandThread( vlc_object_t *p_this ) } if( i >= p_sys->i_media ) { - vlc_mutex_unlock( &p_sys->lock_media ); goto next; } p_media = p_sys->media[i]; @@ -862,7 +876,6 @@ static void* CommandThread( vlc_object_t *p_this ) default: break; } - vlc_mutex_unlock( &p_sys->lock_media ); next: free( cmd.psz_session ); @@ -896,9 +909,7 @@ static rtsp_client_t *RtspClientNew( vod_media_t *p_media, char *psz_session ) static rtsp_client_t *RtspClientGet( vod_media_t *p_media, const char *psz_session ) { - int i; - - for( i = 0; psz_session && i < p_media->i_rtsp; i++ ) + for( int i = 0; psz_session && i < p_media->i_rtsp; i++ ) { if( !strcmp( p_media->rtsp[i]->psz_session, psz_session ) ) return p_media->rtsp[i]; @@ -929,23 +940,23 @@ static void RtspClientDel( vod_media_t *p_media, rtsp_client_t *p_rtsp ) static float ParseNPT (const char *str) { - locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL); - locale_t oldloc = uselocale (loc); - unsigned hour, min; - float sec; - - if (sscanf (str, "%u:%u:%f", &hour, &min, &sec) == 3) - sec += ((hour * 60) + min) * 60; - else - if (sscanf (str, "%f", &sec) != 1) - sec = 0.; - - if (loc != (locale_t)0) - { - uselocale (oldloc); - freelocale (loc); - } - return sec; + locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL); + locale_t oldloc = uselocale (loc); + unsigned hour, min; + float sec; + + if (sscanf (str, "%u:%u:%f", &hour, &min, &sec) == 3) + sec += ((hour * 60) + min) * 60; + else + if (sscanf (str, "%f", &sec) != 1) + sec = 0.; + + if (loc != (locale_t)0) + { + uselocale (oldloc); + freelocale (loc); + } + return sec; } @@ -996,9 +1007,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, if( strstr( psz_transport, "MP2T/H2221/UDP" ) || strstr( psz_transport, "RAW/RAW/UDP" ) ) { - free( p_media->psz_mux ); - p_media->psz_mux = NULL; - p_media->psz_mux = strdup( p_vod->p_sys->psz_raw_mux ); + p_media->psz_mux = p_vod->p_sys->psz_raw_mux; p_media->b_raw = true; } @@ -1025,7 +1034,8 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, answer->p_body = NULL; break; } - if( asprintf( &psz_new, "%d", rand() ) < 0 ) +#warning Should use secure randomness here! (spoofing risk) + if( asprintf( &psz_new, "%lu", vlc_mrand48() ) < 0 ) return VLC_ENOMEM; psz_session = psz_new; @@ -1089,7 +1099,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, case HTTPD_MSG_PLAY: { char *psz_output, ip[NI_MAXNUMERICHOST]; - int i, i_port_audio = 0, i_port_video = 0; + int i_port_audio = 0, i_port_video = 0; /* for now only multicast so easy */ if( !psz_playnow ) @@ -1122,7 +1132,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, { double f_pos = ParseNPT (psz_position + 4); msg_Dbg( p_vod, "seeking request: %s", psz_position ); - f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100; + f_pos /= ((double)(p_media->i_length)) / CLOCK_FREQ / 100; CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media, psz_session, f_pos, NULL ); } @@ -1149,7 +1159,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, psz_session, f_scale, NULL ); } - if( p_rtsp->b_paused == true ) + if( p_rtsp->b_paused ) { p_rtsp->b_paused = false; CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, @@ -1174,7 +1184,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, p_rtsp->b_playing = true; /* FIXME for != 1 video and 1 audio */ - for( i = 0; i < p_rtsp->i_es; i++ ) + for( int i = 0; i < p_rtsp->i_es; i++ ) { if( p_rtsp->es[i]->p_media_es->fmt.i_cat == AUDIO_ES ) i_port_audio = p_rtsp->es[i]->i_port; @@ -1243,9 +1253,12 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, p_rtsp = RtspClientGet( p_media, psz_session ); if( !p_rtsp ) break; - CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session, - 0, NULL ); - p_rtsp->b_paused = true; + if( !p_rtsp->b_paused ) + { + CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session, + 0, NULL ); + p_rtsp->b_paused = true; + } answer->i_status = 200; answer->i_body = 0; @@ -1279,7 +1292,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, return VLC_EGENERIC; } - httpd_MsgAdd( answer, "Server", "VLC Server" ); + httpd_MsgAdd( answer, "Server", "VLC/%s", VERSION ); httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); psz_cseq = httpd_MsgGet( query, "Cseq" ); psz_cseq ? i_cseq = atoi( psz_cseq ) : 0; @@ -1312,7 +1325,6 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl, const char *psz_position = NULL; const char *psz_cseq = NULL; int i_cseq = 0; - int i; if( answer == NULL || query == NULL ) return VLC_SUCCESS; @@ -1364,7 +1376,8 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl, answer->p_body = NULL; break; } - if( asprintf( &psz_new, "%d", rand() ) < 0 ) +#warning Session ID should be securely random (spoofing risk) + if( asprintf( &psz_new, "%lu", vlc_mrand48() ) < 0 ) return VLC_ENOMEM; psz_session = psz_new; @@ -1410,20 +1423,20 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl, if( strstr( psz_transport, "MP2T/H2221/UDP" ) ) { httpd_MsgAdd( answer, "Transport", - "MP2T/H2221/UDP;client_port=%d-%d", + "MP2T/H2221/UDP;unicast;client_port=%d-%d", p_rtsp_es->i_port, p_rtsp_es->i_port + 1 ); } else if( strstr( psz_transport, "RAW/RAW/UDP" ) ) { httpd_MsgAdd( answer, "Transport", - "RAW/RAW/UDP;client_port=%d-%d", + "RAW/RAW/UDP;unicast;client_port=%d-%d", p_rtsp_es->i_port, p_rtsp_es->i_port + 1 ); } } else { httpd_MsgAdd( answer, "Transport", - "RTP/AVP/UDP;client_port=%d-%d", + "RTP/AVP/UDP;unicast;client_port=%d-%d", p_rtsp_es->i_port, p_rtsp_es->i_port + 1 ); } } @@ -1452,7 +1465,7 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl, { double f_pos = ParseNPT (psz_position + 4); msg_Dbg( p_vod, "seeking request: %s", psz_position ); - f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100; + f_pos /= ((double)(p_media->i_length)) / CLOCK_FREQ / 100; CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media, psz_session, f_pos, NULL ); } @@ -1476,7 +1489,7 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl, p_rtsp = RtspClientGet( p_media, psz_session ); if( !p_rtsp ) break; - for( i = 0; i < p_rtsp->i_es; i++ ) + for( int i = 0; i < p_rtsp->i_es; i++ ) { if( p_rtsp->es[i]->p_media_es == p_es ) { @@ -1502,9 +1515,12 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl, p_rtsp = RtspClientGet( p_media, psz_session ); if( !p_rtsp ) break; - CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session, - 0, NULL ); - p_rtsp->b_paused = true; + if( !p_rtsp->b_paused ) + { + CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session, + 0, NULL ); + p_rtsp->b_paused = true; + } answer->i_status = 200; answer->i_body = 0; @@ -1516,7 +1532,7 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl, break; } - httpd_MsgAdd( answer, "Server", "VLC Server" ); + httpd_MsgAdd( answer, "Server", "VLC/%s", VERSION ); httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body ); psz_cseq = httpd_MsgGet( query, "Cseq" ); if (psz_cseq) @@ -1538,94 +1554,65 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl, *****************************************************************************/ static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl ) { - int i, i_size; - char *p, *psz_sdp, ip[NI_MAXNUMERICHOST], ipv; + char *psz_sdp, ip[NI_MAXNUMERICHOST]; const char *psz_control; if( httpd_ServerIP( cl, ip ) == NULL ) return NULL; - p = strchr( ip, '%' ); - if( p != NULL ) - *p = '\0'; /* remove scope if present */ + bool ipv6 = ( strchr( ip, ':' ) != NULL ); - ipv = ( strchr( ip, ':' ) != NULL ) ? '6' : '4'; + psz_control = ipv6 ? p_media->psz_rtsp_control_v6 + : p_media->psz_rtsp_control_v4; - /* Calculate size */ - i_size = sizeof( "v=0\r\n" ) + - sizeof( "o=- * * IN IP4 \r\n" ) + 10 + NI_MAXNUMERICHOST + - sizeof( "c=IN IP4 0.0.0.0\r\n" ) + 20 + 10 + - sizeof( "t=0 0\r\n" ) + /* FIXME */ - sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) + - sizeof( "a=range:npt=0-1000000000.000\r\n" ); - - psz_control = (ipv == '6') ? p_media->psz_rtsp_control_v6 - : p_media->psz_rtsp_control_v4; - for( i = 0; i < p_media->i_es; i++ ) - { - media_es_t *p_es = p_media->es[i]; - - i_size += sizeof( "m=**d*o * RTP/AVP *\r\n" ) + 19; - if( p_es->psz_rtpmap ) - { - i_size += sizeof( "a=rtpmap:* *\r\n" ) + - strlen( p_es->psz_rtpmap ) + 9; - } - if( p_es->psz_fmtp ) - { - i_size += sizeof( "a=fmtp:* *\r\n" ) + - strlen( p_es->psz_fmtp ) + 9; - } - } - i_size += (strlen( psz_control ) + strlen( ip ) + 9) * p_media->i_es; - - p = psz_sdp = malloc( i_size ); - p += sprintf( p, "v=0\r\n" ); - p += sprintf( p, "o=- %"PRId64" %d IN IP%c %s\r\n", - p_media->i_sdp_id, p_media->i_sdp_version, ipv, ip ); + /* Dummy destination address for RTSP */ + struct sockaddr_storage dst; + socklen_t dstlen = ipv6 ? sizeof( struct sockaddr_in6 ) + : sizeof( struct sockaddr_in ); + memset (&dst, 0, dstlen); + dst.ss_family = ipv6 ? AF_INET6 : AF_INET; +#ifdef HAVE_SA_LEN + dst.ss_len = dstlen; +#endif - p += sprintf( p, "c=IN IP%c %s\r\n", ipv, ipv == '6' ? "::" : "0.0.0.0" ); - p += sprintf( p, "t=0 0\r\n" ); /* FIXME */ - p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" ); + psz_sdp = vlc_sdp_Start( VLC_OBJECT( p_media->p_vod ), "sout-rtp-", + NULL, 0, (struct sockaddr *)&dst, dstlen ); + if( psz_sdp == NULL ) + return NULL; if( p_media->i_length > 0 ) { lldiv_t d = lldiv( p_media->i_length / 1000, 1000 ); - p += sprintf( p, "a=range:npt=0-%lld.%03u\r\n", d.quot, - (unsigned)d.rem ); + sdp_AddAttribute( &psz_sdp, "range"," npt=0-%lld.%03u", d.quot, + (unsigned)d.rem ); } - for( i = 0; i < p_media->i_es; i++ ) + for( int i = 0; i < p_media->i_es; i++ ) { media_es_t *p_es = p_media->es[i]; + const char *mime_major; /* major MIME type */ - if( p_es->fmt.i_cat == AUDIO_ES ) - { - p += sprintf( p, "m=audio %d RTP/AVP %d\r\n", - 0 /* p_es->i_port */, p_es->i_payload_type ); - } - else if( p_es->fmt.i_cat == VIDEO_ES ) + switch( p_es->fmt.i_cat ) { - p += sprintf( p, "m=video %d RTP/AVP %d\r\n", - 0 /* p_es->i_port */, p_es->i_payload_type ); - } - else - { - continue; + case VIDEO_ES: + mime_major = "video"; + break; + case AUDIO_ES: + mime_major = "audio"; + break; + case SPU_ES: + mime_major = "text"; + break; + default: + continue; } - if( p_es->psz_rtpmap ) - { - p += sprintf( p, "a=rtpmap:%d %s\r\n", p_es->i_payload_type, - p_es->psz_rtpmap ); - } - if( p_es->psz_fmtp ) - { - p += sprintf( p, "a=fmtp:%d %s\r\n", p_es->i_payload_type, - p_es->psz_fmtp ); - } + sdp_AddMedia( &psz_sdp, mime_major, "RTP/AVP", 0 /* p_es->i_port */, + p_es->i_payload_type, false, 0, + p_es->psz_ptname, p_es->i_clock_rate, p_es->i_channels, + p_es->psz_fmtp ); - p += sprintf( p, psz_control, ip, i ); + sdp_AddAttribute( &psz_sdp, "control", psz_control, ip, i ); } return psz_sdp;