From 3ab8b74f7813a7356a1b79ae47e7125d09e4778c Mon Sep 17 00:00:00 2001 From: Kaian Date: Wed, 25 Mar 2020 15:09:20 +0100 Subject: [PATCH] codecs: add support for g711u codec --- CMakeLists.txt | 1 + src/codecs/codec.c | 4 ++ src/codecs/codec.h | 1 + src/codecs/codec_g711a.c | 54 ++++++++++++------------- src/codecs/codec_g711u.c | 86 ++++++++++++++++++++++++++++++++++++++++ src/codecs/codec_g711u.h | 38 ++++++++++++++++++ 6 files changed, 157 insertions(+), 27 deletions(-) create mode 100644 src/codecs/codec_g711u.c create mode 100644 src/codecs/codec_g711u.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ba150d..6a1c25c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src) set(SOURCES src/codecs/codec.c src/codecs/codec_g711a.c + src/codecs/codec_g711u.c src/capture/capture.c src/capture/capture_pcap.c src/capture/capture_txt.c diff --git a/src/codecs/codec.c b/src/codecs/codec.c index 280eb4c..124f7c8 100644 --- a/src/codecs/codec.c +++ b/src/codecs/codec.c @@ -29,6 +29,7 @@ #include "config.h" #include #include "codecs/codec_g711a.h" +#include "codecs/codec_g711u.h" #ifdef WITH_G729 #include "codecs/codec_g729.h" #endif @@ -92,6 +93,9 @@ codec_stream_decode(Stream *stream, GByteArray *decoded, GError **error) case RTP_CODEC_G711A: dbytes = codec_g711a_decode(rtp_payload, &dlen); break; + case RTP_CODEC_G711U: + dbytes = codec_g711u_decode(rtp_payload, &dlen); + break; #ifdef WITH_G729 case RTP_CODEC_G729: dbytes = codec_g729_decode(rtp_payload, &dlen); diff --git a/src/codecs/codec.h b/src/codecs/codec.h index 0d64dd7..975c1ea 100644 --- a/src/codecs/codec.h +++ b/src/codecs/codec.h @@ -32,6 +32,7 @@ #include "storage/stream.h" +#define RTP_CODEC_G711U 0 #define RTP_CODEC_G711A 8 #define RTP_CODEC_G729 18 diff --git a/src/codecs/codec_g711a.c b/src/codecs/codec_g711a.c index be9e9c4..ff2ae51 100644 --- a/src/codecs/codec_g711a.c +++ b/src/codecs/codec_g711a.c @@ -33,37 +33,37 @@ // @formatter:off /** Expansion table, taken from wireshark G711atable.h */ -gint16 alaw_exp_table[256] = { - -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736, - -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784, - -2752, -2624, -3008, -2880, -2240, -2112, -2496, -2368, - -3776, -3648, -4032, -3904, -3264, -3136, -3520, -3392, - -22016,-20992,-24064,-23040,-17920,-16896,-19968,-18944, - -30208,-29184,-32256,-31232,-26112,-25088,-28160,-27136, - -11008,-10496,-12032,-11520, -8960, -8448, -9984, -9472, - -15104,-14592,-16128,-15616,-13056,-12544,-14080,-13568, - -344, -328, -376, -360, -280, -264, -312, -296, - -472, -456, -504, -488, -408, -392, -440, -424, +static gint16 alaw_exp_table[256] = { + -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736, + -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784, + -2752, -2624, -3008, -2880, -2240, -2112, -2496, -2368, + -3776, -3648, -4032, -3904, -3264, -3136, -3520, -3392, + -22016,-20992,-24064,-23040,-17920,-16896,-19968,-18944, + -30208,-29184,-32256,-31232,-26112,-25088,-28160,-27136, + -11008,-10496,-12032,-11520, -8960, -8448, -9984, -9472, + -15104,-14592,-16128,-15616,-13056,-12544,-14080,-13568, + -344, -328, -376, -360, -280, -264, -312, -296, + -472, -456, -504, -488, -408, -392, -440, -424, -88, -72, -120, -104, -24, -8, -56, -40, - -216, -200, -248, -232, -152, -136, -184, -168, - -1376, -1312, -1504, -1440, -1120, -1056, -1248, -1184, - -1888, -1824, -2016, -1952, -1632, -1568, -1760, -1696, - -688, -656, -752, -720, -560, -528, -624, -592, - -944, -912, -1008, -976, -816, -784, -880, -848, - 5504, 5248, 6016, 5760, 4480, 4224, 4992, 4736, - 7552, 7296, 8064, 7808, 6528, 6272, 7040, 6784, - 2752, 2624, 3008, 2880, 2240, 2112, 2496, 2368, - 3776, 3648, 4032, 3904, 3264, 3136, 3520, 3392, - 22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944, - 30208, 29184, 32256, 31232, 26112, 25088, 28160, 27136, - 11008, 10496, 12032, 11520, 8960, 8448, 9984, 9472, - 15104, 14592, 16128, 15616, 13056, 12544, 14080, 13568, + -216, -200, -248, -232, -152, -136, -184, -168, + -1376, -1312, -1504, -1440, -1120, -1056, -1248, -1184, + -1888, -1824, -2016, -1952, -1632, -1568, -1760, -1696, + -688, -656, -752, -720, -560, -528, -624, -592, + -944, -912, -1008, -976, -816, -784, -880, -848, + 5504, 5248, 6016, 5760, 4480, 4224, 4992, 4736, + 7552, 7296, 8064, 7808, 6528, 6272, 7040, 6784, + 2752, 2624, 3008, 2880, 2240, 2112, 2496, 2368, + 3776, 3648, 4032, 3904, 3264, 3136, 3520, 3392, + 22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944, + 30208, 29184, 32256, 31232, 26112, 25088, 28160, 27136, + 11008, 10496, 12032, 11520, 8960, 8448, 9984, 9472, + 15104, 14592, 16128, 15616, 13056, 12544, 14080, 13568, 344, 328, 376, 360, 280, 264, 312, 296, 472, 456, 504, 488, 408, 392, 440, 424, - 88, 72, 120, 104, 24, 8, 56, 40, + 88, 72, 120, 104, 24, 8, 56, 40, 216, 200, 248, 232, 152, 136, 184, 168, - 1376, 1312, 1504, 1440, 1120, 1056, 1248, 1184, - 1888, 1824, 2016, 1952, 1632, 1568, 1760, 1696, + 1376, 1312, 1504, 1440, 1120, 1056, 1248, 1184, + 1888, 1824, 2016, 1952, 1632, 1568, 1760, 1696, 688, 656, 752, 720, 560, 528, 624, 592, 944, 912, 1008, 976, 816, 784, 880, 848 }; diff --git a/src/codecs/codec_g711u.c b/src/codecs/codec_g711u.c new file mode 100644 index 0000000..f3c128f --- /dev/null +++ b/src/codecs/codec_g711u.c @@ -0,0 +1,86 @@ +/************************************************************************** + ** + ** sngrep - SIP Messages flow viewer + ** + ** Copyright (C) 2013-2019 Ivan Alonso (Kaian) + ** Copyright (C) 2013-2019 Irontec SL. All rights reserved. + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** This program 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ** + ****************************************************************************/ +/** + * @file codec_g711u.c + * @author Ivan Alonso [aka Kaian] + * + * @brief Functions to decode g711u (ulaw) RTP packets + * + */ + +#include "config.h" +#include +#include "codec_g711u.h" + +// @formatter:off +/** Expansion table, taken from wireshark G711utable.h */ +static gint16 ulaw_exp_table[256] = { + -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956, + -23932,-22908,-21884,-20860,-19836,-18812,-17788,-16764, + -15996,-15484,-14972,-14460,-13948,-13436,-12924,-12412, + -11900,-11388,-10876,-10364, -9852, -9340, -8828, -8316, + -7932, -7676, -7420, -7164, -6908, -6652, -6396, -6140, + -5884, -5628, -5372, -5116, -4860, -4604, -4348, -4092, + -3900, -3772, -3644, -3516, -3388, -3260, -3132, -3004, + -2876, -2748, -2620, -2492, -2364, -2236, -2108, -1980, + -1884, -1820, -1756, -1692, -1628, -1564, -1500, -1436, + -1372, -1308, -1244, -1180, -1116, -1052, -988, -924, + -876, -844, -812, -780, -748, -716, -684, -652, + -620, -588, -556, -524, -492, -460, -428, -396, + -372, -356, -340, -324, -308, -292, -276, -260, + -244, -228, -212, -196, -180, -164, -148, -132, + -120, -112, -104, -96, -88, -80, -72, -64, + -56, -48, -40, -32, -24, -16, -8, 0, + 32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956, + 23932, 22908, 21884, 20860, 19836, 18812, 17788, 16764, + 15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412, + 11900, 11388, 10876, 10364, 9852, 9340, 8828, 8316, + 7932, 7676, 7420, 7164, 6908, 6652, 6396, 6140, + 5884, 5628, 5372, 5116, 4860, 4604, 4348, 4092, + 3900, 3772, 3644, 3516, 3388, 3260, 3132, 3004, + 2876, 2748, 2620, 2492, 2364, 2236, 2108, 1980, + 1884, 1820, 1756, 1692, 1628, 1564, 1500, 1436, + 1372, 1308, 1244, 1180, 1116, 1052, 988, 924, + 876, 844, 812, 780, 748, 716, 684, 652, + 620, 588, 556, 524, 492, 460, 428, 396, + 372, 356, 340, 324, 308, 292, 276, 260, + 244, 228, 212, 196, 180, 164, 148, 132, + 120, 112, 104, 96, 88, 80, 72, 64, + 56, 48, 40, 32, 24, 16, 8, 0 +}; +// @formatter:on + +gint16 * +codec_g711u_decode(GByteArray *input, gsize *decoded_len) +{ + g_return_val_if_fail(input != NULL, 0); + + *decoded_len = input->len * sizeof(gint16); + gint16 *out = g_malloc(*decoded_len); + + + for (guint i = 0; i < input->len; i++) { + out[i] = ulaw_exp_table[input->data[i]]; + } + + return out; +} diff --git a/src/codecs/codec_g711u.h b/src/codecs/codec_g711u.h new file mode 100644 index 0000000..fb46cbc --- /dev/null +++ b/src/codecs/codec_g711u.h @@ -0,0 +1,38 @@ +/************************************************************************** + ** + ** sngrep - SIP Messages flow viewer + ** + ** Copyright (C) 2013-2019 Ivan Alonso (Kaian) + ** Copyright (C) 2013-2019 Irontec SL. All rights reserved. + ** + ** This program is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** This program 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 General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with this program. If not, see . + ** + ****************************************************************************/ +/** + * @file codec_g711u.h + * @author Ivan Alonso [aka Kaian] + * + * @brief Functions to decode g711u (ulaw) RTP packets + * + */ + +#ifndef __SNGREP_G711U_H +#define __SNGREP_G711U_H + +#include + +gint16 * +codec_g711u_decode(GByteArray *input, gsize *decoded_len); + +#endif