brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
[14.07/openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0132-V4L2-Correct-JPEG-Q-factor-range.patch
1 From acce3e98b254b042c53a713e1a0ff9332e45cdd4 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dsteve@broadcom.com>
3 Date: Mon, 9 Dec 2013 11:01:53 +0000
4 Subject: [PATCH 132/196] V4L2: Correct JPEG Q-factor range
5
6 Should be 1-100, not 0-100
7
8 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
9 ---
10  drivers/media/platform/bcm2835/controls.c | 6 +++---
11  1 file changed, 3 insertions(+), 3 deletions(-)
12
13 diff --git a/drivers/media/platform/bcm2835/controls.c b/drivers/media/platform/bcm2835/controls.c
14 index 481d1f6..c2e4c64 100644
15 --- a/drivers/media/platform/bcm2835/controls.c
16 +++ b/drivers/media/platform/bcm2835/controls.c
17 @@ -538,7 +538,7 @@ static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev,
18         return 0;
19  }
20  
21 -static int ctrl_set_q_factor(struct bm2835_mmal_dev *dev,
22 +static int ctrl_set_image_encode_output(struct bm2835_mmal_dev *dev,
23                       struct v4l2_ctrl *ctrl,
24                       const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
25  {
26 @@ -683,9 +683,9 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
27         },
28         {
29                 V4L2_CID_JPEG_COMPRESSION_QUALITY, MMAL_CONTROL_TYPE_STD,
30 -               0, 100,
31 +               1, 100,
32                 30, 1, NULL,
33 -               MMAL_PARAMETER_JPEG_Q_FACTOR, &ctrl_set_q_factor
34 +               MMAL_PARAMETER_JPEG_Q_FACTOR, &ctrl_set_image_encode_output
35         },
36  };
37  
38 -- 
39 1.9.1
40