]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
update
authorAnthony Minessale <anthony.minessale@gmail.com>
Thu, 7 Jun 2007 19:59:01 +0000 (19:59 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Thu, 7 Jun 2007 19:59:01 +0000 (19:59 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5284 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/applications/mod_conference/mod_conference.c

index d5e293a21657cc6b069fc2b96fccb5717abacc41..2d16e70c3eaa485bb8b939b32bc65f57f62a7fe6 100644 (file)
@@ -1477,7 +1477,7 @@ static void conference_loop_output(conference_member_t * member)
        switch_timer_t timer = { 0 };
        switch_codec_t *read_codec = switch_core_session_get_read_codec(member->session);
        uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000;
-       //uint32_t csamples = switch_bytes_per_frame(member->conference->rate, member->conference->interval);
+       uint32_t csamples = switch_bytes_per_frame(member->conference->rate, member->conference->interval);
        uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval);
        uint32_t low_count = 0, bytes = samples * 2;
        call_list_t *call_list = NULL, *cp = NULL;
@@ -1549,8 +1549,8 @@ static void conference_loop_output(conference_member_t * member)
                   && switch_channel_ready(channel)) {
                char dtmf[128] = "";
                uint8_t file_frame[CONF_BUFFER_SIZE] = { 0 };
-               switch_size_t file_data_len = samples * 2;
-               switch_size_t file_sample_len = samples;
+               switch_size_t file_data_len = csamples * 2;
+               switch_size_t file_sample_len = csamples;
                char *digit;
                switch_event_t *event;
                caller_control_action_t *caller_action = NULL;