RTSP: Decouple MPEG-4 and AAC specific parts from rtsp.c

Patch by Josh Allmann, joshua dot allmann at gmail

Originally committed as revision 23769 to svn://svn.ffmpeg.org/ffmpeg/trunk

5 files changed, 168 insertions, 63 deletions

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 156cd144bb..2977673604 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -228,6 +228,7 @@ OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o        \
                                             rtpdec_asf.o  \
                                             rtpdec_h263.o \
                                             rtpdec_h264.o \
+                                            rtpdec_mpeg4.o \
                                             rtpdec_xiph.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o id3v2.o
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 0d2df59a75..0b316e3c48 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -34,6 +34,7 @@
 #include "rtpdec_asf.h"
 #include "rtpdec_h263.h"
 #include "rtpdec_h264.h"
+#include "rtpdec_mpeg4.h"
 #include "rtpdec_xiph.h"
 
 //#define DEBUG
@@ -50,9 +51,6 @@
 /* statistics functions */
 RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL;
 
-static RTPDynamicProtocolHandler mp4v_es_handler= {"MP4V-ES", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4};
-static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC};
-
 void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler)
 {
     handler->next= RTPFirstDynamicPayloadHandler;
@@ -61,8 +59,8 @@ void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler)
 
 void av_register_rtp_dynamic_payload_handlers(void)
 {
-    ff_register_dynamic_payload_handler(&mp4v_es_handler);
-    ff_register_dynamic_payload_handler(&mpeg4_generic_handler);
+    ff_register_dynamic_payload_handler(&ff_mp4v_es_dynamic_handler);
+    ff_register_dynamic_payload_handler(&ff_mpeg4_generic_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_amr_nb_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_amr_wb_dynamic_handler);
     ff_register_dynamic_payload_handler(&ff_h263_1998_dynamic_handler);
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c
new file mode 100644
index 0000000000..8befef21ef
--- /dev/null
+++ b/libavformat/rtpdec_mpeg4.c
@@ -0,0 +1,125 @@
+/**
+ * Common code for the RTP depacketization of MPEG-4 formats.
+ * Copyright (c) 2010 Fabrice Bellard
+ *                    Romain Degez
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * @brief MPEG4 / RTP Code
+ * @author Fabrice Bellard
+ * @author Romain Degez
+ */
+
+#include "rtpdec_mpeg4.h"
+#include "internal.h"
+#include "libavutil/avstring.h"
+
+/* return the length and optionally the data */
+static int hex_to_data(uint8_t *data, const char *p)
+{
+    int c, len, v;
+
+    len = 0;
+    v = 1;
+    for (;;) {
+        p += strspn(p, SPACE_CHARS);
+        if (*p == '\0')
+            break;
+        c = toupper((unsigned char) *p++);
+        if (c >= '0' && c <= '9')
+            c = c - '0';
+        else if (c >= 'A' && c <= 'F')
+            c = c - 'A' + 10;
+        else
+            break;
+        v = (v << 4) | c;
+        if (v & 0x100) {
+            if (data)
+                data[len] = v;
+            len++;
+            v = 1;
+        }
+    }
+    return len;
+}
+
+static int parse_fmtp_config(AVCodecContext * codec, char *value)
+{
+    /* decode the hexa encoded parameter */
+    int len = hex_to_data(NULL, value);
+    if (codec->extradata)
+        av_free(codec->extradata);
+    codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (!codec->extradata)
+        return AVERROR(ENOMEM);
+    codec->extradata_size = len;
+    hex_to_data(codec->extradata, value);
+    return 0;
+}
+
+static int parse_sdp_line(AVFormatContext *s, int st_index,
+                          PayloadContext *data, const char *line)
+{
+    const char *p;
+    char value[4096], attr[25];
+    int res = 0;
+    AVCodecContext* codec = s->streams[st_index]->codec;
+
+    if (av_strstart(line, "fmtp:", &p)) {
+        // remove protocol identifier
+        while (*p && *p == ' ') p++; // strip spaces
+        while (*p && *p != ' ') p++; // eat protocol identifier
+        while (*p && *p == ' ') p++; // strip trailing spaces
+
+        while (ff_rtsp_next_attr_and_value(&p,
+                                           attr, sizeof(attr),
+                                           value, sizeof(value))) {
+            if (!strcmp(attr, "config")) {
+                res = parse_fmtp_config(codec, value);
+
+                if (res < 0)
+                    return res;
+            }
+        }
+    }
+
+    return 0;
+
+}
+
+RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
+    .enc_name           = "MP4V-ES",
+    .codec_type         = AVMEDIA_TYPE_VIDEO,
+    .codec_id           = CODEC_ID_MPEG4,
+    .parse_sdp_a_line   = parse_sdp_line,
+    .open               = NULL,
+    .close              = NULL,
+    .parse_packet       = NULL
+};
+
+RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {
+    .enc_name           = "mpeg4-generic",
+    .codec_type         = AVMEDIA_TYPE_AUDIO,
+    .codec_id           = CODEC_ID_AAC,
+    .parse_sdp_a_line   = parse_sdp_line,
+    .open               = NULL,
+    .close              = NULL,
+    .parse_packet       = NULL
+};
diff --git a/libavformat/rtpdec_mpeg4.h b/libavformat/rtpdec_mpeg4.h
new file mode 100644
index 0000000000..06d9e577f6
--- /dev/null
+++ b/libavformat/rtpdec_mpeg4.h
@@ -0,0 +1,39 @@
+/**
+ * Common code for the RTP depacketization of MPEG-4 formats.
+ * Copyright (c) 2010 Fabrice Bellard
+ *                    Romain Degez
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_RTPDEC_MPEG4_H
+#define AVFORMAT_RTPDEC_MPEG4_H
+
+#include "rtpdec.h"
+
+/**
+ * MPEG-4 Video RTP callbacks. (RFC 3016)
+ */
+extern RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler;
+
+/**
+ * AAC RTP callbacks. (RFC 3640)
+ */
+extern RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler;
+
+#endif /* AVFORMAT_RTPDEC_MPEG4_H */
+
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index f29d72727d..11a9d5345a 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -158,59 +158,6 @@ static int sdp_parse_rtpmap(AVFormatContext *s,
     return 0;
 }
 
