diff mbox series

[FFmpeg-devel] avcodec/v4l2_m2m: log both v4l2 and av pixel formats during negotiation

Message ID pull.47.ffstaging.FFmpeg.1673296206887.ffmpegagent@gmail.com
State Accepted
Commit 18d9959fd9ab80340d6f25c5efd0db5aae14284d
Headers show
Series [FFmpeg-devel] avcodec/v4l2_m2m: log both v4l2 and av pixel formats during negotiation | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Aman Karmani Jan. 9, 2023, 8:30 p.m. UTC 
From: Aman Karmani <aman@tmm1.net>

Signed-off-by: Aman Karmani <aman@tmm1.net>
---
    avcodec/v4l2_m2m: log both v4l2 and av pixel formats during negotiation

Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-47%2Ftmm1%2Fv4l2-dbg-v1
Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-47/tmm1/v4l2-dbg-v1
Pull-Request: https://github.com/ffstaging/FFmpeg/pull/47

 libavcodec/v4l2_m2m.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


base-commit: 94aa70d757af6b0e0919250f9def2a819aa00358
diff mbox series

Patch

diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c
index 984936004d..602efb7a16 100644
--- a/libavcodec/v4l2_m2m.c
+++ b/libavcodec/v4l2_m2m.c
@@ -148,13 +148,15 @@  static int v4l2_configure_contexts(V4L2m2mContext *s)
 
     ofmt = s->output.format;
     cfmt = s->capture.format;
-    av_log(log_ctx, AV_LOG_INFO, "requesting formats: output=%s capture=%s\n",
+    av_log(log_ctx, AV_LOG_INFO, "requesting formats: output=%s/%s capture=%s/%s\n",
                                  av_fourcc2str(V4L2_TYPE_IS_MULTIPLANAR(ofmt.type) ?
                                                ofmt.fmt.pix_mp.pixelformat :
                                                ofmt.fmt.pix.pixelformat),
+                                 av_get_pix_fmt_name(s->output.av_pix_fmt) ?: "none",
                                  av_fourcc2str(V4L2_TYPE_IS_MULTIPLANAR(cfmt.type) ?
                                                cfmt.fmt.pix_mp.pixelformat :
-                                               cfmt.fmt.pix.pixelformat));
+                                               cfmt.fmt.pix.pixelformat),
+                                 av_get_pix_fmt_name(s->capture.av_pix_fmt) ?: "none");
 
     ret = ff_v4l2_context_set_format(&s->output);
     if (ret) {