[2/2] rtpdec: Add support for G726 audio

Message ID 1322578791-18818-2-git-send-email-martin@martin.st
State Committed
Headers show

Commit Message

Martin Storsjö Nov. 29, 2011, 2:59 p.m.
From: Miroslav Slugeň <Thunder.m@seznam.cz>

This requires using a separate init function, since
there isn't necessarily any fmtp lines for this codec,
so parse_sdp_a_line won't be called. Incorporating it
with the alloc function wouldn't do either, since it is
called before the full rtpmap line is parsed (where
the sample rate is extracted).
---
 libavformat/Makefile         |    1 +
 libavformat/rtpdec.c         |    5 ++
 libavformat/rtpdec_formats.h |    4 ++
 libavformat/rtpdec_g726.c    |   94 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 0 deletions(-)
 create mode 100644 libavformat/rtpdec_g726.c

Comments

Luca Barbato Nov. 30, 2011, 5:04 a.m. | #1
On 29/11/11 15:59, Martin Storsjö wrote:
> From: Miroslav Slugeň<Thunder.m@seznam.cz>
>
> This requires using a separate init function, since
> there isn't necessarily any fmtp lines for this codec,
> so parse_sdp_a_line won't be called. Incorporating it
> with the alloc function wouldn't do either, since it is
> called before the full rtpmap line is parsed (where
> the sample rate is extracted).

Looks a little strange but seems ok.
Martin Storsjö Nov. 30, 2011, 3:40 p.m. | #2
On Wed, 30 Nov 2011, Luca Barbato wrote:

> On 29/11/11 15:59, Martin Storsjö wrote:
>> From: Miroslav Slugeň<Thunder.m@seznam.cz>
>>
>> This requires using a separate init function, since
>> there isn't necessarily any fmtp lines for this codec,
>> so parse_sdp_a_line won't be called. Incorporating it
>> with the alloc function wouldn't do either, since it is
>> called before the full rtpmap line is parsed (where
>> the sample rate is extracted).
>
> Looks a little strange but seems ok.

Applied with some tweaks suggested by Justin.

// Martin

Patch

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 64b2d82..f3f8679 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -247,6 +247,7 @@  OBJS-$(CONFIG_RTPDEC)                    += rdt.o         \
                                             rtpdec.o      \
                                             rtpdec_amr.o  \
                                             rtpdec_asf.o  \
+                                            rtpdec_g726.o \
                                             rtpdec_h263.o \
                                             rtpdec_h264.o \
                                             rtpdec_latm.o \
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 88cf15b..7e8b52a 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -83,6 +83,11 @@  void av_register_rtp_dynamic_payload_handlers(void)
     ff_register_dynamic_payload_handler(&ff_qt_rtp_vid_handler);
     ff_register_dynamic_payload_handler(&ff_quicktime_rtp_aud_handler);
     ff_register_dynamic_payload_handler(&ff_quicktime_rtp_vid_handler);
+
+    ff_register_dynamic_payload_handler(&ff_g726_16_dynamic_handler);
+    ff_register_dynamic_payload_handler(&ff_g726_24_dynamic_handler);
+    ff_register_dynamic_payload_handler(&ff_g726_32_dynamic_handler);
+    ff_register_dynamic_payload_handler(&ff_g726_40_dynamic_handler);
 }
 
 RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h
index 708c299..3074565 100644
--- a/libavformat/rtpdec_formats.h
+++ b/libavformat/rtpdec_formats.h
@@ -33,6 +33,10 @@  int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p);
 
 extern RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_g726_16_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_g726_24_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_g726_32_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_g726_40_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler;
 extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
diff --git a/libavformat/rtpdec_g726.c b/libavformat/rtpdec_g726.c
new file mode 100644
index 0000000..8690cc5
--- /dev/null
+++ b/libavformat/rtpdec_g726.c
@@ -0,0 +1,94 @@ 
+/*
+ * Copyright (c) 2011 Miroslav Slugeň <Thunder.m@seznam.cz>
+ *
+ * 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"
+
+static int g726_16_init(AVFormatContext *s, int st_index, PayloadContext *data)
+{
+    AVStream *stream = s->streams[st_index];
+    AVCodecContext *codec = stream->codec;
+
+    codec->bit_rate = 16000;
+    codec->bits_per_coded_sample = codec->bit_rate / codec->sample_rate;
+
+    return 0;
+}
+
+static int g726_24_init(AVFormatContext *s, int st_index, PayloadContext *data)
+{
+    AVStream *stream = s->streams[st_index];
+    AVCodecContext *codec = stream->codec;
+
+    codec->bit_rate = 24000;
+    codec->bits_per_coded_sample = codec->bit_rate / codec->sample_rate;
+
+    return 0;
+}
+
+static int g726_32_init(AVFormatContext *s, int st_index, PayloadContext *data)
+{
+    AVStream *stream = s->streams[st_index];
+    AVCodecContext *codec = stream->codec;
+
+    codec->bit_rate = 32000;
+    codec->bits_per_coded_sample = codec->bit_rate / codec->sample_rate;
+
+    return 0;
+}
+
+static int g726_40_init(AVFormatContext *s, int st_index, PayloadContext *data)
+{
+    AVStream *stream = s->streams[st_index];
+    AVCodecContext *codec = stream->codec;
+
+    codec->bit_rate = 40000;
+    codec->bits_per_coded_sample = codec->bit_rate / codec->sample_rate;
+
+    return 0;
+}
+
+RTPDynamicProtocolHandler ff_g726_16_dynamic_handler = {
+    .enc_name   = "G726-16",
+    .codec_type = AVMEDIA_TYPE_AUDIO,
+    .codec_id   = CODEC_ID_ADPCM_G726,
+    .init       = g726_16_init,
+};
+
+RTPDynamicProtocolHandler ff_g726_24_dynamic_handler = {
+    .enc_name   = "G726-24",
+    .codec_type = AVMEDIA_TYPE_AUDIO,
+    .codec_id   = CODEC_ID_ADPCM_G726,
+    .init       = g726_24_init,
+};
+
+RTPDynamicProtocolHandler ff_g726_32_dynamic_handler = {
+    .enc_name   = "G726-32",
+    .codec_type = AVMEDIA_TYPE_AUDIO,
+    .codec_id   = CODEC_ID_ADPCM_G726,
+    .init       = g726_32_init,
+};
+
+RTPDynamicProtocolHandler ff_g726_40_dynamic_handler = {
+    .enc_name   = "G726-40",
+    .codec_type = AVMEDIA_TYPE_AUDIO,
+    .codec_id   = CODEC_ID_ADPCM_G726,
+    .init       = g726_40_init,
+};