Include bitrate in SDP when known.

Patch from Ilkka Ollakka with cosmetic fixes.

diff --git a/THANKS b/THANKS
index 951e983119a45fa5020b16da724bbfb56a8d498b..909451e9b1b803a88dcf6e5aef675afa82623469 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -64,6 +64,7 @@ Goetz Waschk <waschk at informatik.uni-rostock dot de> - Mandrake packages
 Haakon Meland Eriksen - Norwegian translation
 Han HoJoong <0demon0 at paran dot com> - Korean translation
 Hans-Peter Jansen <hpj at urpla.net> - patch for module options handling
+Ilkka Ollakka - SDP bitrate patch
 Jan Gerber <j at v2v dot org> - patch theora decoding aspect ratio
 Jan Van Boghout <vlc at macrabbit.com> - iTunes like slider for OSX intf
 Javier Varela <tonxabar at hotmail.com> - Spanish translation

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 8462c3d05afefc923eaec54ceb2379e6a5c328a6..f72eb68c0f3649dff587cad5b73483465a73c397 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -244,6 +244,7 @@ struct sout_stream_id_t
     char        *psz_destination;
     int         i_port;
     int         i_cat;
+    int         i_bitrate;
 
     /* Packetizer specific fields */
     pf_rtp_packetizer_t pf_packetize;
@@ -806,6 +807,10 @@ static char *SDPGenerate( const sout_stream_t *p_stream,
         {
             i_size += strlen( "a=fmtp:* *\r\n" ) + strlen( id->psz_fmtp ) + 10;
         }
+        if ( id->i_bitrate)
+        {
+            i_size += strlen( "b=AS: *\r\n") + 10;
+        }
         if( b_rtsp )
         {
             i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10;
@@ -876,6 +881,10 @@ static char *SDPGenerate( const sout_stream_t *p_stream,
             p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type,
                           id->psz_fmtp );
         }
+        if ( id->i_bitrate)
+        {
+            p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate);
+        }
         if( b_rtsp )
         {
             p += sprintf( p, "a=control:trackID=%d\r\n", i );
@@ -1176,6 +1185,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     id->ssrc[3] = rand()&0xff;
     id->i_sequence = rand()&0xffff;
     id->i_timestamp_start = rand()&0xffffffff;
+    id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */
 
     id->i_mtu    = config_GetInt( p_stream, "mtu" );  /* XXX beuk */
     if( id->i_mtu <= 16 + MTU_REDUCE )