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

forgot a few stupid things, here they are 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1795 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-07-08 19:11:09 +00:00
parent b63a0c80d2
commit 4b4cca9c56
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/applications/mod_conference/mod_conference.c
View File

@ -213,6 +213,7 @@ static uint32_t next_member_id(void)
#define SMAX 32767 #define SMAX 32767
#define SMIN -32768 #define SMIN -32768
#define normalize_to_16bit(n) if (n > SMAX) n = SMAX; else if (n < SMIN) n = SMIN;
static void switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol) static void switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol)
{ {
@ -224,17 +225,14 @@ static void switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vo
if (v > 0) { if (v > 0) {
mult += (.2 * abs(v)); mult += (.2 * abs(v));
mult = 4;
} else { } else {
mult -= 1; mult -= 1;
} }
for (x = 0; x < samples; x++) { for (x = 0; x < samples; x++) {
b = (int32_t)((double)p[x] * mult); b = (int32_t)((double)p[x] * mult);
if (b > SMAX) { normalize_to_16bit(b);
b = SMAX;
} else if (b < SMIN) {
b = SMIN;
}
p[x] = (int16_t) b; p[x] = (int16_t) b;
} }
} }
@ -557,7 +555,9 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
muxed = (int16_t *) omember->mux_frame; muxed = (int16_t *) omember->mux_frame;
for (x = 0; x < imember->read / 2; x++) { for (x = 0; x < imember->read / 2; x++) {
muxed[x] = muxed[x] + bptr[x]; int32_t z = muxed[x] + bptr[x];
normalize_to_16bit(z);
muxed[x] = z;
} }
ready++; ready++;
@ -2424,7 +2424,7 @@ static void *SWITCH_THREAD_FUNC input_thread_run(switch_thread_t *thread, void *
/* Check for input volume adjustments */ /* Check for input volume adjustments */
if (member->volume_in_level) { if (member->volume_in_level) {
switch_change_sln_volume(read_frame->data, read_frame->samples, member->volume_in_level); switch_change_sln_volume(read_frame->data, read_frame->datalen / 2, member->volume_in_level);
} }
/* Write the audio into the input buffer */ /* Write the audio into the input buffer */