kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-24 05:38:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed GAIN preprocessor definition, removed needsgain from struct wav_desc, removed unnecessary gain code from wav_read() and wav_write()

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60641 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Dwayne M. Hubbard
2007-04-06 22:29:53 +00:00
parent 0f29ce05af
commit 3c635cf6f1
1 changed files with 13 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
formats/format_wav.c
View File

@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
struct wav_desc { /* format-specific parameters */ struct wav_desc { /* format-specific parameters */
int bytes; int bytes;
int needsgain;
int lasttimeout; int lasttimeout;
int maxlen; int maxlen;
struct timeval last; struct timeval last;
@@ -61,9 +60,6 @@ struct wav_desc { /* format-specific parameters */
#define BLOCKSIZE 160 #define BLOCKSIZE 160
#define GAIN 0 /* 2^GAIN is the multiple to increase the volume by. The original value of GAIN was 2, or 4x (12 dB),
* but there were many reports of the clipping of loud signal peaks (issue 5823 for example). */
#if __BYTE_ORDER == __LITTLE_ENDIAN #if __BYTE_ORDER == __LITTLE_ENDIAN
#define htoll(b) (b) #define htoll(b) (b)
#define htols(b) (b) #define htols(b) (b)
@@ -387,21 +383,6 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
tmp[x] = (tmp[x] << 8) | ((tmp[x] & 0xff00) >> 8); tmp[x] = (tmp[x] << 8) | ((tmp[x] & 0xff00) >> 8);
#endif #endif
if (fs->needsgain) {
for (x=0; x < samples; x++) {
if (tmp[x] & ((1 << GAIN) - 1)) {
/* If it has data down low, then it's not something we've artificially increased gain
on, so we don't need to gain adjust it */
fs->needsgain = 0;
break;
}
}
if (fs->needsgain) {
for (x=0; x < samples; x++)
tmp[x] = tmp[x] >> GAIN;
}
}
*whennext = samples; *whennext = samples;
return &s->fr; return &s->fr;
} }
@@ -409,8 +390,9 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
static int wav_write(struct ast_filestream *fs, struct ast_frame *f) static int wav_write(struct ast_filestream *fs, struct ast_frame *f)
{ {
int x; int x;
#if __BYTE_ORDER == __BIG_ENDIAN
short tmp[8000], *tmpi; short tmp[8000], *tmpi;
float tmpf; #endif
struct wav_desc *s = (struct wav_desc *)fs->private; struct wav_desc *s = (struct wav_desc *)fs->private;
int res; int res;
@@ -422,34 +404,24 @@ static int wav_write(struct ast_filestream *fs, struct ast_frame *f)
ast_log(LOG_WARNING, "Asked to write non-SLINEAR frame (%d)!\n", f->subclass); ast_log(LOG_WARNING, "Asked to write non-SLINEAR frame (%d)!\n", f->subclass);
return -1; return -1;
} }
if (!f->datalen)
return -1;
#if __BYTE_ORDER == __BIG_ENDIAN
/* swap and write */
if (f->datalen > sizeof(tmp)) { if (f->datalen > sizeof(tmp)) {
ast_log(LOG_WARNING, "Data length is too long\n"); ast_log(LOG_WARNING, "Data length is too long\n");
return -1; return -1;
} }
if (!f->datalen)
return -1;
#if 0
printf("Data Length: %d\n", f->datalen);
#endif
tmpi = f->data; tmpi = f->data;
/* Volume adjust here to accomodate */ for (x=0; x < f->datalen/2; x++)
for (x=0;x<f->datalen/2;x++) { tmp[x] = (tmpi[x] << 8) | ((tmpi[x] & 0xff00) >> 8);
tmpf = ((float)tmpi[x]) * ((float)(1 << GAIN));
if (tmpf > 32767.0)
tmpf = 32767.0;
if (tmpf < -32768.0)
tmpf = -32768.0;
tmp[x] = tmpf;
tmp[x] &= ~((1 << GAIN) - 1);
#if __BYTE_ORDER == __BIG_ENDIAN
tmp[x] = (tmp[x] << 8) | ((tmp[x] & 0xff00) >> 8);
#endif
}
if ((res = fwrite(tmp, 1, f->datalen, fs->f)) != f->datalen ) { if ((res = fwrite(tmp, 1, f->datalen, fs->f)) != f->datalen ) {
#else
/* just write */
if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen ) {
#endif
ast_log(LOG_WARNING, "Bad write (%d): %s\n", res, strerror(errno)); ast_log(LOG_WARNING, "Bad write (%d): %s\n", res, strerror(errno));
return -1; return -1;
} }