kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fix for FS-9313"

Browse Source 
This reverts commit cf6107963ca997f5ef25527d16f98626213047a9.
This commit is contained in:
Michael Jerris 2016-07-08 17:00:22 -04:00
parent aae7f06d7a
commit 9e89639c4d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,14 +244,11 @@ static switch_status_t switch_opus_fmtp_parse(const char *fmtp, switch_codec_fmt
if (!strcasecmp(data, "stereo")) {
codec_settings->stereo = atoi(arg);
if(codec_settings->stereo)
codec_fmtp->stereo = 1;
codec_fmtp->stereo = codec_settings->stereo;
}
if (!strcasecmp(data, "sprop-stereo")) {
codec_settings->sprop_stereo = atoi(arg);
if(codec_settings->sprop_stereo)
codec_fmtp->stereo = 1;
}
if (!strcasecmp(data, "maxaveragebitrate")) {
@ -632,7 +629,7 @@ static switch_status_t switch_opus_init(switch_codec_t *codec, switch_codec_flag
}
}
context->decoder_object = opus_decoder_create(dec_samplerate, codec->implementation->number_of_channels, &err);
context->decoder_object = opus_decoder_create(dec_samplerate, (!context->codec_settings.sprop_stereo ? codec->implementation->number_of_channels : 2), &err);
switch_set_flag(codec, SWITCH_CODEC_FLAG_HAS_PLC);
@ -730,7 +727,7 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
return SWITCH_STATUS_FALSE;
}
frame_samples = *decoded_data_len / 2 / codec->implementation->number_of_channels);
frame_samples = *decoded_data_len / 2 / (!context->codec_settings.sprop_stereo ? codec->implementation->number_of_channels : 2);
frame_size = frame_samples - (frame_samples % (codec->implementation->actual_samples_per_second / 400));
if (*flag & SFF_PLC) {
@ -831,7 +828,7 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
return SWITCH_STATUS_GENERR;
}
*decoded_data_len = samples * 2 * codec->implementation->number_of_channels;
*decoded_data_len = samples * 2 * (!context->codec_settings.sprop_stereo ? codec->implementation->number_of_channels : 2);
return SWITCH_STATUS_SUCCESS;
}