kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

use API call for frame volume adjustment

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-10-28 16:36:10 +00:00
parent a0cb07e467
commit f9a98f7110
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/app_meetme.c
View File

@@ -384,20 +384,6 @@ static void reset_volumes(struct ast_conf_user *user)
ast_channel_setoption(user->chan, AST_OPTION_RXGAIN, &zero_volume, sizeof(zero_volume), 0); ast_channel_setoption(user->chan, AST_OPTION_RXGAIN, &zero_volume, sizeof(zero_volume), 0);
} }
static void adjust_volume(struct ast_frame *f, int vol)
{
int count;
short *fdata = f->data;
for (count = 0; count < (f->datalen / sizeof(*fdata)); count++) {
if (vol > 0) {
fdata[count] *= abs(vol);
} else if (vol < 0) {
fdata[count] /= abs(vol);
}
}
}
static void conf_play(struct ast_channel *chan, struct ast_conference *conf, int sound) static void conf_play(struct ast_channel *chan, struct ast_conference *conf, int sound)
{ {
unsigned char *data; unsigned char *data;
@@ -1239,9 +1225,9 @@ zapretry:
if (!f) if (!f)
break; break;
if ((f->frametype == AST_FRAME_VOICE) && (f->subclass == AST_FORMAT_SLINEAR)) { if ((f->frametype == AST_FRAME_VOICE) && (f->subclass == AST_FORMAT_SLINEAR)) {
if (user->talk.actual) { if (user->talk.actual)
adjust_volume(f, user->talk.actual); ast_frame_adjust_volume(f, user->talk.actual);
}
if (confflags & CONFFLAG_MONITORTALKER) { if (confflags & CONFFLAG_MONITORTALKER) {
int totalsilence; int totalsilence;
if (user->talking == -1) if (user->talking == -1)
@@ -1476,7 +1462,7 @@ zapretry:
fr.data = buf; fr.data = buf;
fr.offset = AST_FRIENDLY_OFFSET; fr.offset = AST_FRIENDLY_OFFSET;
if (user->listen.actual) if (user->listen.actual)
adjust_volume(&fr, user->listen.actual); ast_frame_adjust_volume(&fr, user->listen.actual);
if (ast_write(chan, &fr) < 0) { if (ast_write(chan, &fr) < 0) {
ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno)); ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno));
/* break; */ /* break; */