[FFmpeg-devel,2/8] avcodec/v4l2_m2m: disable info logging during device probe

Submitted by Aman Gupta on Aug. 22, 2019, 9:47 p.m.

Details

Message ID 20190822214741.12456-2-ffmpeg@tmm1.net
State Accepted
Commit ac52e06e56fd0232f13c0da74177181e04172e00
Headers show

Commit Message

Aman Gupta Aug. 22, 2019, 9:47 p.m.
From: Aman Gupta <aman@tmm1.net>

Signed-off-by: Aman Gupta <aman@tmm1.net>
---
 libavcodec/v4l2_m2m.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c
index 7d65747df2..be13f68707 100644
--- a/libavcodec/v4l2_m2m.c
+++ b/libavcodec/v4l2_m2m.c
@@ -60,7 +60,7 @@  static inline int v4l2_mplane_video(struct v4l2_capability *cap)
     return 0;
 }
 
-static int v4l2_prepare_contexts(V4L2m2mContext* s)
+static int v4l2_prepare_contexts(V4L2m2mContext* s, int probe)
 {
     struct v4l2_capability cap;
     int ret;
@@ -76,9 +76,10 @@  static int v4l2_prepare_contexts(V4L2m2mContext* s)
     if (ret < 0)
         return ret;
 
-    av_log(s->avctx, AV_LOG_INFO, "driver '%s' on card '%s' in %s mode\n", cap.driver, cap.card,
-                                   v4l2_mplane_video(&cap) ? "mplane" :
-                                   v4l2_splane_video(&cap) ? "splane" : "unknown");
+    av_log(s->avctx, probe ? AV_LOG_DEBUG : AV_LOG_INFO,
+                     "driver '%s' on card '%s' in %s mode\n", cap.driver, cap.card,
+                     v4l2_mplane_video(&cap) ? "mplane" :
+                     v4l2_splane_video(&cap) ? "splane" : "unknown");
 
     if (v4l2_mplane_video(&cap)) {
         s->capture.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
@@ -103,7 +104,7 @@  static int v4l2_probe_driver(V4L2m2mContext* s)
     if (s->fd < 0)
         return AVERROR(errno);
 
-    ret = v4l2_prepare_contexts(s);
+    ret = v4l2_prepare_contexts(s, 1);
     if (ret < 0)
         goto done;
 
@@ -139,7 +140,7 @@  static int v4l2_configure_contexts(V4L2m2mContext* s)
     if (s->fd < 0)
         return AVERROR(errno);
 
-    ret = v4l2_prepare_contexts(s);
+    ret = v4l2_prepare_contexts(s, 0);
     if (ret < 0)
         goto error;