]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8354 #resolve [G722 audio issues with mod_conference after fab435479ada61f2f9d726b...
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 2 Dec 2015 17:03:00 +0000 (11:03 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 2 Dec 2015 17:03:00 +0000 (11:03 -0600)
src/mod/applications/mod_conference/conference_member.c

index 16d49e481a8c2bfcd4f202e69e076b1067680a55..36344a815d43928080056497f6d9c04770d07286 100644 (file)
@@ -1629,7 +1629,13 @@ int conference_member_setup_media(conference_member_t *member, conference_obj_t
 
        switch_mutex_lock(member->audio_out_mutex);
 
-       switch_core_session_get_read_impl(member->session, &read_impl);
+       if (!member->orig_read_impl.samples_per_second) {
+               switch_core_session_get_read_impl(member->session, &member->orig_read_impl);
+               member->native_rate = read_impl.samples_per_second;
+       }
+
+       read_impl = member->orig_read_impl;
+
 
        if (switch_core_codec_ready(&member->read_codec)) {
                switch_core_codec_destroy(&member->read_codec);
@@ -1645,9 +1651,6 @@ int conference_member_setup_media(conference_member_t *member, conference_obj_t
                switch_resample_destroy(&member->read_resampler);
        }
 
-       switch_core_session_get_read_impl(member->session, &member->orig_read_impl);
-       member->native_rate = read_impl.samples_per_second;
-
        /* Setup a Signed Linear codec for reading audio. */
        if (switch_core_codec_init(&member->read_codec,
                                                           "L16",