kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mod_amr] handle frame type NO_DATA and add unit test.

This commit is contained in:
Dragos Oancea 2021-02-25 16:16:14 +02:00
parent a5ca2144ef
commit 752e1c3386
5 changed files with 137 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/codecs/mod_amr/Makefile.am
View File

@ -20,3 +20,14 @@ else
mod_amr_la_CFLAGS += -DAMR_PASSTHROUGH
endif
if HAVE_AMR
noinst_PROGRAMS = test/test_amr
test_test_amr_SOURCES = test/test_amr.c
test_test_amr_CFLAGS = $(AM_CFLAGS) -I./ -I../ -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" $(AMR_CFLAGS)
test_test_amr_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) $(AMR_LIBS)
TESTS = $(noinst_PROGRAMS)
endif

2
src/mod/codecs/mod_amr/amr_be.c
View File

@ -106,7 +106,7 @@ extern switch_bool_t switch_amr_unpack_be(unsigned char *encoded_buf, uint8_t *t
switch_amr_array_lshift(2, shift_buf, encoded_len - 1);
/* get frame size */
index = ((shift_tocs[0] >> 3) & 0x0f);
if (index > 9) {
if (index > 9 && index != 0xf) {
return SWITCH_FALSE;
}
framesz = switch_amr_frame_sizes[index];

8
src/mod/codecs/mod_amr/mod_amr.c
View File

@ -139,7 +139,7 @@ static struct {
int debug;
} globals;
const int switch_amr_frame_sizes[] = {12,13,15,17,19,20,26,31,5,0};
const int switch_amr_frame_sizes[] = {12,13,15,17,19,20,26,31,5,0,0,0,0,0,0,1};
#define SWITCH_AMR_OUT_MAX_SIZE 32
#define SWITCH_AMR_MODES 9 /* plus SID */
@ -157,7 +157,7 @@ static switch_bool_t switch_amr_unpack_oa(unsigned char *buf, uint8_t *tmp, int
tocs = buf;
index = ((tocs[0]>>3) & 0xf);
buf++; /* point to voice payload */
if (index > SWITCH_AMR_MODES) {
if (index > SWITCH_AMR_MODES && index != 0xf) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AMR decoder (OA): Invalid Table Of Contents (TOC): 0x%x\n", index);
return SWITCH_FALSE;
}
@ -195,7 +195,7 @@ static switch_bool_t switch_amr_info(unsigned char *encoded_buf, int encoded_dat
encoded_buf++; /* CMR skip */
tocs = encoded_buf;
index = (tocs[0] >> 3) & 0x0f;
if (index > SWITCH_AMR_MODES) {
if (index > SWITCH_AMR_MODES && index != 0xf) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AMR decoder (OA): Invalid Table Of Contents (TOC): 0x%x\n", index);
return SWITCH_FALSE;
}
@ -215,7 +215,7 @@ static switch_bool_t switch_amr_info(unsigned char *encoded_buf, int encoded_dat
ft = shift_tocs[0] >> 3 ;
ft &= ~(1 << 5); /* Frame Type */
index = (shift_tocs[0] >> 3) & 0x0f;
if (index > SWITCH_AMR_MODES) {
if (index > SWITCH_AMR_MODES && index != 0xf) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AMR decoder (BE): Invalid Table Of Contents (TOC): 0x%x\n", index);
return SWITCH_FALSE;
}

21
src/mod/codecs/mod_amr/test/freeswitch.xml Normal file
View File

@ -0,0 +1,21 @@
<document type="freeswitch/xml">
<section name="configuration" description="Various Configuration">
<configuration name="modules.conf" description="Modules">
<modules>
<load module="mod_loopback"/>
<load module="mod_amr"/>
</modules>
</configuration>
</section>
<section name="dialplan" description="Regex/XML Dialplan">
<context name="default">
<extension name="sample">
<condition>
<action application="info"/>
</condition>
</extension>
</context>
</section>
</document>

100
src/mod/codecs/mod_amr/test/test_amr.c Normal file
View File

@ -0,0 +1,100 @@
/*
* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
* Copyright (C) 2005-2021, Anthony Minessale II <anthm@freeswitch.org>
*
* Version: MPL 1.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
*
* The Initial Developer of the Original Code is
* Anthony Minessale II <anthm@freeswitch.org>
* Portions created by the Initial Developer are Copyright (C)
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Dragos Oancea <dragos@signalwire.com>
*
*
* test_amr.c -- tests mod_amr
*
*/
#ifndef AMR_PASSTHROUGH
#include <switch.h>
#include <stdlib.h>
#include <test/switch_test.h>
FST_CORE_BEGIN(".")
{
FST_SUITE_BEGIN(test_amr)
{
FST_SETUP_BEGIN()
{
fst_requires_module("mod_loopback");
fst_requires_module("mod_amr");
}
FST_SETUP_END()
FST_TEARDOWN_BEGIN()
{
}
FST_TEARDOWN_END()
FST_TEST_BEGIN(amr_decode)
{
switch_codec_t read_codec = { 0 };
switch_status_t status;
switch_codec_settings_t codec_settings = {{ 0 }};
uint32_t flags = 0;
uint32_t rate;
/*amr frame types*/
static char no_data[] = "\x77\xc0";
static char fail[] = "\x76\xc0";
/*decode*/
uint32_t decoded_len;
unsigned char decbuf[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
switch_stream_handle_t stream = { 0 };
status = switch_core_codec_init(&read_codec,
"AMR",
"mod_amr",
NULL,
8000,
20,
1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
&codec_settings, fst_pool);
fst_check(status == SWITCH_STATUS_SUCCESS);
SWITCH_STANDARD_STREAM(stream);
switch_api_execute("amr_debug", "on", NULL, &stream);
switch_safe_free(stream.data);
/*NO DATA = 0xf*/
status = switch_core_codec_decode(&read_codec, NULL, &no_data, 2, 8000, &decbuf, &decoded_len, &rate, &flags);
fst_check(status == SWITCH_STATUS_SUCCESS);
/*Invalid frame type*/
status = switch_core_codec_decode(&read_codec, NULL, &fail, 2, 8000, &decbuf, &decoded_len, &rate, &flags);
fst_check(status != SWITCH_STATUS_SUCCESS);
switch_core_codec_destroy(&read_codec);
}
FST_TEST_END()
}
FST_SUITE_END()
}
FST_CORE_END()
#endif