-/* return the length and optionally the data */
-static int hex_to_data(uint8_t *data, const char *p)
-{
-    int c, len, v;
-
-    len = 0;
-    v = 1;
-    for (;;) {
-        p += strspn(p, SPACE_CHARS);
-        if (*p == '\0')
-            break;
-        c = toupper((unsigned char) *p++);
-        if (c >= '0' && c <= '9')
-            c = c - '0';
-        else if (c >= 'A' && c <= 'F')
-            c = c - 'A' + 10;
-        else
-            break;
-        v = (v << 4) | c;
-        if (v & 0x100) {
-            if (data)
-                data[len] = v;
-            len++;
-            v = 1;
-        }
-    }
-    return len;
-}
-
-static void sdp_parse_fmtp_config(AVCodecContext * codec, void *ctx,
-                                  char *attr, char *value)
-{
-    switch (codec->codec_id) {
-    case CODEC_ID_MPEG4:
-    case CODEC_ID_AAC:
-        if (!strcmp(attr, "config")) {
-            /* decode the hexa encoded parameter */
-            int len = hex_to_data(NULL, value);
-            if (codec->extradata)
-                av_free(codec->extradata);
-            codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
-            if (!codec->extradata)
-                return;
-            codec->extradata_size = len;
-            hex_to_data(codec->extradata, value);
-        }
-        break;
-    default:
-        break;
-    }
-    return;
-}
-
 typedef struct {
     const char *str;
     uint16_t    type;
@@ -263,16 +210,11 @@ static void sdp_parse_fmtp(AVStream *st, const char *p)
     char value[4096];
     int i;
     RTSPStream *rtsp_st = st->priv_data;
-    AVCodecContext *codec = st->codec;
     RTPPayloadData *rtp_payload_data = &rtsp_st->rtp_payload_data;
 
     /* loop on each attribute */
     while (ff_rtsp_next_attr_and_value(&p, attr, sizeof(attr),
                                        value, sizeof(value))) {
-        /* grab the codec extra_data from the config parameter of the fmtp
-         * line */
-        sdp_parse_fmtp_config(codec, rtsp_st->dynamic_protocol_context,
-                              attr, value);
         /* Looking for a known attribute */
         for (i = 0; attr_names[i].str; ++i) {
             if (!strcasecmp(attr, attr_names[i].str)) {