X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Flive555.cpp;h=afa54fb22201b4ce47ebac4bb5bfb1a7bff534bd;hb=affc7db0a6578bf9fe3ec96845584f4dbd305ae7;hp=8bf7ff17fef739e3cb37cf8bb39fceb9add97f65;hpb=3147cc20d467e776b8996268e04352729c26a66d;p=vlc diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 8bf7ff17fe..afa54fb222 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -107,6 +107,7 @@ vlc_module_begin () add_submodule () set_description( N_("RTSP/RTP access and demux") ) add_shortcut( "rtsp" ) + add_shortcut( "pnm" ) add_shortcut( "sdp" ) add_shortcut( "live" ) add_shortcut( "livedotcom" ) @@ -163,6 +164,7 @@ typedef struct bool b_muxed; bool b_quicktime; bool b_asf; + block_t *p_asf_block; bool b_discard_trunc; stream_t *p_out_muxed; /* for muxed stream */ @@ -224,6 +226,9 @@ struct demux_sys_t bool b_get_param; /* Does the server support GET_PARAMETER */ bool b_paused; /* Are we paused? */ + bool b_error; + + float f_seek_request;/* In case we receive a seek request while paused*/ }; static int Demux ( demux_t * ); @@ -270,10 +275,7 @@ static int Open ( vlc_object_t *p_this ) return VLC_EGENERIC; } } - else - { - var_Create( p_demux, "rtsp-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - } + var_Create( p_demux, "rtsp-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); p_demux->pf_demux = Demux; p_demux->pf_control= Control; @@ -303,6 +305,8 @@ static int Open ( vlc_object_t *p_this ) p_sys->b_force_mcast = var_CreateGetBool( p_demux, "rtsp-mcast" ); p_sys->b_get_param = false; p_sys->b_paused = false; + p_sys->f_seek_request = -1; + p_sys->b_error = false; /* parse URL for rtsp://[user:[passwd]@]serverip:port/options */ vlc_UrlParse( &p_sys->url, p_sys->psz_path, 0 ); @@ -342,7 +346,7 @@ static int Open ( vlc_object_t *p_this ) int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp], i_sdp_max - i_sdp - 1 ); - if( !vlc_object_alive (p_demux) || p_demux->b_error ) + if( !vlc_object_alive (p_demux) ) { free( p_sdp ); goto error; @@ -364,7 +368,7 @@ static int Open ( vlc_object_t *p_this ) } i_sdp_max += 1000; - p_sdp = (uint8_t*)realloc( p_sdp, i_sdp_max ); + p_sdp = (uint8_t*)xrealloc( p_sdp, i_sdp_max ); } p_sys->p_sdp = (char*)p_sdp; } @@ -465,7 +469,6 @@ static int Connect( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; Authenticator authenticator; - bool b_firstpass = true; char *psz_user = NULL; char *psz_pwd = NULL; char *psz_url = NULL; @@ -474,34 +477,32 @@ static int Connect( demux_t *p_demux ) int i_http_port = 0; int i_ret = VLC_SUCCESS; - /* Create the url using the port number if available */ - if( p_sys->url.i_port == 0 ) - { - p_sys->url.i_port = 554; - if( asprintf( &psz_url, "rtsp://%s", p_sys->psz_path ) == -1 ) - return VLC_ENOMEM; - } - else - { - if( asprintf( &psz_url, "rtsp://%s:%d%s", p_sys->url.psz_host, - p_sys->url.i_port, p_sys->url.psz_path ) == -1 ) - return VLC_ENOMEM; - } - /* Get the user name and password */ if( p_sys->url.psz_username || p_sys->url.psz_password ) { + /* Create the URL by stripping away the username/password part */ + if( p_sys->url.i_port == 0 ) + p_sys->url.i_port = 554; + if( asprintf( &psz_url, "rtsp://%s:%d%s", + strempty( p_sys->url.psz_host ), + p_sys->url.i_port, + strempty( p_sys->url.psz_path ) ) == -1 ) + return VLC_ENOMEM; + psz_user = strdup( strempty( p_sys->url.psz_username ) ); psz_pwd = strdup( strempty( p_sys->url.psz_password ) ); } else { + if( asprintf( &psz_url, "rtsp://%s", p_sys->psz_path ) == -1 ) + return VLC_ENOMEM; + psz_user = var_CreateGetString( p_demux, "rtsp-user" ); psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" ); } createnew: - if( !vlc_object_alive (p_demux) || p_demux->b_error ) + if( !vlc_object_alive (p_demux) ) { i_ret = VLC_EGENERIC; goto bailout; @@ -512,7 +513,7 @@ createnew: if( ( p_sys->rtsp = RTSPClient::createNew( *p_sys->env, var_CreateGetInteger( p_demux, "verbose" ) > 1, - "VLC media player", i_http_port ) ) == NULL ) + "LibVLC/"VERSION, i_http_port ) ) == NULL ) { msg_Err( p_demux, "RTSPClient::createNew failed (%s)", p_sys->env->getResultMsg() ); @@ -591,14 +592,6 @@ describe: } msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error ); - if( b_firstpass ) - { /* describeURL always returns an "RTSP/1.0 401 Unauthorized" the - * first time. This is a workaround to avoid asking for a - * user/passwd the first time the code passess here. */ - i_code = 0; - b_firstpass = false; - } - if( i_code == 401 ) { msg_Dbg( p_demux, "authentication failed" ); @@ -680,7 +673,7 @@ static int SessionsSetup( demux_t *p_demux ) Boolean bInit; live_track_t *tk; - if( !vlc_object_alive (p_demux) || p_demux->b_error ) + if( !vlc_object_alive (p_demux) ) { delete iter; return VLC_EGENERIC; @@ -691,6 +684,8 @@ static int SessionsSetup( demux_t *p_demux ) i_buffer = 100000; else if( !strcmp( sub->mediumName(), "video" ) ) i_buffer = 2000000; + else if( !strcmp( sub->mediumName(), "text" ) ) + ; else continue; if( i_client_port != -1 ) @@ -707,7 +702,7 @@ static int SessionsSetup( demux_t *p_demux ) } if( !strcmp( sub->codecName(), "X-ASF-PF" ) ) - bInit = sub->initiate( 4 ); /* Constant ? */ + bInit = sub->initiate( 0 ); else bInit = sub->initiate(); @@ -775,12 +770,13 @@ static int SessionsSetup( demux_t *p_demux ) tk->p_es = NULL; tk->b_quicktime = false; tk->b_asf = false; + tk->p_asf_block = NULL; tk->b_muxed = false; tk->b_discard_trunc = false; tk->p_out_muxed = NULL; tk->waiting = 0; tk->b_rtcp_sync = false; - tk->i_pts = 0; + tk->i_pts = VLC_TS_INVALID; tk->i_npt = 0.; tk->i_buffer = 65536; tk->p_buffer = (uint8_t *)malloc( 65536 ); @@ -861,7 +857,7 @@ static int SessionsSetup( demux_t *p_demux ) i_extra ) ) ) { tk->fmt.i_extra = i_extra; - tk->fmt.p_extra = malloc( i_extra ); + tk->fmt.p_extra = xmalloc( i_extra ); memcpy( tk->fmt.p_extra, p_extra, i_extra ); delete[] p_extra; } @@ -881,7 +877,7 @@ static int SessionsSetup( demux_t *p_demux ) i_extra ) ) ) { tk->fmt.i_extra = i_extra; - tk->fmt.p_extra = malloc( i_extra ); + tk->fmt.p_extra = xmalloc( i_extra ); memcpy( tk->fmt.p_extra, p_extra, i_extra ); delete[] p_extra; } @@ -939,7 +935,7 @@ static int SessionsSetup( demux_t *p_demux ) i_extra ) ) ) { tk->fmt.i_extra = i_extra; - tk->fmt.p_extra = malloc( i_extra ); + tk->fmt.p_extra = xmalloc( i_extra ); memcpy( tk->fmt.p_extra, p_extra, i_extra ); delete[] p_extra; @@ -960,7 +956,7 @@ static int SessionsSetup( demux_t *p_demux ) i_extra ) ) ) { tk->fmt.i_extra = i_extra; - tk->fmt.p_extra = malloc( i_extra ); + tk->fmt.p_extra = xmalloc( i_extra ); memcpy( tk->fmt.p_extra, p_extra, i_extra ); delete[] p_extra; } @@ -1000,6 +996,15 @@ static int SessionsSetup( demux_t *p_demux ) p_demux->out ); } } + else if( !strcmp( sub->mediumName(), "text" ) ) + { + es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('u','n','d','f') ); + + if( !strcmp( sub->codecName(), "T140" ) ) + { + tk->fmt.i_codec = VLC_CODEC_ITU_T140; + } + } if( !tk->b_quicktime && !tk->b_muxed && !tk->b_asf ) { @@ -1014,7 +1019,8 @@ static int SessionsSetup( demux_t *p_demux ) if( tk->p_es || tk->b_quicktime || tk->b_muxed || tk->b_asf ) { /* Append */ - p_sys->track = (live_track_t**)realloc( p_sys->track, sizeof( live_track_t ) * ( p_sys->i_track + 1 ) ); + p_sys->track = (live_track_t**)xrealloc( p_sys->track, + sizeof( live_track_t ) * ( p_sys->i_track + 1 ) ); p_sys->track[p_sys->i_track++] = tk; } else @@ -1141,7 +1147,7 @@ static int Demux( demux_t *p_demux ) if( p_sys->i_pcr > 0 ) { if( b_send_pcr ) - es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, 1 + p_sys->i_pcr ); } /* First warn we want to read data */ @@ -1179,7 +1185,7 @@ static int Demux( demux_t *p_demux ) es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); tk->b_rtcp_sync = true; /* reset PCR */ - tk->i_pts = 0; + tk->i_pts = VLC_TS_INVALID; tk->i_npt = 0.; p_sys->i_pcr = 0; p_sys->i_npt = 0.; @@ -1221,7 +1227,7 @@ static int Demux( demux_t *p_demux ) msg_Warn( p_demux, "no data received in 10s, eof ?" ); return 0; } - return p_demux->b_error ? 0 : 1; + return p_sys->b_error ? 0 : 1; } /***************************************************************************** @@ -1232,7 +1238,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) demux_sys_t *p_sys = p_demux->p_sys; int64_t *pi64, i64; double *pf, f; - bool *pb, *pb2, b_bool; + bool *pb, *pb2; int *pi_int; switch( i_query ) @@ -1284,9 +1290,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) time = f * (double)p_sys->i_npt_length; /* in second */ } - if( !p_sys->b_paused && !p_sys->rtsp->pauseMediaSession( *p_sys->ms )) + if( p_sys->b_paused ) + { + p_sys->f_seek_request = time; + return VLC_SUCCESS; + } + + if( !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) ) { - msg_Err( p_demux, "PAUSE before seek failed failed %s", + msg_Err( p_demux, "PAUSE before seek failed %s", p_sys->env->getResultMsg() ); return VLC_EGENERIC; } @@ -1302,7 +1314,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) for( i = 0; i < p_sys->i_track; i++ ) { p_sys->track[i]->b_rtcp_sync = false; - p_sys->track[i]->i_pts = 0; + p_sys->track[i]->i_pts = VLC_TS_INVALID; } /* Retrieve the starttime if possible */ @@ -1406,7 +1418,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_SET_PAUSE_STATE: { - int i; bool b_pause = (bool)va_arg( args, int ); if( p_sys->rtsp == NULL ) return VLC_EGENERIC; @@ -1415,11 +1426,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; if( ( b_pause && !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) ) || ( !b_pause && !p_sys->rtsp->playMediaSession( *p_sys->ms, - -1 ) ) ) + p_sys->f_seek_request, -1.0f, p_sys->ms->scale() ) ) ) { msg_Err( p_demux, "PLAY or PAUSE failed %s", p_sys->env->getResultMsg() ); return VLC_EGENERIC; } + p_sys->f_seek_request = -1; p_sys->b_paused = b_pause; /* When we Pause, we'll need the TimeoutPrevention thread to @@ -1435,13 +1447,16 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) else if( !p_sys->b_paused && p_sys->p_timeout != NULL ) p_sys->p_timeout->b_handle_keep_alive = false; - for( i = 0; !b_bool && i < p_sys->i_track; i++ ) + if( !p_sys->b_paused ) { - live_track_t *tk = p_sys->track[i]; - tk->b_rtcp_sync = false; - tk->i_pts = 0; - p_sys->i_pcr = 0; - es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + for( int i = 0; i < p_sys->i_track; i++ ) + { + live_track_t *tk = p_sys->track[i]; + tk->b_rtcp_sync = false; + tk->i_pts = VLC_TS_INVALID; + p_sys->i_pcr = 0; + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + } } /* Reset data received counter */ @@ -1491,6 +1506,7 @@ static int RollOverTcp( demux_t *p_demux ) if( tk->b_muxed ) stream_Delete( tk->p_out_muxed ); if( tk->p_es ) es_out_Del( p_demux->out, tk->p_es ); + if( tk->p_asf_block ) block_Release( tk->p_asf_block ); es_format_Clean( &tk->fmt ); free( tk->p_buffer ); free( tk ); @@ -1508,6 +1524,7 @@ static int RollOverTcp( demux_t *p_demux ) p_sys->i_track = 0; p_sys->b_no_data = true; p_sys->i_no_data_ti = 0; + p_sys->p_out_asf = NULL; /* Reopen rtsp client */ if( ( i_return = Connect( p_demux ) ) != VLC_SUCCESS ) @@ -1539,6 +1556,91 @@ error: } +/***************************************************************************** + * + *****************************************************************************/ +static block_t *StreamParseAsf( demux_t *p_demux, live_track_t *tk, + bool b_marker, + const uint8_t *p_data, unsigned i_size ) +{ + const unsigned i_packet_size = p_demux->p_sys->asfh.i_min_data_packet_size; + block_t *p_list = NULL; + + while( i_size >= 4 ) + { + unsigned i_flags = p_data[0]; + unsigned i_length_offset = (p_data[1] << 16) | + (p_data[2] << 8) | + (p_data[3] ); + bool b_key = i_flags & 0x80; + bool b_length = i_flags & 0x40; + bool b_relative_ts = i_flags & 0x20; + bool b_duration = i_flags & 0x10; + bool b_location_id = i_flags & 0x08; + + //msg_Dbg( p_demux, "ASF: marker=%d size=%d : %c=%d id=%d", + // b_marker, i_size, b_length ? 'L' : 'O', i_length_offset ); + unsigned i_header_size = 4; + if( b_relative_ts ) + i_header_size += 4; + if( b_duration ) + i_header_size += 4; + if( b_location_id ) + i_header_size += 4; + + if( i_header_size > i_size ) + { + msg_Warn( p_demux, "Invalid header size" ); + break; + } + + /* XXX + * When b_length is true, the streams I found do not seems to respect + * the documentation. + * From them, I have failed to find which choice between '__MIN()' or + * 'i_length_offset - i_header_size' is the right one. + */ + unsigned i_payload; + if( b_length ) + i_payload = __MIN( i_length_offset, i_size - i_header_size); + else + i_payload = i_size - i_header_size; + + if( !tk->p_asf_block ) + { + tk->p_asf_block = block_New( p_demux, i_packet_size ); + if( !tk->p_asf_block ) + break; + tk->p_asf_block->i_buffer = 0; + } + unsigned i_offset = b_length ? 0 : i_length_offset; + if( i_offset == tk->p_asf_block->i_buffer && i_offset + i_payload <= i_packet_size ) + { + memcpy( &tk->p_asf_block->p_buffer[i_offset], &p_data[i_header_size], i_payload ); + tk->p_asf_block->i_buffer += i_payload; + if( b_marker ) + { + /* We have a complete packet */ + tk->p_asf_block->i_buffer = i_packet_size; + block_ChainAppend( &p_list, tk->p_asf_block ); + tk->p_asf_block = NULL; + } + } + else + { + /* Reset on broken stream */ + msg_Err( p_demux, "Broken packet detected (%d vs %d or %d + %d vs %d)", + i_offset, tk->p_asf_block->i_buffer, i_offset, i_payload, i_packet_size); + tk->p_asf_block->i_buffer = 0; + } + + /* */ + p_data += i_header_size + i_payload; + i_size -= i_header_size + i_payload; + } + return p_list; +} + /***************************************************************************** * *****************************************************************************/ @@ -1594,7 +1696,7 @@ static void StreamRead( void *p_private, unsigned int i_size, atomLength <= INT_MAX ) { tk->fmt.i_extra = atomLength-8; - tk->fmt.p_extra = malloc( tk->fmt.i_extra ); + tk->fmt.p_extra = xmalloc( tk->fmt.i_extra ); memcpy(tk->fmt.p_extra, pos+8, atomLength-8); break; } @@ -1604,7 +1706,7 @@ static void StreamRead( void *p_private, unsigned int i_size, else { tk->fmt.i_extra = qtState.sdAtomSize - 16; - tk->fmt.p_extra = malloc( tk->fmt.i_extra ); + tk->fmt.p_extra = xmalloc( tk->fmt.i_extra ); memcpy( tk->fmt.p_extra, &sdAtom[12], tk->fmt.i_extra ); } } @@ -1693,10 +1795,9 @@ static void StreamRead( void *p_private, unsigned int i_size, } else if( tk->b_asf ) { - int i_copy = __MIN( p_sys->asfh.i_min_data_packet_size, (int)i_size ); - p_block = block_New( p_demux, p_sys->asfh.i_min_data_packet_size ); - - memcpy( p_block->p_buffer, tk->p_buffer, i_copy ); + p_block = StreamParseAsf( p_demux, tk, + tk->sub->rtpSource()->curPacketMarkerBit(), + tk->p_buffer, i_size ); } else { @@ -1709,32 +1810,26 @@ static void StreamRead( void *p_private, unsigned int i_size, p_sys->i_pcr = i_pts; } - if( (i_pts != tk->i_pts) && (!tk->b_muxed) ) - { - p_block->i_pts = i_pts; - } - /* Update our global npt value */ if( tk->i_npt > 0 && tk->i_npt > p_sys->i_npt && tk->i_npt < p_sys->i_npt_length) p_sys->i_npt = tk->i_npt; - if( !tk->b_muxed ) + if( p_block ) { - /*FIXME: for h264 you should check that packetization-mode=1 in sdp-file */ - p_block->i_dts = ( tk->fmt.i_codec == VLC_CODEC_MPGV ) ? 0 : i_pts; - } + if( !tk->b_muxed && !tk->b_asf ) + { + if( i_pts != tk->i_pts ) + p_block->i_pts = VLC_TS_0 + i_pts; + /*FIXME: for h264 you should check that packetization-mode=1 in sdp-file */ + p_block->i_dts = ( tk->fmt.i_codec == VLC_CODEC_MPGV ) ? VLC_TS_INVALID : (VLC_TS_0 + i_pts); + } - if( tk->b_muxed ) - { - stream_DemuxSend( tk->p_out_muxed, p_block ); - } - else if( tk->b_asf ) - { - stream_DemuxSend( p_sys->p_out_asf, p_block ); - } - else - { - es_out_Send( p_demux->out, tk->p_es, p_block ); + if( tk->b_muxed ) + stream_DemuxSend( tk->p_out_muxed, p_block ); + else if( tk->b_asf ) + stream_DemuxSend( p_sys->p_out_asf, p_block ); + else + es_out_Send( p_demux->out, tk->p_es, p_block ); } /* warn that's ok */ @@ -1763,7 +1858,7 @@ static void StreamClose( void *p_private ) msg_Dbg( p_demux, "StreamClose" ); p_sys->event = 0xff; - p_demux->b_error = true; + p_sys->b_error = true; }