FS-9525 part 2

diff --git a/src/mod/applications/mod_conference/conference_loop.c b/src/mod/applications/mod_conference/conference_loop.c
index 9df033de800b8739e3871d5b61eb077d38eaa158..d022bea4b2d60ad2d9a2d9968db7e32d9a4764a5 100644 (file)
--- a/src/mod/applications/mod_conference/conference_loop.c
+++ b/src/mod/applications/mod_conference/conference_loop.c
@@ -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);
                                        }
 
-                                       write_frame.timestamp = timer.samplecount;
+                                       //write_frame.timestamp = timer.samplecount;
 
                                        if (member->fnode) {
                                                conference_member_add_file_data(member, write_frame.data, write_frame.datalen);

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 9e61003009c2cee21eb140af0b67461653563f5a..c70882e3af9cd90ad09ce2ff323ae55ddea3e602 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -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;
        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;
        }