Changeset 6d004778d445e1666c33b6ea4515a32428218e05

Timestamp:

04/06/08 22:06:32 (6 months ago)

Author:

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

git-committer:

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

git-parent:

[8235fe322236b1e1270caae42da9c2591ea0263f]

git-author:

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

Message:

RTP: support for pulse code modulation

Files:

• modules/demux/rtp.c (modified) (5 diffs)

modules/demux/rtp.c

@@ -340 +340 @@
-
-/* PT=0
-
+ G.711 µ-law (RFC3551)
- */
-static void *pcmu_init (demux_t *demux)
@@ -353 +353 @@
-
-/* PT=8
-
+ G.711 A-law (RFC3551)
- */
-static void *pcma_init (demux_t *demux)
@@ -365 +365 @@
-}
-
+/* PT=10,11
+ * L16: 16-bits (network byte order) PCM
+ */
+static void *l16s_init (demux_t *demux)
+{
+    es_format_t fmt;
+
+    es_format_Init (&fmt, AUDIO_ES, VLC_FOURCC ('s', '1', '6', 'b'));
+    fmt.audio.i_rate = 44100;
+    fmt.audio.i_channels = 2;
+    return codec_init (demux, &fmt);
+}
+
+static void *l16m_init (demux_t *demux)
+{
+    es_format_t fmt;
+
+    es_format_Init (&fmt, AUDIO_ES, VLC_FOURCC ('s', '1', '6', 'b'));
+    fmt.audio.i_rate = 44100;
+    fmt.audio.i_channels = 1;
+    return codec_init (demux, &fmt);
+}
+
-/* PT=14
- * MPA: MPEG Audio (RFC2250, §3.4)
@@ -450 +473 @@
-    {
-        /* Not using SDP, we need to guess the payload format used */
+        /* see http://www.iana.org/assignments/rtp-parameters */
-        if (p_sys->autodetect && block->i_buffer >= 2)
-        {
@@ -472 +496 @@
-                pt.init = pcma_init;
-                pt.frequency = 8000;
+                break;
+
+              case 10:
+                msg_Dbg (demux, "detected stereo PCM");
+                pt.init = l16s_init;
+                pt.frequency = 44100;
+                break;
+
+              case 11:
+                msg_Dbg (demux, "detected mono PCM");
+                pt.init = l16m_init;
+                pt.frequency = 44100;
-                break;
-