6918ea2484
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From acce3e98b254b042c53a713e1a0ff9332e45cdd4 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dsteve@broadcom.com>
|
|
Date: Mon, 9 Dec 2013 11:01:53 +0000
|
|
Subject: [PATCH 132/196] V4L2: Correct JPEG Q-factor range
|
|
|
|
Should be 1-100, not 0-100
|
|
|
|
Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
|
|
---
|
|
drivers/media/platform/bcm2835/controls.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/media/platform/bcm2835/controls.c b/drivers/media/platform/bcm2835/controls.c
|
|
index 481d1f6..c2e4c64 100644
|
|
--- a/drivers/media/platform/bcm2835/controls.c
|
|
+++ b/drivers/media/platform/bcm2835/controls.c
|
|
@@ -538,7 +538,7 @@ static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev,
|
|
return 0;
|
|
}
|
|
|
|
-static int ctrl_set_q_factor(struct bm2835_mmal_dev *dev,
|
|
+static int ctrl_set_image_encode_output(struct bm2835_mmal_dev *dev,
|
|
struct v4l2_ctrl *ctrl,
|
|
const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
|
|
{
|
|
@@ -683,9 +683,9 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
|
|
},
|
|
{
|
|
V4L2_CID_JPEG_COMPRESSION_QUALITY, MMAL_CONTROL_TYPE_STD,
|
|
- 0, 100,
|
|
+ 1, 100,
|
|
30, 1, NULL,
|
|
- MMAL_PARAMETER_JPEG_Q_FACTOR, &ctrl_set_q_factor
|
|
+ MMAL_PARAMETER_JPEG_Q_FACTOR, &ctrl_set_image_encode_output
|
|
},
|
|
};
|
|
|
|
--
|
|
1.9.1
|
|
|