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

FS-9525 part 2

This commit is contained in:
Anthony Minessale 2016-09-23 16:50:47 -04:00
parent ca28fdc8f3
commit 2b1f0da5c4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/applications/mod_conference/conference_loop.c
View File

@ -1336,7 +1336,7 @@ void conference_loop_output(conference_member_t *member)
switch_change_sln_volume(write_frame.data, write_frame.samples * member->conference->channels, member->volume_out_level); switch_change_sln_volume(write_frame.data, write_frame.samples * member->conference->channels, member->volume_out_level);
} }
write_frame.timestamp = timer.samplecount; //write_frame.timestamp = timer.samplecount;
if (member->fnode) { if (member->fnode) {
conference_member_add_file_data(member, write_frame.data, write_frame.datalen); conference_member_add_file_data(member, write_frame.data, write_frame.datalen);

2
src/switch_rtp.c
View File

@ -3696,7 +3696,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_change_interval(switch_rtp_t *rtp_ses
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
int change_timer = 0; int change_timer = 0;
if (rtp_session->ms_per_packet && rtp_session->ms_per_packet != ms_per_packet) { if (rtp_session->ms_per_packet != ms_per_packet || rtp_session->samples_per_interval != samples_per_interval) {
change_timer = 1; change_timer = 1;
} }