summaryrefslogtreecommitdiff
path: root/formats
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-04-19 08:38:41 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-04-19 08:38:41 -0500
commitf9de4b5de971048e1d645d949acdb1dbb64a72ff (patch)
tree9e06c7dd3f15db61772fa41017b1c8804a450121 /formats
parent69bebd8f1a9a210108a9afe891a5b4b406be3029 (diff)
parent9bbfa6fda14de514a9b064262e2be47186b20c0e (diff)
Merge "format_wav: Read 16khz wav samples properly" into 13
Diffstat (limited to 'formats')
-rw-r--r--formats/format_wav.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/formats/format_wav.c b/formats/format_wav.c
index 42a27e41b..90095eb35 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -82,9 +82,8 @@ struct wav_desc { /* format-specific parameters */
static int check_header_fmt(FILE *f, int hsize, int hz)
{
- short format, chans, bysam, bisam;
- int bysec;
- int freq;
+ unsigned short format, chans, bysam, bisam;
+ unsigned int freq, bysec;
if (hsize < 16) {
ast_log(LOG_WARNING, "Unexpected header size %d\n", hsize);
return -1;
@@ -94,7 +93,7 @@ static int check_header_fmt(FILE *f, int hsize, int hz)
return -1;
}
if (ltohs(format) != 1) {
- ast_log(LOG_WARNING, "Not a supported wav file format (%d). Only PCM encoded, 16 bit, mono, 8kHz files are supported with a lowercase '.wav' extension.\n", ltohs(format));
+ ast_log(LOG_WARNING, "Not a supported wav file format (%d). Only PCM encoded, 16 bit, mono, 8kHz/16kHz files are supported with a lowercase '.wav' extension.\n", ltohs(format));
return -1;
}
if (fread(&chans, 1, 2, f) != 2) {
@@ -109,10 +108,9 @@ static int check_header_fmt(FILE *f, int hsize, int hz)
ast_log(LOG_WARNING, "Read failed (freq)\n");
return -1;
}
- if (((ltohl(freq) != 8000) && (ltohl(freq) != 16000)) ||
- ((ltohl(freq) == 8000) && (hz != 8000)) ||
- ((ltohl(freq) == 16000) && (hz != 16000))) {
- ast_log(LOG_WARNING, "Unexpected frequency mismatch %d (expecting %d)\n", ltohl(freq),hz);
+ freq = ltohl(freq);
+ if ((freq != 8000 && freq != 16000) || freq != hz) {
+ ast_log(LOG_WARNING, "Unexpected frequency mismatch %d (expecting %d)\n", freq, hz);
return -1;
}
/* Ignore the byte frequency */
@@ -325,9 +323,15 @@ static int wav_open(struct ast_filestream *s)
/* We don't have any header to read or anything really, but
if we did, it would go here. We also might want to check
and be sure it's a valid file. */
- struct wav_desc *tmp = (struct wav_desc *)s->_private;
- if ((tmp->maxlen = check_header(s->f, ast_format_get_sample_rate(s->fmt->format))) < 0)
+ struct wav_desc *tmp = s->_private;
+ unsigned int sample_rate = ast_format_get_sample_rate(s->fmt->format);
+
+ tmp->maxlen = check_header(s->f, sample_rate);
+ if (tmp->maxlen < 0) {
return -1;
+ }
+
+ tmp->hz = sample_rate;
return 0;
}