kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Change severity of fread short-read warning

Browse Source 
Many sound files don't have a full frame's worth of data at EOF, so the
warning messages were a bit too noisy. So we demote them to debug
messages.

Change-Id: I6b617467d687658adca39170a81797a11cc766f6
This commit is contained in:
Sean Bright
2017-05-02 12:34:24 -04:00
parent dc948163ca
commit 675e058e77
15 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
formats/format_g719.c
View File

@@ -47,7 +47,7 @@ static struct ast_frame *g719read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_g723.c
View File

@@ -67,7 +67,7 @@ static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_g726.c
View File

@@ -126,7 +126,7 @@ static struct ast_frame *g726_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_g729.c
View File

@@ -53,7 +53,7 @@ static struct ast_frame *g729_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_gsm.c
View File

@@ -59,7 +59,7 @@ static struct ast_frame *gsm_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, GSM_FRAME_SIZE, s->f)) != GSM_FRAME_SIZE) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), GSM_FRAME_SIZE, res);
}

2
formats/format_h263.c
View File

@@ -87,7 +87,7 @@ static struct ast_frame *h263_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_h264.c
View File

@@ -79,7 +79,7 @@ static struct ast_frame *h264_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_ilbc.c
View File

@@ -51,7 +51,7 @@ static struct ast_frame *ilbc_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_pcm.c
View File

@@ -86,7 +86,7 @@ static struct ast_frame *pcm_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_siren14.c
View File

@@ -47,7 +47,7 @@ static struct ast_frame *siren14read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_siren7.c
View File

@@ -47,7 +47,7 @@ static struct ast_frame *siren7read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_sln.c
View File

@@ -41,7 +41,7 @@ static struct ast_frame *generic_read(struct ast_filestream *s, int *whennext, u
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_vox.c
View File

@@ -47,7 +47,7 @@ static struct ast_frame *vox_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_wav.c
View File

@@ -394,7 +394,7 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
if ((res = fread(s->fr.data.ptr, 1, s->fr.datalen, s->f)) != s->fr.datalen) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res);
}

2
formats/format_wav_gsm.c
View File

@@ -424,7 +424,7 @@ static struct ast_frame *wav_read(struct ast_filestream *s, int *whennext)
if ((res = fread(msdata, 1, MSGSM_FRAME_SIZE, s->f)) != MSGSM_FRAME_SIZE) {
if (feof(s->f)) {
if (res) {
ast_log(LOG_WARNING, "Incomplete frame data at end of %s file "
ast_debug(3, "Incomplete frame data at end of %s file "
"(expected %d bytes, read %d)\n",
ast_format_get_name(s->fr.subclass.format), MSGSM_FRAME_SIZE, res);
}