From 526a0081a0f247c6e4ac1908c0e36ef3787c67d0 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Tue, 2 May 2017 12:34:24 -0400 Subject: [PATCH] cleanup: Change severity of fread short-read warning 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 --- formats/format_g719.c | 6 +++--- formats/format_g723.c | 6 +++--- formats/format_g726.c | 6 +++--- formats/format_g729.c | 6 +++--- formats/format_gsm.c | 6 +++--- formats/format_h263.c | 6 +++--- formats/format_h264.c | 6 +++--- formats/format_ilbc.c | 6 +++--- formats/format_pcm.c | 6 +++--- formats/format_siren14.c | 6 +++--- formats/format_siren7.c | 6 +++--- formats/format_sln.c | 6 +++--- formats/format_vox.c | 6 +++--- formats/format_wav.c | 6 +++--- formats/format_wav_gsm.c | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/formats/format_g719.c b/formats/format_g719.c index b93cf0be6d..667858587f 100644 --- a/formats/format_g719.c +++ b/formats/format_g719.c @@ -49,9 +49,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_g723.c b/formats/format_g723.c index 5eed3f5c82..11821246cc 100644 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -69,9 +69,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_g726.c b/formats/format_g726.c index 0455d6dff1..94623f441e 100644 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -128,9 +128,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_g729.c b/formats/format_g729.c index fa122d33bd..04dfbcfdaa 100644 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -55,9 +55,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 07aba9f19a..cfc9452ef2 100644 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -61,9 +61,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), GSM_FRAME_SIZE, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_h263.c b/formats/format_h263.c index 5c23923b75..5d59972dee 100644 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -89,9 +89,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_h264.c b/formats/format_h264.c index 5051fd4509..f8906f4237 100644 --- a/formats/format_h264.c +++ b/formats/format_h264.c @@ -81,9 +81,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index 2d67ab2448..6e06ef335e 100644 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -53,9 +53,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_pcm.c b/formats/format_pcm.c index cc32ca12ff..bd7cf77764 100644 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -88,9 +88,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_siren14.c b/formats/format_siren14.c index b35ebce148..5aaa1f1300 100644 --- a/formats/format_siren14.c +++ b/formats/format_siren14.c @@ -49,9 +49,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_siren7.c b/formats/format_siren7.c index c7856b2a75..87e1372b38 100644 --- a/formats/format_siren7.c +++ b/formats/format_siren7.c @@ -49,9 +49,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_sln.c b/formats/format_sln.c index aa47bde565..2f4cc57ea6 100644 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -43,9 +43,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_vox.c b/formats/format_vox.c index e4d1e378bd..26d4169e1c 100644 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -49,9 +49,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_wav.c b/formats/format_wav.c index 81807c11ad..2903992ab1 100644 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -396,9 +396,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), s->fr.datalen, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index f11b27277d..2f80a9a467 100644 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -426,9 +426,9 @@ 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 " - "(expected %d bytes, read %d)\n", - ast_format_get_name(s->fr.subclass.format), MSGSM_FRAME_SIZE, res); + 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); } } else { ast_log(LOG_ERROR, "Error while reading %s file: %s\n", -- 2.47.2