[v2,4/5] rtpdec: Add a depacketizer for iLBC

Message ID 1340008803-89076-4-git-send-email-martin@martin.st
State Superseded
Headers show

Commit Message

Martin Storsjö June 18, 2012, 8:40 a.m.
---
 libavformat/Makefile         |    1 +
 libavformat/rtpdec.c         |    1 +
 libavformat/rtpdec_formats.h |    1 +
 libavformat/rtpdec_ilbc.c    |   62 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 libavformat/rtpdec_ilbc.c

Comments

Luca Barbato June 18, 2012, 9:28 a.m. | #1
On 06/18/2012 10:40 AM, Martin Storsjö wrote:
> +static int ilbc_parse_fmtp(AVStream *stream, PayloadContext *data,
> +                           char *attr, char *value)
> +{
> +    if (!strcmp(attr, "mode")) {
> +        int mode = atoi(value);
> +        switch (mode) {
> +        case 20:
> +            stream->codec->block_align = 38;
> +            break;
> +        case 30:
> +            stream->codec->block_align = 50;
> +            break;
> +        }
> +    }
> +    return 0;
> +}

Anything different wouldn't be reported as error?

lu
Martin Storsjö June 18, 2012, 9:29 a.m. | #2
On Mon, 18 Jun 2012, Luca Barbato wrote:

> On 06/18/2012 10:40 AM, Martin Storsjö wrote:
>> +static int ilbc_parse_fmtp(AVStream *stream, PayloadContext *data,
>> +                           char *attr, char *value)
>> +{
>> +    if (!strcmp(attr, "mode")) {
>> +        int mode = atoi(value);
>> +        switch (mode) {
>> +        case 20:
>> +            stream->codec->block_align = 38;
>> +            break;
>> +        case 30:
>> +            stream->codec->block_align = 50;
>> +            break;
>> +        }
>> +    }
>> +    return 0;
>> +}
>
> Anything different wouldn't be reported as error?

Good point, I'll try to improve it.

// Martin

Patch

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 88e8db4..f3f0372 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -264,6 +264,7 @@  OBJS-$(CONFIG_RTPDEC)                    += rdt.o         \
                                             rtpdec_h263.o \
                                             rtpdec_h263_rfc2190.o \
                                             rtpdec_h264.o \
+                                            rtpdec_ilbc.o \
                                             rtpdec_latm.o \
                                             rtpdec_mpeg4.o \
                                             rtpdec_qcelp.o \
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 41e6eb4..b3bce24 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -68,6 +68,7 @@  void av_register_rtp_dynamic_payload_handlers(void)
     ff_register_dynamic_payload_handler(&ff_h263_2000_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_h263_rfc2190_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_h264_dynamic_handler);
+    ff_register_dynamic_payload_handler(&ff_ilbc_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_vorbis_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_theora_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_qdm2_dynamic_handler);
diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h
index 60edecb..aaa1809 100644
--- a/libavformat/rtpdec_formats.h
+++ b/libavformat/rtpdec_formats.h
@@ -45,6 +45,7 @@  extern RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_ilbc_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_mp4a_latm_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler;
diff --git a/libavformat/rtpdec_ilbc.c b/libavformat/rtpdec_ilbc.c
new file mode 100644
index 0000000..92f168f
--- /dev/null
+++ b/libavformat/rtpdec_ilbc.c
@@ -0,0 +1,62 @@ 
+/*
+ * RTP iLBC Depacketizer, RFC 3952
+ * Copyright (c) 2012 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+#include "rtpdec_formats.h"
+#include "libavutil/avstring.h"
+
+static int ilbc_parse_fmtp(AVStream *stream, PayloadContext *data,
+                           char *attr, char *value)
+{
+    if (!strcmp(attr, "mode")) {
+        int mode = atoi(value);
+        switch (mode) {
+        case 20:
+            stream->codec->block_align = 38;
+            break;
+        case 30:
+            stream->codec->block_align = 50;
+            break;
+        }
+    }
+    return 0;
+}
+
+static int ilbc_parse_sdp_line(AVFormatContext *s, int st_index,
+                               PayloadContext *data, const char *line)
+{
+    const char *p;
+
+    if (st_index < 0)
+        return 0;
+
+    if (av_strstart(line, "fmtp:", &p)) {
+        return ff_parse_fmtp(s->streams[st_index], data, p, ilbc_parse_fmtp);
+    }
+    return 0;
+}
+
+RTPDynamicProtocolHandler ff_ilbc_dynamic_handler = {
+    .enc_name         = "iLBC",
+    .codec_type       = AVMEDIA_TYPE_AUDIO,
+    .codec_id         = CODEC_ID_ILBC,
+    .parse_sdp_a_line = ilbc_parse_sdp_line,
+};