target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch

   1 From e583299dcd36a6e23a8479d8597a85b6c9e6cbbb Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dsteve@broadcom.com>
   3 Date: Mon, 9 Dec 2013 17:29:39 +0000
   4 Subject: [PATCH 138/196] V4L2: Fix information advertised through g_vidfmt
   5
   6 Width and height were being stored based on incorrect
   7 values.
   8
   9 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  10 ---
  11  drivers/media/platform/bcm2835/bcm2835-camera.c | 10 ++++++++--
  12  1 file changed, 8 insertions(+), 2 deletions(-)
  13
  14 diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c
  15 index c8d8742..4766a9c 100644
  16 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c
  17 +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
  18 @@ -1028,13 +1028,19 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
  19                 if (!ret) {
  20                         dev->capture.fmt = mfmt;
  21                         dev->capture.stride = f->fmt.pix.bytesperline;
  22 -                       dev->capture.width = port->es.video.crop.width;
  23 -                       dev->capture.height = port->es.video.crop.height;
  24 +                       dev->capture.width = camera_port->es.video.crop.width;
  25 +                       dev->capture.height = camera_port->es.video.crop.height;
  26
  27                         /* select port for capture */
  28                         dev->capture.port = port;
  29                         dev->capture.camera_port = camera_port;
  30                         dev->capture.encode_component = encode_component;
  31 +                       v4l2_dbg(1, bcm2835_v4l2_debug,
  32 +                                &dev->v4l2_dev,
  33 +                               "Set dev->capture.fmt %08X, %dx%d, stride %d",
  34 +                               port->format.encoding,
  35 +                               dev->capture.width, dev->capture.height,
  36 +                               dev->capture.stride);
  37                 }
  38         }
  39
  40 --
  41 1.9.1
  42