kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-07 07:59:49 +00:00
Code Issues Projects Releases Wiki Activity

FS-9197

Browse Source
This commit is contained in:
Anthony Minessale 2016-06-02 13:14:19 -05:00
parent 9ca13303f4
commit 885fe3b25c
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/mod/codecs/mod_opus/mod_opus.c
View File

@ -1244,27 +1244,27 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_opus_load)
codec_interface->implementations->codec_control = switch_opus_control; codec_interface->implementations->codec_control = switch_opus_control;
settings.stereo = 1; settings.stereo = 1;
if (x < 2) {
dft_fmtp = gen_fmtp(&settings, pool); dft_fmtp = gen_fmtp(&settings, pool);
switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */
116, /* the IANA code number */ 116, /* the IANA code number */
"opus",/* the IANA code name */ "opus",/* the IANA code name */
dft_fmtp, /* default fmtp to send (can be overridden by the init function) */ dft_fmtp, /* default fmtp to send (can be overridden by the init function) */
rate, /* samples transferred per second */ rate, /* samples transferred per second */
rate, /* actual samples transferred per second */ rate, /* actual samples transferred per second */
bits, /* bits transferred per second */ bits, /* bits transferred per second */
mss, /* number of microseconds per frame */ mss, /* number of microseconds per frame */
samples, /* number of samples per frame */ samples, /* number of samples per frame */
bytes * 2, /* number of bytes per frame decompressed */ bytes * 2, /* number of bytes per frame decompressed */
0, /* number of bytes per frame compressed */ 0, /* number of bytes per frame compressed */
2,/* number of channels represented */ 2,/* number of channels represented */
1, /* number of frames per network packet */ 1, /* number of frames per network packet */
switch_opus_init, /* function to initialize a codec handle using this implementation */ switch_opus_init, /* function to initialize a codec handle using this implementation */
switch_opus_encode, /* function to encode raw data into encoded data */ switch_opus_encode, /* function to encode raw data into encoded data */
switch_opus_decode, /* function to decode encoded data into raw data */ switch_opus_decode, /* function to decode encoded data into raw data */
switch_opus_destroy); /* deinitalize a codec handle using this implementation */ switch_opus_destroy); /* deinitalize a codec handle using this implementation */
codec_interface->implementations->codec_control = switch_opus_control; codec_interface->implementations->codec_control = switch_opus_control;
}
bytes *= 2; bytes *= 2;
samples *= 2; samples *= 2;
mss *= 2; mss *= 2;

8
src/switch_loadable_module.c
View File

@ -205,15 +205,15 @@ static switch_status_t switch_loadable_module_process(char *key, switch_loadable
for (impl = ptr->implementations; impl; impl = impl->next) { for (impl = ptr->implementations; impl; impl = impl->next) {
if (impl->bits_per_second) { if (impl->bits_per_second) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
"Adding Codec %s %d %s %dhz %dms %dbps\n", "Adding Codec %s %d %s %dhz %dms %dch %dbps\n",
impl->iananame, impl->ianacode, impl->iananame, impl->ianacode,
ptr->interface_name, impl->actual_samples_per_second, ptr->interface_name, impl->actual_samples_per_second,
impl->microseconds_per_packet / 1000, impl->bits_per_second); impl->microseconds_per_packet / 1000, impl->number_of_channels, impl->bits_per_second);
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
"Adding Codec %s %d %s %dhz %dms (VBR)\n", "Adding Codec %s %d %s %dhz %dms %dch (VBR)\n",
impl->iananame, impl->ianacode, impl->iananame, impl->ianacode,
ptr->interface_name, impl->actual_samples_per_second, impl->microseconds_per_packet / 1000); ptr->interface_name, impl->actual_samples_per_second, impl->microseconds_per_packet / 1000, impl->number_of_channels);
} }
node = switch_core_alloc(new_module->pool, sizeof(*node)); node = switch_core_alloc(new_module->pool, sizeof(*node));