if( p_sys->p_mux != NULL )
{
sout_stream_id_t *id = p_sys->es[0];
- id->rtsp_id = RtspAddId( p_sys->rtsp, id, GetDWBE( id->ssrc ),
- p_sys->psz_destination, p_sys->i_ttl,
- id->i_port, id->i_port + 1 );
+ rtsp_stream_id_t *rtsp_id = RtspAddId( p_sys->rtsp, id, GetDWBE( id->ssrc ),
+ p_sys->psz_destination, p_sys->i_ttl,
+ id->i_port, id->i_port + 1 );
+ vlc_mutex_lock( &p_sys->lock_es );
+ id->rtsp_id = rtsp_id;
+ vlc_mutex_unlock( &p_sys->lock_es );
}
}
else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) ||
int inclport;
vlc_mutex_lock( &p_sys->lock_es );
- if( unlikely(p_sys->i_es == 0) )
+ if( unlikely(p_sys->i_es == 0 || (rtsp_url != NULL && !p_sys->es[0]->rtsp_id)) )
goto out; /* hmm... */
if( p_sys->psz_destination != NULL )
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 ) )
+ {
+ msg_Dbg( p_stream, "No startcode found..");
+ break;
+ }
+ p_buffer += 3;
+ i_buffer -= 3;
+
+ const int i_nal_type = p_buffer[0]&0x1f;
+
msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type );
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( !memcmp (p_buffer + i_offset, "\x00\x00\x00\x01", 4 ) )
+ 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 )
+ {
+ msg_Dbg( p_stream, "No-info found in nal ");
+ continue;
+ }
+
if( i_nal_type == 7 )
{
- p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
- sprintf_hexa( hexa, &p_buffer[5], 3 );
+ free( p_64_sps );
+ 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 )
{
- p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
+ free( p_64_pps );
+ p_64_pps = vlc_b64_encode_binary( p_buffer, i_size );
}
i_buffer -= i_size;
p_buffer += i_size;