X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Frtsp.c;h=18213d409b111d4cec6011181fd183f68a38f36d;hb=fa4bde0b26a6c7a2a617362ea0b17144686e39fe;hp=11182cfb7e38c212ea59d6fe3efe349287fd2d65;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c index 11182cfb7e..18213d409b 100644 --- a/modules/misc/rtsp.c +++ b/modules/misc/rtsp.c @@ -30,7 +30,8 @@ # include "config.h" #endif -#include +#include +#include #include #include #include @@ -44,6 +45,14 @@ #include +#ifndef WIN32 +# include +#endif + +#ifdef HAVE_XLOCALE_H +# include +#endif + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -70,22 +79,22 @@ static void Close( vlc_object_t * ); "the timeout option entirely. This is needed by some IPTV STBs (such as " \ "those made by HansunTech) which get confused by it. The default is 5." ) -vlc_module_begin(); - set_shortname( _("RTSP VoD" ) ); - set_description( _("RTSP VoD server") ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_VOD ); - set_capability( "vod server", 1 ); - set_callbacks( Open, Close ); - add_shortcut( "rtsp" ); - add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true ); +vlc_module_begin () + set_shortname( N_("RTSP VoD" ) ) + set_description( N_("RTSP VoD server") ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_VOD ) + set_capability( "vod server", 1 ) + set_callbacks( Open, Close ) + add_shortcut( "rtsp" ) + add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true ) add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT, - RAWMUX_TEXT, true ); + RAWMUX_TEXT, true ) add_integer( "rtsp-throttle-users", 0, NULL, THROTLE_TEXT, - THROTLE_LONGTEXT, true ); + THROTLE_LONGTEXT, true ) add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT, - SESSION_TIMEOUT_LONGTEXT, true ); -vlc_module_end(); + SESSION_TIMEOUT_LONGTEXT, true ) +vlc_module_end () /***************************************************************************** * Exported prototypes @@ -217,9 +226,9 @@ static void MediaDel( vod_t *, vod_media_t * ); static int MediaAddES( vod_t *, vod_media_t *, es_format_t * ); static void MediaDelES( vod_t *, vod_media_t *, es_format_t * ); -static void CommandThread( vlc_object_t *p_this ); -static void CommandPush( vod_t *, rtsp_cmd_type_t, vod_media_t *, const char *psz_session, - double f_arg, const char *psz_arg ); +static void* CommandThread( vlc_object_t *p_this ); +static void CommandPush( vod_t *, rtsp_cmd_type_t, vod_media_t *, const char *psz_session, + double f_arg, const char *psz_arg ); static rtsp_client_t *RtspClientNew( vod_media_t *, char * ); static rtsp_client_t *RtspClientGet( vod_media_t *, const char * ); @@ -251,8 +260,8 @@ static void sprintf_hexa( char *s, uint8_t *p_data, int i_data ) static int Open( vlc_object_t *p_this ) { vod_t *p_vod = (vod_t *)p_this; - vod_sys_t *p_sys = 0; - char *psz_url = 0; + vod_sys_t *p_sys = NULL; + char *psz_url = NULL; vlc_url_t url; psz_url = config_GetPsz( p_vod, "rtsp-host" ); @@ -287,7 +296,7 @@ static int Open( vlc_object_t *p_this ) vlc_UrlClean( &url ); - vlc_mutex_init( p_vod, &p_sys->lock_media ); + vlc_mutex_init( &p_sys->lock_media ); TAB_INIT( p_sys->i_media, p_sys->media ); p_sys->i_media_id = 0; @@ -297,9 +306,9 @@ static int Open( vlc_object_t *p_this ) p_vod->pf_media_add_es = MediaAddES; p_vod->pf_media_del_es = MediaDelES; - p_sys->p_fifo_cmd = block_FifoNew( p_vod ); + p_sys->p_fifo_cmd = block_FifoNew(); if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread, - VLC_THREAD_PRIORITY_LOW, false ) ) + VLC_THREAD_PRIORITY_LOW ) ) { msg_Err( p_vod, "cannot spawn rtsp vod thread" ); block_FifoRelease( p_sys->p_fifo_cmd ); @@ -359,20 +368,16 @@ 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 ) { - vod_sys_t *p_sys = p_vod->p_sys; - vod_media_t *p_media = malloc( sizeof(vod_media_t) ); int i; + vod_sys_t *p_sys = p_vod->p_sys; + vod_media_t *p_media = calloc( 1, sizeof(vod_media_t) ); if( !p_media ) - { - msg_Err( p_vod, "not enough memory" ); return NULL; - } - memset( p_media, 0, sizeof(vod_media_t) ); p_media->id = p_sys->i_media_id++; TAB_INIT( p_media->i_es, p_media->es ); - p_media->psz_mux = 0; + p_media->psz_mux = NULL; TAB_INIT( p_media->i_rtsp, p_media->rtsp ); p_media->b_raw = false; @@ -396,11 +401,21 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name, if( asprintf( &p_media->psz_rtsp_control_v4, "a=control:rtsp://%%s:%d%s/trackID=%%d\r\n", p_sys->i_port, p_media->psz_rtsp_path ) < 0 ) + { + httpd_UrlDelete( p_media->p_rtsp_url ); + free( p_media->psz_rtsp_path ); + free( p_media ); return NULL; + } if( asprintf( &p_media->psz_rtsp_control_v6, "a=control:rtsp://[%%s]:%d%s/trackID=%%d\r\n", p_sys->i_port, p_media->psz_rtsp_path ) < 0 ) + { + httpd_UrlDelete( p_media->p_rtsp_url ); + free( p_media->psz_rtsp_path ); + free( p_media ); return NULL; + } httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_SETUP, RtspCallback, (void*)p_media ); @@ -421,7 +436,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name, TAB_APPEND( p_sys->i_media, p_sys->media, p_media ); vlc_mutex_unlock( &p_sys->lock_media ); - vlc_mutex_init( p_vod, &p_media->lock ); + vlc_mutex_init( &p_media->lock ); p_media->psz_session_name = strdup(""); p_media->psz_session_description = strdup(""); p_media->psz_session_url = strdup(""); @@ -482,11 +497,10 @@ 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 ) { - media_es_t *p_es = malloc( sizeof(media_es_t) ); char *psz_urlc; - - if( !p_es ) return VLC_ENOMEM; - memset( p_es, 0, sizeof(media_es_t) ); + 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; @@ -494,7 +508,10 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) /* TODO: update SDP, etc... */ if( asprintf( &psz_urlc, "%s/trackID=%d", p_media->psz_rtsp_path, p_media->i_es ) < 0 ) + { + free( p_es ); return VLC_ENOMEM; + } msg_Dbg( p_vod, " - ES %4.4s (%s)", (char *)&p_fmt->i_codec, psz_urlc ); switch( p_fmt->i_codec ) @@ -513,17 +530,18 @@ 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++; } - p_es->psz_rtpmap = malloc( strlen( "L16/*/*" ) + 20+1 ); - sprintf( p_es->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate, - p_fmt->audio.i_channels ); + 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; break; case VLC_FOURCC( 'u', '8', ' ', ' ' ): p_es->i_payload_type = p_media->i_payload_type++; - p_es->psz_rtpmap = malloc( strlen( "L8/*/*" ) + 20+1 ); - sprintf( p_es->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate, - p_fmt->audio.i_channels ); + 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; break; case VLC_FOURCC( 'm', 'p', 'g', 'a' ): + case VLC_FOURCC( 'm', 'p', '3', ' ' ): p_es->i_payload_type = 14; p_es->psz_rtpmap = strdup( "MPA/90000" ); break; @@ -533,7 +551,8 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) break; case VLC_FOURCC( 'a', '5', '2', ' ' ): p_es->i_payload_type = p_media->i_payload_type++; - p_es->psz_rtpmap = strdup( "ac3/90000" ); + if( asprintf( &p_es->psz_rtpmap, "ac3/%d", p_fmt->audio.i_rate ) == -1 ) + p_es->psz_rtpmap = NULL; break; case VLC_FOURCC( 'H', '2', '6', '3' ): p_es->i_payload_type = p_media->i_payload_type++; @@ -572,11 +591,13 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) } 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 ); } else if( i_nal_type == 8 ) { + free( p_64_pps ); p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 ); } i_buffer -= i_size; @@ -584,11 +605,19 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) } /* */ if( p_64_sps && p_64_pps ) + { if( asprintf( &p_es->psz_fmtp, "packetization-mode=1;profile-level-id=%s;" "sprop-parameter-sets=%s,%s;", hexa, p_64_sps, p_64_pps ) < 0 ) + { + free( p_64_sps ); + free( p_64_pps ); + free( psz_urlc ); + free( p_es ); return VLC_ENOMEM; + } + } free( p_64_sps ); free( p_64_pps ); } @@ -601,26 +630,26 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) if( p_fmt->i_extra > 0 ) { char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 ); - p_es->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra ); sprintf_hexa( p_hexa, p_fmt->p_extra, p_fmt->i_extra ); - sprintf( p_es->psz_fmtp, - "profile-level-id=3; config=%s;", p_hexa ); + if( asprintf( &p_es->psz_fmtp, + "profile-level-id=3; config=%s;", p_hexa ) == -1 ) + p_es->psz_fmtp = NULL; free( p_hexa ); } break; case VLC_FOURCC( 'm', 'p', '4', 'a' ): p_es->i_payload_type = p_media->i_payload_type++; - p_es->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 ); - sprintf( p_es->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate ); + if( asprintf( &p_es->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate ) == -1 ) + p_es->psz_rtpmap = NULL; if( p_fmt->i_extra > 0 ) { char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 ); - p_es->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra ); sprintf_hexa( p_hexa, p_fmt->p_extra, p_fmt->i_extra ); - sprintf( p_es->psz_fmtp, - "streamtype=5; profile-level-id=15; mode=AAC-hbr; " - "config=%s; SizeLength=13;IndexLength=3; " - "IndexDeltaLength=3; Profile=1;", p_hexa ); + if( asprintf( &p_es->psz_fmtp, + "streamtype=5; profile-level-id=15; mode=AAC-hbr; " + "config=%s; SizeLength=13;IndexLength=3; " + "IndexDeltaLength=3; Profile=1;", p_hexa ) == -1 ) + p_es->psz_fmtp = NULL; free( p_hexa ); } break; @@ -650,6 +679,7 @@ static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt ) default: msg_Err( p_vod, "cannot add this stream (unsupported " "codec: %4.4s)", (char*)&p_fmt->i_codec ); + free( psz_urlc ); free( p_es ); return VLC_EGENERIC; } @@ -782,12 +812,13 @@ static void CommandPush( vod_t *p_vod, rtsp_cmd_type_t i_type, vod_media_t *p_me block_FifoPut( p_vod->p_sys->p_fifo_cmd, p_cmd ); } -static void CommandThread( vlc_object_t *p_this ) +static void* CommandThread( vlc_object_t *p_this ) { vod_t *p_vod = (vod_t*)p_this; vod_sys_t *p_sys = p_vod->p_sys; + int canc = vlc_savecancel (); - while( !p_vod->b_die ) + while( vlc_object_alive (p_vod) ) { block_t *p_block_cmd = block_FifoGet( p_sys->p_fifo_cmd ); rtsp_cmd_t cmd; @@ -853,6 +884,9 @@ static void CommandThread( vlc_object_t *p_this ) free( cmd.psz_session ); free( cmd.psz_arg ); } + + vlc_restorecancel (canc); + return NULL; } /**************************************************************************** @@ -860,10 +894,10 @@ static void CommandThread( vlc_object_t *p_this ) ****************************************************************************/ static rtsp_client_t *RtspClientNew( vod_media_t *p_media, char *psz_session ) { - rtsp_client_t *p_rtsp = malloc( sizeof(rtsp_client_t) ); + rtsp_client_t *p_rtsp = calloc( 1, sizeof(rtsp_client_t) ); - if( !p_rtsp ) return NULL; - memset( p_rtsp, 0, sizeof(rtsp_client_t) ); + if( !p_rtsp ) + return NULL; p_rtsp->es = 0; p_rtsp->psz_session = psz_session; @@ -895,12 +929,13 @@ static void RtspClientDel( vod_media_t *p_media, rtsp_client_t *p_rtsp ) msg_Dbg( p_media->p_vod, "closing session: %s, connections: %d", p_rtsp->psz_session, p_media->p_vod->p_sys->i_throttle_users ); - while( p_rtsp->i_es-- ) + while( p_rtsp->i_es ) { + p_rtsp->i_es--; free( p_rtsp->es[p_rtsp->i_es]->psz_ip ); free( p_rtsp->es[p_rtsp->i_es] ); - if( !p_rtsp->i_es ) free( p_rtsp->es ); } + free( p_rtsp->es ); TAB_REMOVE( p_media->i_rtsp, p_media->rtsp, p_rtsp ); @@ -908,6 +943,29 @@ static void RtspClientDel( vod_media_t *p_media, rtsp_client_t *p_rtsp ) free( 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; +} + + static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, httpd_message_t *answer, const httpd_message_t *query ) { @@ -1018,19 +1076,19 @@ static int RtspCallback( 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", i_port, 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", i_port, i_port + 1 ); } } else httpd_MsgAdd( answer, "Transport", - "RTP/AVP/UDP;client_port=%d-%d", + "RTP/AVP/UDP;unicast;client_port=%d-%d", i_port, i_port + 1 ); } else /* TODO strstr( psz_transport, "interleaved" ) ) */ @@ -1079,19 +1137,11 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl, psz_position = strstr( psz_position, "npt=" ); if( psz_position && !psz_scale ) { - double f_pos; - char *end; - + double f_pos = ParseNPT (psz_position + 4); msg_Dbg( p_vod, "seeking request: %s", psz_position ); - psz_position += 4; - /* FIXME: npt= is not necessarily formatted as a float */ - f_pos = us_strtod( psz_position, &end ); - if( end > psz_position ) - { - f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100; - CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media, - psz_session, f_pos, NULL ); - } + f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100; + CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media, + psz_session, f_pos, NULL ); break; } if( psz_scale ) @@ -1412,20 +1462,11 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl, if( psz_position ) psz_position = strstr( psz_position, "npt=" ); if( psz_position ) { - double f_pos; - char *end; - + double f_pos = ParseNPT (psz_position + 4); msg_Dbg( p_vod, "seeking request: %s", psz_position ); - - psz_position += 4; - /* FIXME: npt= is not necessarily formatted as a float */ - f_pos = us_strtod( psz_position, &end ); - if( end > psz_position ) - { - f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100; - CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media, - psz_session, f_pos, NULL ); - } + f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100; + CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media, + psz_session, f_pos, NULL ); } if( !psz_playnow ) @@ -1557,7 +1598,7 @@ static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl ) p = psz_sdp = malloc( i_size ); p += sprintf( p, "v=0\r\n" ); - p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\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 ); if( *p_media->psz_session_name ) p += sprintf( p, "s=%s\r\n", p_media->psz_session_name );