Try to make 20ms packets for L8 and G.711

(rather than as big packets as possible)

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index ac451f2550de9967140f4d4f7d7b68a076d0e3c9..50ea6a0f50fff94d9fd405e2e77f137eeefc567f 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -1827,16 +1827,14 @@ static int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id,
 static int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id,
                              block_t *in )
 {
-    int     i_max   = id->i_mtu - 12; /* payload max in one packet */
-    int     i_count = ( in->i_buffer + i_max - 1 ) / i_max;
-
+    /* ptime=20ms */
+    size_t   i_plen = id->i_channels * ( ( id->i_clock_rate + 49 ) / 50 );
     uint8_t *p_data = in->p_buffer;
-    int     i_data  = in->i_buffer;
-    int     i_packet = 0;
+    size_t   i_data  = in->i_buffer;
 
-    while( i_data > 0 )
+    for( unsigned i_packet = 0; i_data > 0; i_packet++ )
     {
-        int           i_payload = (__MIN( i_max, i_data )/2)*2;
+        int           i_payload = __MIN( i_plen, i_data );
         block_t *out = block_New( p_stream, 12 + i_payload );
 
         /* rtp common header */
@@ -1844,15 +1842,14 @@ static int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id,
                               (in->i_pts > 0 ? in->i_pts : in->i_dts) );
         memcpy( &out->p_buffer[12], p_data, i_payload );
 
-        out->i_buffer   = 12 + i_payload;
-        out->i_dts    = in->i_dts + i_packet * in->i_length / i_count;
-        out->i_length = in->i_length / i_count;
+        out->i_buffer = 12 + i_payload;
+        out->i_dts    = in->i_dts + i_packet * 20000;
+        out->i_length = i_payload * 20000 / i_plen;
 
         rtp_packetize_send( id, out );
 
         p_data += i_payload;
         i_data -= i_payload;
-        i_packet++;
     }
 
     return VLC_SUCCESS;