X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Frtsp.c;h=a8ebc4310166c7b510d70feabcfc664527119530;hb=f659703fb4033420e0607d34bc7cd880a5802ea7;hp=16a3b1789b7d077fd3d7c0fd0e9edbd1381c213c;hpb=4552b6c7e778ababe51ac3ea97665ff8bdf7e853;p=vlc diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c index 16a3b1789b..a8ebc43101 100644 --- a/modules/misc/rtsp.c +++ b/modules/misc/rtsp.c @@ -184,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; @@ -244,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]; @@ -296,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; @@ -337,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 ); @@ -347,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 ); @@ -367,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 ); @@ -380,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) ); @@ -452,7 +444,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name, 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] ); } @@ -473,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 ); @@ -499,6 +489,13 @@ static void MediaDel( vod_t *p_vod, vod_media_t *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; @@ -573,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; @@ -726,10 +748,9 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) 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 && @@ -800,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; } @@ -813,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 ) @@ -821,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]; @@ -859,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 ); @@ -893,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]; @@ -926,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; } @@ -1085,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 ) @@ -1118,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 ); } @@ -1170,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; @@ -1278,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; @@ -1311,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; @@ -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 ) { @@ -1519,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)