This adds support for the rtptime parameter in the RTP-Info RTSP header.
It is needed by RealPlayer, otherwise it will start playing the stream
or not depending on the time of the day.
sout_stream_t *p_stream;
/* rtp field */
sout_stream_t *p_stream;
/* rtp field */
uint16_t i_sequence;
uint8_t i_payload_type;
uint8_t ssrc[4];
uint16_t i_sequence;
uint8_t i_payload_type;
uint8_t ssrc[4];
+ id->i_timestamp = 0; /* It will be filled when the first packet is sent */
+
/* Look for free dymanic payload type */
id->i_payload_type = 96;
while (p_sys->payload_bitmap & (1 << (id->i_payload_type - 96)))
/* Look for free dymanic payload type */
id->i_payload_type = 96;
while (p_sys->payload_bitmap & (1 << (id->i_payload_type - 96)))
+uint32_t rtp_get_ts( const sout_stream_id_t *id )
+{
+ /* ... and this will return the value for the last packet.
+ * Lame, but close enough. */
+ return id->i_timestamp;
+}
+
/* FIXME: this is pretty bad - if we remove and then insert an ES
* the number will get unsynched from inside RTSP */
unsigned rtp_get_num( const sout_stream_id_t *id )
/* FIXME: this is pretty bad - if we remove and then insert an ES
* the number will get unsynched from inside RTSP */
unsigned rtp_get_num( const sout_stream_id_t *id )
memcpy( out->p_buffer + 8, id->ssrc, 4 );
out->i_buffer = 12;
memcpy( out->p_buffer + 8, id->ssrc, 4 );
out->i_buffer = 12;
+ id->i_timestamp = i_timestamp;
int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux );
void rtp_del_sink( sout_stream_id_t *id, int fd );
uint16_t rtp_get_seq( const sout_stream_id_t *id );
int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux );
void rtp_del_sink( sout_stream_id_t *id, int fd );
uint16_t rtp_get_seq( const sout_stream_id_t *id );
+uint32_t rtp_get_ts( const sout_stream_id_t *id );
unsigned rtp_get_num( const sout_stream_id_t *id );
/* RTP packetization */
unsigned rtp_get_num( const sout_stream_id_t *id );
/* RTP packetization */
{
/* FIXME: we really need to limit the number of tracks... */
char info[ses->trackc * ( strlen( control )
{
/* FIXME: we really need to limit the number of tracks... */
char info[ses->trackc * ( strlen( control )
- + sizeof("url=/trackID=123;seq=65535, ") ) + 1];
+ + sizeof("url=/trackID=123;seq=65535;"
+ "rtptime=4294967295, ") ) + 1];
size_t infolen = 0;
for( int i = 0; i < ses->trackc; i++ )
size_t infolen = 0;
for( int i = 0; i < ses->trackc; i++ )
tr->playing = true;
rtp_add_sink( tr->id, tr->fd, false );
}
tr->playing = true;
rtp_add_sink( tr->id, tr->fd, false );
}
+ /* This is racy, as the first packets may have
+ * already been sent before we fetch this info:
+ * these extra packets might confuse the client. */
infolen += sprintf( info + infolen,
infolen += sprintf( info + infolen,
- "url=%s/trackID=%u;seq=%u, ",
+ "url=%s/trackID=%u;seq=%u;rtptime=%u, ",
control,
rtp_get_num( tr->id ),
control,
rtp_get_num( tr->id ),
- rtp_get_seq( tr->id ) );
+ rtp_get_seq( tr->id ),
+ rtp_get_ts( tr->id ) );