Changeset 832cb393faa2548cbee96df95499f374daf4e8ed

Timestamp:

06/11/08 20:39:51 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213209591 +0300

git-parent:

[e72ecce9ec4febce33d043eb88bed83a32466ed0]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213209581 +0300

Message:

RTP sout: rework sample-based audio codecs to not exceed the MTU

Send as much data as the packetization AND the MTU allow

Files:

• modules/stream_out/rtp.c (modified) (5 diffs)
• modules/stream_out/rtp.h (modified) (1 diff)
• modules/stream_out/rtpfmt.c (modified) (1 diff)

modules/stream_out/rtp.c

@@ -813 +813 @@
-}
-
+/**
+ * Shrink the MTU down to a fixed packetization time (for audio).
+ */
+static void
+rtp_set_ptime (sout_stream_id_t *id, unsigned ptime_ms, size_t bytes)
+{
+    /* Samples per second */
+    size_t spl = (id->i_clock_rate - 1) * ptime_ms / 1000 + 1;
+    bytes *= id->i_channels;
+    spl *= bytes;
+
+    if (spl < rtp_mtu (id)) /* MTU is big enough for ptime */
+        id->i_mtu = 12 + spl;
+    else /* MTU is too small for ptime, align to a sample boundary */
+        id->i_mtu = (id->i_mtu / bytes) * bytes;
+}
-
-/** Add an ES as a new RTP stream */
@@ -969 +985 @@
-                id->i_payload_type = 0;
-            id->psz_enc = "PCMU";
-
+
+
-            break;
-        case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
@@ -975 +992 @@
-                id->i_payload_type = 8;
-            id->psz_enc = "PCMA";
-
+
+
-            break;
-        case VLC_FOURCC( 's', '1', '6', 'b' ):
@@ -988 +1006 @@
-            }
-            id->psz_enc = "L16";
-
+
+
-            break;
-        case VLC_FOURCC( 'u', '8', ' ', ' ' ):
-            id->psz_enc = "L8";
-
+
+
-            break;
-        case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
@@ -1516 +1536 @@
-}
-
-/**
- * @return number of audio samples to include for a given packetization time
- * (this really only makes sense for audio formats).
- */
-size_t rtp_plen (const sout_stream_id_t * id, unsigned ptime_ms)
-{
-    return id->i_channels * (((id->i_clock_rate - 1) * ptime_ms / 1000) + 1);
-}
-
-
-/*****************************************************************************
- * Non-RTP mux

modules/stream_out/rtp.h

@@ -47 +47 @@
-void rtp_packetize_send (sout_stream_id_t *id, block_t *out);
-size_t rtp_mtu (const sout_stream_id_t *id);
-size_t rtp_plen (const sout_stream_id_t * id, unsigned ptime);
-
-int rtp_packetize_l16  (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_l8   (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_mpa  (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_mpv  (sout_stream_t *, sout_stream_id_t *, block_t *);

modules/stream_out/rtpfmt.c

@@ -304 +304 @@
-}
-
-int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id,
-                       block_t *in )
-{
-    const uint8_t *p_data = in->p_buffer;
-    size_t i_data  = in->i_buffer;
-    size_t i_plen = 2 * rtp_plen (id, 20);
-
-    for( unsigned i_packet = 0; i_data > 0; i_packet++ )
-    {
-        int           i_payload = __MIN( i_plen, i_data );
-        block_t *out = block_New( p_stream, 12 + i_payload );
-
-        /* rtp common header */
-        rtp_packetize_common( id, out, 0,
-                              (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 * 20000;
-        out->i_length = i_payload * 20000 / i_plen;
-
-        rtp_packetize_send( id, out );
-
-        p_data += i_payload;
-        i_data -= i_payload;
-    }
-
-    return VLC_SUCCESS;
-}
-
-int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id,
-                      block_t *in )
-{
-    const uint8_t *p_data = in->p_buffer;
-    size_t i_data  = in->i_buffer;
-    size_t i_plen = rtp_plen (id, 20);
-
-    for( unsigned i_packet = 0; i_data > 0; i_packet++ )
-    {
-        int           i_payload = __MIN( i_plen, i_data );
-        block_t *out = block_New( p_stream, 12 + i_payload );
-
-        /* rtp common header */
-        rtp_packetize_common( id, out, 0,
-                              (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 * 20000;
-        out->i_length = i_payload * 20000 / i_plen;
-
-        rtp_packetize_send( id, out );
-
-        p_data += i_payload;
-        i_data -= i_payload;
-    }
-
-    return VLC_SUCCESS;
-}
-
-int rtp_packetize_mp4a( sout_stream_t *p_stream, sout_stream_id_t *id,
-                        block_t *in )