retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #1798 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:FS-12008 to master 

* commit '797216fcc04efd05c0d45b33a4269bd1d8e118ff':
  FS-12008: special case G722 - fix rate passed to switch_core_codec_init()
This commit is contained in:
Mike Jerris 2019-08-19 13:37:47 -05:00
parent 8f4b522293 797216fcc0
commit cf0826406b
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/switch_core_codec.c
View File

@ -614,14 +614,18 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_reset(switch_codec_t *codec)
SWITCH_DECLARE(switch_status_t) switch_core_codec_copy(switch_codec_t *codec, switch_codec_t *new_codec,
const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool)
{
uint32_t codec_rate;
switch_assert(codec != NULL);
switch_assert(new_codec != NULL);
codec_rate = !strcasecmp(codec->implementation->iananame, "g722")
? codec->implementation->samples_per_second : codec->implementation->actual_samples_per_second;
return switch_core_codec_init(new_codec,
codec->implementation->iananame,
codec->implementation->modname,
codec->fmtp_in,
codec->implementation->actual_samples_per_second,
codec_rate,
codec->implementation->microseconds_per_packet / 1000,
codec->implementation->number_of_channels,
codec->flags,

3
tests/unit/conf/freeswitch.xml
View File

@ -8,6 +8,9 @@
<load module="mod_console"/>
<load module="mod_loopback"/>
<load module="mod_opus"/>
<load module="mod_spandsp"/>
<load module="mod_amr"/>
<load module="mod_amrwb"/>
</modules>
</configuration>

15
tests/unit/switch_core_codec.c
View File

@ -51,6 +51,7 @@ FST_CORE_BEGIN("./conf")
FST_SETUP_BEGIN()
{
fst_requires_module("mod_opus");
fst_requires_module("mod_spandsp");
}
FST_SETUP_END()
@ -101,6 +102,20 @@ FST_CORE_BEGIN("./conf")
switch_core_codec_copy(&orig_codec, &new_codec, NULL, NULL);
fst_check(orig_codec.implementation->samples_per_second == new_codec.implementation->samples_per_second);
fst_check(orig_codec.implementation->actual_samples_per_second == new_codec.implementation->actual_samples_per_second);
status = switch_core_codec_init(&orig_codec,
"G722",
"mod_spandsp",
NULL,
8000,
20,
1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
&codec_settings, fst_pool);
fst_check(status == SWITCH_STATUS_SUCCESS);
switch_core_codec_copy(&orig_codec, &new_codec, NULL, NULL);
fst_check(orig_codec.implementation->samples_per_second == new_codec.implementation->samples_per_second);
fst_check(orig_codec.implementation->actual_samples_per_second == new_codec.implementation->actual_samples_per_second);
}
FST_TEST_END()