git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From 7e2760bbfda0af522fae89ccf789ac7af5d6c296 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Thu, 11 Jul 2019 14:57:09 +0100
   4 Subject: [PATCH 751/782] staging:bcm2835-codec: Expand logging on format
   5  setting
   6
   7 Adds some more useful logging during format changed events and
   8 s_fmt.
   9
  10 Reported by: zillevdr <zillevdr@gmx.de>
  11 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  12 ---
  13  .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c   | 10 +++++++---
  14  1 file changed, 7 insertions(+), 3 deletions(-)
  15
  16 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
  17 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
  18 @@ -753,6 +753,10 @@ static void handle_fmt_changed(struct bc
  19                  format->es.video.color_space);
  20
  21         q_data = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
  22 +       v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Format was %ux%u, crop %ux%u\n",
  23 +                __func__, q_data->bytesperline, q_data->height,
  24 +                q_data->crop_width, q_data->crop_height);
  25 +
  26         q_data->crop_width = format->es.video.crop.width;
  27         q_data->crop_height = format->es.video.crop.height;
  28         q_data->bytesperline = format->es.video.crop.width;
  29 @@ -1110,10 +1114,10 @@ static int vidioc_s_fmt(struct bcm2835_c
  30         bool update_capture_port = false;
  31         int ret;
  32
  33 -       v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "Setting format for type %d, wxh: %dx%d, fmt: %08x, size %u\n",
  34 +       v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "Setting format for type %d, wxh: %dx%d, fmt: " V4L2_FOURCC_CONV ", size %u\n",
  35                  f->type, f->fmt.pix_mp.width, f->fmt.pix_mp.height,
  36 -                f->fmt.pix_mp.pixelformat, f->fmt.pix_mp.plane_fmt[0].sizeimage);
  37 -
  38 +                V4L2_FOURCC_CONV_ARGS(f->fmt.pix_mp.pixelformat),
  39 +                f->fmt.pix_mp.plane_fmt[0].sizeimage);
  40
  41         vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
  42         if (!vq)