[libav-devel] [PATCH 5/5] lavdev: improve feedback in case of invalid frame rate/size

[Stefano Sabatini]

Show in the error message the invalid string.

While at it also prefer "Could not" over "Couldn't", plain forms are
preferred over contractions (simplify readability, especially for non
English-savvy people).
---
 libavdevice/bktr.c      |    4 ++--
 libavdevice/fbdev.c     |    2 +-
 libavdevice/libdc1394.c |    4 ++--
 libavdevice/v4l2.c      |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c
index ec673cc..f92f284 100644
--- a/libavdevice/bktr.c
+++ b/libavdevice/bktr.c
@@ -268,7 +268,7 @@ static int grab_read_header(AVFormatContext *s1, 
AVFormatParameters *ap)
 #endif
 
     if ((ret = av_parse_video_size(&width, &height, s->video_size)) < 0) {
-        av_log(s1, AV_LOG_ERROR, "Couldn't parse video size.\n");
+        av_log(s1, AV_LOG_ERROR, "Could not parse video size '%s'.\n", 
s->video_size);
         goto out;
     }
 
@@ -283,7 +283,7 @@ static int grab_read_header(AVFormatContext *s1, 
AVFormatParameters *ap)
             goto out;
         }
     if ((ret = av_parse_video_rate(&framerate, s->framerate)) < 0) {
-        av_log(s1, AV_LOG_ERROR, "Couldn't parse framerate.\n");
+        av_log(s1, AV_LOG_ERROR, "Could not parse framerate '%s'.\n", 
s->framerate);
         goto out;
     }
 #if FF_API_FORMAT_PARAMETERS
diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c
index fbf2f2f..09672b4 100644
--- a/libavdevice/fbdev.c
+++ b/libavdevice/fbdev.c
@@ -105,7 +105,7 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx,
     ret = av_parse_video_rate(&fbdev->framerate_q, fbdev->framerate);
     av_freep(&fbdev->framerate);
     if (ret < 0) {
-        av_log(avctx, AV_LOG_ERROR, "Couldn't parse framerate.\n");
+        av_log(avctx, AV_LOG_ERROR, "Could not parse framerate '%s'.\n", 
fbdev->framerate);
         return ret;
     }
 #if FF_API_FORMAT_PARAMETERS
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 2811e3b..4ca1d0a 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -134,11 +134,11 @@ static inline int dc1394_read_common(AVFormatContext *c, 
AVFormatParameters *ap,
     }
 
     if ((ret = av_parse_video_size(&width, &height, dc1394->video_size)) < 0) {
-        av_log(c, AV_LOG_ERROR, "Couldn't parse video size.\n");
+        av_log(c, AV_LOG_ERROR, "Could not parse video size '%s'.\n", 
dc1394->video_size);
         goto out;
     }
     if ((ret = av_parse_video_rate(&framerate, dc1394->framerate)) < 0) {
-        av_log(c, AV_LOG_ERROR, "Couldn't parse framerate.\n");
+        av_log(c, AV_LOG_ERROR, "Could not parse framerate '%s'.\n", 
dc1394->framerate);
         goto out;
     }
 #if FF_API_FORMAT_PARAMETERS
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index bcd879a..50c176d 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -460,7 +460,7 @@ static int v4l2_set_parameters(AVFormatContext *s1, 
AVFormatParameters *ap)
     streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
     if (s->framerate && (ret = av_parse_video_rate(&framerate_q, 
s->framerate)) < 0) {
-        av_log(s1, AV_LOG_ERROR, "Couldn't parse framerate.\n");
+        av_log(s1, AV_LOG_ERROR, "Could not parse framerate '%s'.\n", 
s->framerate);
         return ret;
     }
 #if FF_API_FORMAT_PARAMETERS
@@ -599,7 +599,7 @@ static int v4l2_read_header(AVFormatContext *s1, 
AVFormatParameters *ap)
     av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */
 
     if (s->video_size && (res = av_parse_video_size(&s->width, &s->height, 
s->video_size)) < 0) {
-        av_log(s1, AV_LOG_ERROR, "Couldn't parse video size.\n");
+        av_log(s1, AV_LOG_ERROR, "Could not parse video size '%s'.\n", 
s->video_size);
         goto out;
     }
     if (s->pixel_format && (pix_fmt = av_get_pix_fmt(s->pixel_format)) == 
PIX_FMT_NONE) {
-- 
1.7.2.3

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel