projects / openwrt / openwrt.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
ralink: fix when tx done is 0 also need to clean interrupt status
[openwrt/openwrt.git] / target / linux / brcm2708 / patches-3.14 / 0031-V4L2-Fixes-from-6by9.patch
1 From 4365e08f272ba098698196234dbd38ac3dd5a606 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dsteve@broadcom.com>
3 Date: Mon, 9 Dec 2013 10:58:01 +0000
4 Subject: [PATCH 31/54] V4L2: Fixes from 6by9
5
6 V4L2: Fix EV values. Add manual shutter speed control
7
8 V4L2 EV values should be in units of 1/1000. Corrected.
9 Add support for V4L2_CID_EXPOSURE_ABSOLUTE which should
10 give manual shutter control. Requires manual exposure mode
11 to be selected first.
12
13 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
14
15 V4L2: Correct JPEG Q-factor range
16
17 Should be 1-100, not 0-100
18
19 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
20
21 V4L2: Fix issue of driver jamming if STREAMON failed.
22
23 Fix issue where the driver was left in a partially enabled
24 state if STREAMON failed, and would then reject many IOCTLs
25 as it thought it was streaming.
26
27 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
28
29 V4L2: Fix ISO controls.
30
31 Driver was passing the index to the GPU, and not the desired
32 ISO value.
33
34 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
35
36 V4L2: Add flicker avoidance controls
37
38 Add support for V4L2_CID_POWER_LINE_FREQUENCY to set flicker
39 avoidance frequencies.
40
41 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
42
43 V4L2: Add support for frame rate control.
44
45 Add support for frame rate (or time per frame as V4L2
46 inverts it) control via s_parm.
47
48 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
49
50 V4L2: Improve G_FBUF handling so we pass conformance
51
52 Return some sane numbers for get framebuffer so that
53 we pass conformance.
54
55 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
56
57 V4L2: Fix information advertised through g_vidfmt
58
59 Width and height were being stored based on incorrect
60 values.
61
62 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
63
64 V4L2: Add support for inline H264 headers
65
66 Add support for V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER
67 to control H264 inline headers.
68 Requires firmware fix to work correctly, otherwise format
69 has to be set to H264 before this parameter is set.
70
71 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
72
73 V4L2: Fix JPEG timestamp issue
74
75 JPEG images were coming through from the GPU with timestamp
76 of 0. Detect this and give current system time instead
77 of some invalid value.
78
79 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
80
81 V4L2: Fix issue when switching down JPEG resolution.
82
83 JPEG buffer size calculation is based on input resolution.
84 Input resolution was being configured after output port
85 format. Caused failures if switching from one JPEG resolution
86 to a smaller one.
87
88 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
89
90 V4L2: Enable MJPEG encoding
91
92 Requires GPU firmware update to support MJPEG encoder.
93
94 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
95
96 V4L2: Correct flag settings for compressed formats
97
98 Set flags field correctly on enum_fmt_vid_cap for compressed
99 image formats.
100
101 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
102
103 V4L2: H264 profile & level ctrls, FPS control and auto exp pri
104
105 Several control handling updates.
106 H264 profile and level controls.
107 Timeperframe/FPS reworked to add V4L2_CID_EXPOSURE_AUTO_PRIORITY to
108 select whether AE is allowed to override the framerate specified.
109
110 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
111
112 V4L2: Correct BGR24 to RGB24 in format table
113
114 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
115
116 V4L2: Add additional pixel formats. Correct colourspace
117
118 Adds the other flavours of YUYV, and NV12.
119 Corrects the overlay advertised colourspace.
120
121 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
122
123 V4L2: Drop logging msg from info to debug
124
125 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
126
127 V4L2: Initial pass at scene modes.
128
129 Only supports exposure mode and metering modes.
130
131 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
132
133 V4L2: Add manual white balance control.
134
135 Adds support for V4L2_CID_RED_BALANCE and
136 V4L2_CID_BLUE_BALANCE. Only has an effect if
137 V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE has
138 V4L2_WHITE_BALANCE_MANUAL selected.
139
140 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
141
142 config: Enable V4L / MMAL driver
143
144 V4L2: Increase the MMAL timeout to 3sec
145
146 MJPEG codec flush is now taking longer and results
147 in a kernel panic if the driver has stopped waiting for
148 the result when it finally completes.
149 Increase the timeout value from 1 to 3secs.
150
151 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
152
153 V4L2: Add support for setting H264_I_PERIOD
154
155 Adds support for the parameter V4L2_CID_MPEG_VIDEO_H264_I_PERIOD
156 to set the frequency with which I frames are produced.
157
158 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
159
160 V4L2: Enable GPU function for removing padding from images.
161
162 GPU can now support arbitrary strides, although may require
163 additional processing to achieve it. Enable this feature
164 so that the images delivered are the size requested.
165
166 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
167
168 V4L2: Add support for V4L2_PIX_FMT_BGR32
169
170 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
171
172 V4L2: Set the colourspace to avoid odd YUV-RGB conversions
173
174 Removes the amiguity from the conversion routines and stops
175 them dropping back to the SD vs HD choice of coeffs.
176
177 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
178
179 V4L2: Make video/still threshold a run-time param
180
181 Move the define for at what resolution the driver
182 switches from a video mode capture to a stills mode
183 capture to module parameters.
184
185 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
186
187 V4L2: Fix incorrect pool sizing
188
189 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
190
191 V4L2: Add option to disable enum_framesizes.
192
193 Gstreamer's handling of a driver that advertises
194 V4L2_FRMSIZE_TYPE_STEPWISE to define the supported
195 resolutions is broken. See bug
196 https://bugzilla.gnome.org/show_bug.cgi?id=726521
197
198 Optional parameter of gst_v4l2src_is_broken added.
199 If non-zero, the driver claims not to support that
200 ioctl, and gstreamer should be happy again (it
201 guesses a set of defaults for itself).
202
203 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
204
205 V4L2: Add support for more image formats
206
207 Adds YVU420 (YV12), YVU420SP (NV21), and BGR888.
208
209 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
210
211 V4L2: Extend range for V4L2_CID_MPEG_VIDEO_H264_I_PERIOD
212
213 Request to extend the range from the fairly arbitrary
214 1000 frames (33 seconds at 30fps). Extend out to the
215 max range supported (int32 value).
216 Also allow 0, which is handled by the codec as only
217 send an I-frame on the first frame and never again.
218 There may be an exception if it detects a significant
219 scene change, but there's no easy way around that.
220
221 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
222 ---
223 arch/arm/configs/bcmrpi_defconfig | 3 +
224 drivers/media/platform/bcm2835/bcm2835-camera.c | 561 ++++++++++++++----
225 drivers/media/platform/bcm2835/bcm2835-camera.h | 23 +-
226 drivers/media/platform/bcm2835/controls.c | 723 +++++++++++++++++++++--
227 drivers/media/platform/bcm2835/mmal-common.h | 1 +
228 drivers/media/platform/bcm2835/mmal-encodings.h | 34 ++
229 drivers/media/platform/bcm2835/mmal-parameters.h | 121 +++-
230 drivers/media/platform/bcm2835/mmal-vchiq.c | 4 +-
231 8 files changed, 1292 insertions(+), 178 deletions(-)
232
233 --- a/arch/arm/configs/bcmrpi_defconfig
234 +++ b/arch/arm/configs/bcmrpi_defconfig
235 @@ -694,6 +694,9 @@ CONFIG_DVB_B2C2_FLEXCOP_USB=m
236 CONFIG_VIDEO_EM28XX=m
237 CONFIG_VIDEO_EM28XX_ALSA=m
238 CONFIG_VIDEO_EM28XX_DVB=m
239 +CONFIG_V4L_PLATFORM_DRIVERS=y
240 +CONFIG_VIDEO_BCM2835=y
241 +CONFIG_VIDEO_BCM2835_MMAL=m
242 CONFIG_RADIO_SI470X=y
243 CONFIG_USB_SI470X=m
244 CONFIG_I2C_SI470X=m
245 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c
246 +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
247 @@ -36,7 +36,8 @@
248
249 #define BM2835_MMAL_VERSION "0.0.2"
250 #define BM2835_MMAL_MODULE_NAME "bcm2835-v4l2"
251 -
252 +#define MIN_WIDTH 16
253 +#define MIN_HEIGHT 16
254 #define MAX_WIDTH 2592
255 #define MAX_HEIGHT 1944
256 #define MIN_BUFFER_SIZE (80*1024)
257 @@ -53,13 +54,43 @@ int bcm2835_v4l2_debug;
258 module_param_named(debug, bcm2835_v4l2_debug, int, 0644);
259 MODULE_PARM_DESC(bcm2835_v4l2_debug, "Debug level 0-2");
260
261 +int max_video_width = MAX_VIDEO_MODE_WIDTH;
262 +int max_video_height = MAX_VIDEO_MODE_HEIGHT;
263 +module_param(max_video_width, int, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
264 +MODULE_PARM_DESC(max_video_width, "Threshold for video mode");
265 +module_param(max_video_height, int, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
266 +MODULE_PARM_DESC(max_video_height, "Threshold for video mode");
267 +
268 +/* Gstreamer bug https://bugzilla.gnome.org/show_bug.cgi?id=726521
269 + * v4l2src does bad (and actually wrong) things when the vidioc_enum_framesizes
270 + * function says type V4L2_FRMSIZE_TYPE_STEPWISE, which we do by default.
271 + * It's happier if we just don't say anything at all, when it then
272 + * sets up a load of defaults that it thinks might work.
273 + * If gst_v4l2src_is_broken is non-zero, then we remove the function from
274 + * our function table list (actually switch to an alternate set, but same
275 + * result).
276 + */
277 +int gst_v4l2src_is_broken = 0;
278 +module_param(gst_v4l2src_is_broken, int, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
279 +MODULE_PARM_DESC(gst_v4l2src_is_broken, "If non-zero, enable workaround for Gstreamer");
280 +
281 static struct bm2835_mmal_dev *gdev; /* global device data */
282
283 +#define FPS_MIN 1
284 +#define FPS_MAX 90
285 +
286 +/* timeperframe: min/max and default */
287 +static const struct v4l2_fract
288 + tpf_min = {.numerator = 1, .denominator = FPS_MAX},
289 + tpf_max = {.numerator = 1, .denominator = FPS_MIN},
290 + tpf_default = {.numerator = 1000, .denominator = 30000};
291 +
292 /* video formats */
293 static struct mmal_fmt formats[] = {
294 {
295 .name = "4:2:0, packed YUV",
296 .fourcc = V4L2_PIX_FMT_YUV420,
297 + .flags = 0,
298 .mmal = MMAL_ENCODING_I420,
299 .depth = 12,
300 .mmal_component = MMAL_COMPONENT_CAMERA,
301 @@ -67,13 +98,15 @@ static struct mmal_fmt formats[] = {
302 {
303 .name = "4:2:2, packed, YUYV",
304 .fourcc = V4L2_PIX_FMT_YUYV,
305 + .flags = 0,
306 .mmal = MMAL_ENCODING_YUYV,
307 .depth = 16,
308 .mmal_component = MMAL_COMPONENT_CAMERA,
309 },
310 {
311 - .name = "RGB24 (BE)",
312 - .fourcc = V4L2_PIX_FMT_BGR24,
313 + .name = "RGB24 (LE)",
314 + .fourcc = V4L2_PIX_FMT_RGB24,
315 + .flags = 0,
316 .mmal = MMAL_ENCODING_BGR24,
317 .depth = 24,
318 .mmal_component = MMAL_COMPONENT_CAMERA,
319 @@ -81,6 +114,7 @@ static struct mmal_fmt formats[] = {
320 {
321 .name = "JPEG",
322 .fourcc = V4L2_PIX_FMT_JPEG,
323 + .flags = V4L2_FMT_FLAG_COMPRESSED,
324 .mmal = MMAL_ENCODING_JPEG,
325 .depth = 8,
326 .mmal_component = MMAL_COMPONENT_IMAGE_ENCODE,
327 @@ -88,10 +122,83 @@ static struct mmal_fmt formats[] = {
328 {
329 .name = "H264",
330 .fourcc = V4L2_PIX_FMT_H264,
331 + .flags = V4L2_FMT_FLAG_COMPRESSED,
332 .mmal = MMAL_ENCODING_H264,
333 .depth = 8,
334 .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
335 - }
336 + },
337 + {
338 + .name = "MJPEG",
339 + .fourcc = V4L2_PIX_FMT_MJPEG,
340 + .flags = V4L2_FMT_FLAG_COMPRESSED,
341 + .mmal = MMAL_ENCODING_MJPEG,
342 + .depth = 8,
343 + .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
344 + },
345 + {
346 + .name = "4:2:2, packed, YVYU",
347 + .fourcc = V4L2_PIX_FMT_YVYU,
348 + .flags = 0,
349 + .mmal = MMAL_ENCODING_YVYU,
350 + .depth = 16,
351 + .mmal_component = MMAL_COMPONENT_CAMERA,
352 + },
353 + {
354 + .name = "4:2:2, packed, VYUY",
355 + .fourcc = V4L2_PIX_FMT_VYUY,
356 + .flags = 0,
357 + .mmal = MMAL_ENCODING_VYUY,
358 + .depth = 16,
359 + .mmal_component = MMAL_COMPONENT_CAMERA,
360 + },
361 + {
362 + .name = "4:2:2, packed, UYVY",
363 + .fourcc = V4L2_PIX_FMT_UYVY,
364 + .flags = 0,
365 + .mmal = MMAL_ENCODING_UYVY,
366 + .depth = 16,
367 + .mmal_component = MMAL_COMPONENT_CAMERA,
368 + },
369 + {
370 + .name = "4:2:0, packed, NV12",
371 + .fourcc = V4L2_PIX_FMT_NV12,
372 + .flags = 0,
373 + .mmal = MMAL_ENCODING_NV12,
374 + .depth = 12,
375 + .mmal_component = MMAL_COMPONENT_CAMERA,
376 + },
377 + {
378 + .name = "RGB24 (BE)",
379 + .fourcc = V4L2_PIX_FMT_BGR24,
380 + .flags = 0,
381 + .mmal = MMAL_ENCODING_RGB24,
382 + .depth = 24,
383 + .mmal_component = MMAL_COMPONENT_CAMERA,
384 + },
385 + {
386 + .name = "4:2:0, packed YVU",
387 + .fourcc = V4L2_PIX_FMT_YVU420,
388 + .flags = 0,
389 + .mmal = MMAL_ENCODING_YV12,
390 + .depth = 12,
391 + .mmal_component = MMAL_COMPONENT_CAMERA,
392 + },
393 + {
394 + .name = "4:2:0, packed, NV21",
395 + .fourcc = V4L2_PIX_FMT_NV21,
396 + .flags = 0,
397 + .mmal = MMAL_ENCODING_NV21,
398 + .depth = 12,
399 + .mmal_component = MMAL_COMPONENT_CAMERA,
400 + },
401 + {
402 + .name = "RGB32 (BE)",
403 + .fourcc = V4L2_PIX_FMT_BGR32,
404 + .flags = 0,
405 + .mmal = MMAL_ENCODING_BGRA,
406 + .depth = 32,
407 + .mmal_component = MMAL_COMPONENT_CAMERA,
408 + },
409 };
410
411 static struct mmal_fmt *get_format(struct v4l2_format *f)
412 @@ -229,7 +336,8 @@ static void buffer_cb(struct vchiq_mmal_
413 }
414 } else {
415 if (dev->capture.frame_count) {
416 - if (dev->capture.vc_start_timestamp != -1) {
417 + if (dev->capture.vc_start_timestamp != -1 &&
418 + pts != 0) {
419 s64 runtime_us = pts -
420 dev->capture.vc_start_timestamp;
421 u32 div = 0;
422 @@ -250,7 +358,7 @@ static void buffer_cb(struct vchiq_mmal_
423 USEC_PER_SEC;
424 }
425 v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
426 - "Convert start time %d.%06d and %llu"
427 + "Convert start time %d.%06d and %llu "
428 "with offset %llu to %d.%06d\n",
429 (int)dev->capture.kernel_start_ts.
430 tv_sec,
431 @@ -425,7 +533,15 @@ static int start_streaming(struct vb2_qu
432 vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
433 if (ret) {
434 v4l2_err(&dev->v4l2_dev,
435 - "Failed to enable capture port - error %d\n", ret);
436 + "Failed to enable capture port - error %d. "
437 + "Disabling camera port again\n", ret);
438 +
439 + vchiq_mmal_port_disable(dev->instance,
440 + dev->capture.camera_port);
441 + if (disable_camera(dev) < 0) {
442 + v4l2_err(&dev->v4l2_dev, "Failed to disable camera");
443 + return -EINVAL;
444 + }
445 return -1;
446 }
447
448 @@ -530,6 +646,7 @@ static int vidioc_enum_fmt_vid_overlay(s
449
450 strlcpy(f->description, fmt->name, sizeof(f->description));
451 f->pixelformat = fmt->fourcc;
452 + f->flags = fmt->flags;
453
454 return 0;
455 }
456 @@ -647,10 +764,18 @@ static int vidioc_g_fbuf(struct file *fi
457 {
458 /* The video overlay must stay within the framebuffer and can't be
459 positioned independently. */
460 + struct bm2835_mmal_dev *dev = video_drvdata(file);
461 + struct vchiq_mmal_port *preview_port =
462 + &dev->component[MMAL_COMPONENT_CAMERA]->
463 + output[MMAL_CAMERA_PORT_PREVIEW];
464 a->flags = V4L2_FBUF_FLAG_OVERLAY;
465 -
466 - /* todo: v4l2_framebuffer still needs more info filling in
467 - * in order to pass the v4l2-compliance test. */
468 + a->fmt.width = preview_port->es.video.width;
469 + a->fmt.height = preview_port->es.video.height;
470 + a->fmt.pixelformat = V4L2_PIX_FMT_YUV420;
471 + a->fmt.bytesperline = (preview_port->es.video.width * 3)>>1;
472 + a->fmt.sizeimage = (preview_port->es.video.width *
473 + preview_port->es.video.height * 3)>>1;
474 + a->fmt.colorspace = V4L2_COLORSPACE_JPEG;
475
476 return 0;
477 }
478 @@ -717,6 +842,8 @@ static int vidioc_enum_fmt_vid_cap(struc
479
480 strlcpy(f->description, fmt->name, sizeof(f->description));
481 f->pixelformat = fmt->fourcc;
482 + f->flags = fmt->flags;
483 +
484 return 0;
485 }
486
487 @@ -729,20 +856,13 @@ static int vidioc_g_fmt_vid_cap(struct f
488 f->fmt.pix.height = dev->capture.height;
489 f->fmt.pix.field = V4L2_FIELD_NONE;
490 f->fmt.pix.pixelformat = dev->capture.fmt->fourcc;
491 - f->fmt.pix.bytesperline =
492 - (f->fmt.pix.width * dev->capture.fmt->depth) >> 3;
493 - f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
494 - if (dev->capture.fmt->fourcc == V4L2_PIX_FMT_JPEG
495 - && f->fmt.pix.sizeimage < (100 << 10)) {
496 - /* Need a minimum size for JPEG to account for EXIF. */
497 - f->fmt.pix.sizeimage = (100 << 10);
498 - }
499 + f->fmt.pix.bytesperline = dev->capture.stride;
500 + f->fmt.pix.sizeimage = dev->capture.buffersize;
501
502 - if (dev->capture.fmt->fourcc == V4L2_PIX_FMT_YUYV ||
503 - dev->capture.fmt->fourcc == V4L2_PIX_FMT_UYVY)
504 - f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
505 - else
506 + if (dev->capture.fmt->fourcc == V4L2_PIX_FMT_RGB24)
507 f->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
508 + else
509 + f->fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
510 f->fmt.pix.priv = 0;
511
512 v4l2_dump_pix_format(1, bcm2835_v4l2_debug, &dev->v4l2_dev, &f->fmt.pix,
513 @@ -766,21 +886,35 @@ static int vidioc_try_fmt_vid_cap(struct
514 }
515
516 f->fmt.pix.field = V4L2_FIELD_NONE;
517 - /* image must be a multiple of 32 pixels wide and 16 lines high */
518 - v4l_bound_align_image(&f->fmt.pix.width, 48, MAX_WIDTH, 5,
519 - &f->fmt.pix.height, 32, MAX_HEIGHT, 4, 0);
520 - f->fmt.pix.bytesperline = (f->fmt.pix.width * mfmt->depth) >> 3;
521 - f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
522 - if (f->fmt.pix.sizeimage < MIN_BUFFER_SIZE)
523 +
524 + v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
525 + "Clipping/aligning %dx%d format %08X\n",
526 + f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.pixelformat);
527 +
528 + v4l_bound_align_image(&f->fmt.pix.width, MIN_WIDTH, MAX_WIDTH, 1,
529 + &f->fmt.pix.height, MIN_HEIGHT, MAX_HEIGHT, 1, 0);
530 + f->fmt.pix.bytesperline = (f->fmt.pix.width * mfmt->depth)>>3;
531 +
532 + /* Image buffer has to be padded to allow for alignment, even though
533 + * we then remove that padding before delivering the buffer.
534 + */
535 + f->fmt.pix.sizeimage = ((f->fmt.pix.height+15)&~15) *
536 + (((f->fmt.pix.width+31)&~31) * mfmt->depth) >> 3;
537 +
538 + if ((mfmt->flags & V4L2_FMT_FLAG_COMPRESSED) &&
539 + f->fmt.pix.sizeimage < MIN_BUFFER_SIZE)
540 f->fmt.pix.sizeimage = MIN_BUFFER_SIZE;
541
542 - if (mfmt->fourcc == V4L2_PIX_FMT_YUYV ||
543 - mfmt->fourcc == V4L2_PIX_FMT_UYVY)
544 - f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
545 - else
546 + if (dev->capture.fmt->fourcc == V4L2_PIX_FMT_RGB24)
547 f->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
548 + else
549 + f->fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
550 f->fmt.pix.priv = 0;
551
552 + v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
553 + "Now %dx%d format %08X\n",
554 + f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.pixelformat);
555 +
556 v4l2_dump_pix_format(1, bcm2835_v4l2_debug, &dev->v4l2_dev, &f->fmt.pix,
557 __func__);
558 return 0;
559 @@ -818,8 +952,8 @@ static int mmal_setup_components(struct
560 switch (mfmt->mmal_component) {
561 case MMAL_COMPONENT_CAMERA:
562 /* Make a further decision on port based on resolution */
563 - if (f->fmt.pix.width <= MAX_VIDEO_MODE_WIDTH
564 - && f->fmt.pix.height <= MAX_VIDEO_MODE_HEIGHT)
565 + if (f->fmt.pix.width <= max_video_width
566 + && f->fmt.pix.height <= max_video_height)
567 camera_port = port =
568 &dev->component[MMAL_COMPONENT_CAMERA]->
569 output[MMAL_CAMERA_PORT_VIDEO];
570 @@ -861,8 +995,9 @@ static int mmal_setup_components(struct
571 camera_port->es.video.crop.y = 0;
572 camera_port->es.video.crop.width = f->fmt.pix.width;
573 camera_port->es.video.crop.height = f->fmt.pix.height;
574 - camera_port->es.video.frame_rate.num = 30;
575 + camera_port->es.video.frame_rate.num = 0;
576 camera_port->es.video.frame_rate.den = 1;
577 + camera_port->es.video.color_space = MMAL_COLOR_SPACE_JPEG_JFIF;
578
579 ret = vchiq_mmal_port_set_format(dev->instance, camera_port);
580
581 @@ -896,8 +1031,10 @@ static int mmal_setup_components(struct
582 preview_port->es.video.crop.y = 0;
583 preview_port->es.video.crop.width = f->fmt.pix.width;
584 preview_port->es.video.crop.height = f->fmt.pix.height;
585 - preview_port->es.video.frame_rate.num = 30;
586 - preview_port->es.video.frame_rate.den = 1;
587 + preview_port->es.video.frame_rate.num =
588 + dev->capture.timeperframe.denominator;
589 + preview_port->es.video.frame_rate.den =
590 + dev->capture.timeperframe.numerator;
591 ret = vchiq_mmal_port_set_format(dev->instance, preview_port);
592 if (overlay_enabled) {
593 ret = vchiq_mmal_port_connect_tunnel(
594 @@ -913,7 +1050,9 @@ static int mmal_setup_components(struct
595
596 if (ret) {
597 v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
598 - "%s failed to set format\n", __func__);
599 + "%s failed to set format %dx%d %08X\n", __func__,
600 + f->fmt.pix.width, f->fmt.pix.height,
601 + f->fmt.pix.pixelformat);
602 /* ensure capture is not going to be tried */
603 dev->capture.port = NULL;
604 } else {
605 @@ -927,69 +1066,91 @@ static int mmal_setup_components(struct
606 camera_port->current_buffer.num =
607 camera_port->recommended_buffer.num;
608
609 - port->format.encoding = mfmt->mmal;
610 - port->format.encoding_variant = 0;
611 - /* Set any encoding specific parameters */
612 - switch (mfmt->mmal_component) {
613 - case MMAL_COMPONENT_VIDEO_ENCODE:
614 - port->format.bitrate =
615 - dev->capture.encode_bitrate;
616 - break;
617 - case MMAL_COMPONENT_IMAGE_ENCODE:
618 - /* Could set EXIF parameters here */
619 - break;
620 - default:
621 - break;
622 - }
623 - ret = vchiq_mmal_port_set_format(dev->instance, port);
624 -
625 + ret =
626 + vchiq_mmal_port_connect_tunnel(
627 + dev->instance,
628 + camera_port,
629 + &encode_component->input[0]);
630 if (ret) {
631 - v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
632 - "%s failed to set format\n", __func__);
633 + v4l2_dbg(1, bcm2835_v4l2_debug,
634 + &dev->v4l2_dev,
635 + "%s failed to create connection\n",
636 + __func__);
637 + /* ensure capture is not going to be tried */
638 + dev->capture.port = NULL;
639 } else {
640 + port->es.video.width = f->fmt.pix.width;
641 + port->es.video.height = f->fmt.pix.height;
642 + port->es.video.crop.x = 0;
643 + port->es.video.crop.y = 0;
644 + port->es.video.crop.width = f->fmt.pix.width;
645 + port->es.video.crop.height = f->fmt.pix.height;
646 + port->es.video.frame_rate.num =
647 + dev->capture.timeperframe.denominator;
648 + port->es.video.frame_rate.den =
649 + dev->capture.timeperframe.numerator;
650 +
651 + port->format.encoding = mfmt->mmal;
652 + port->format.encoding_variant = 0;
653 + /* Set any encoding specific parameters */
654 + switch (mfmt->mmal_component) {
655 + case MMAL_COMPONENT_VIDEO_ENCODE:
656 + port->format.bitrate =
657 + dev->capture.encode_bitrate;
658 + break;
659 + case MMAL_COMPONENT_IMAGE_ENCODE:
660 + /* Could set EXIF parameters here */
661 + break;
662 + default:
663 + break;
664 + }
665 + ret = vchiq_mmal_port_set_format(dev->instance,
666 + port);
667 + if (ret)
668 + v4l2_dbg(1, bcm2835_v4l2_debug,
669 + &dev->v4l2_dev,
670 + "%s failed to set format %dx%d fmt %08X\n",
671 + __func__,
672 + f->fmt.pix.width,
673 + f->fmt.pix.height,
674 + f->fmt.pix.pixelformat
675 + );
676 + }
677 +
678 + if (!ret) {
679 ret = vchiq_mmal_component_enable(
680 dev->instance,
681 encode_component);
682 if (ret) {
683 v4l2_dbg(1, bcm2835_v4l2_debug,
684 - &dev->v4l2_dev,
685 - "%s Failed to enable encode components\n",
686 - __func__);
687 - } else {
688 - /* configure buffering */
689 - port->current_buffer.num = 1;
690 - port->current_buffer.size =
691 - f->fmt.pix.sizeimage;
692 - if (port->format.encoding ==
693 - MMAL_ENCODING_JPEG) {
694 - v4l2_dbg(1, bcm2835_v4l2_debug,
695 - &dev->v4l2_dev,
696 - "JPEG - fiddle buffer size\n");
697 - port->current_buffer.size =
698 - (f->fmt.pix.sizeimage <
699 - (100 << 10))
700 - ? (100 << 10) : f->fmt.pix.
701 - sizeimage;
702 - }
703 + &dev->v4l2_dev,
704 + "%s Failed to enable encode components\n",
705 + __func__);
706 + }
707 + }
708 + if (!ret) {
709 + /* configure buffering */
710 + port->current_buffer.num = 1;
711 + port->current_buffer.size =
712 + f->fmt.pix.sizeimage;
713 + if (port->format.encoding ==
714 + MMAL_ENCODING_JPEG) {
715 v4l2_dbg(1, bcm2835_v4l2_debug,
716 - &dev->v4l2_dev,
717 - "vid_cap - current_buffer.size being set to %d\n",
718 - f->fmt.pix.sizeimage);
719 - port->current_buffer.alignment = 0;
720 - ret =
721 - vchiq_mmal_port_connect_tunnel(
722 - dev->instance,
723 - camera_port,
724 - &encode_component->input[0]);
725 - if (ret) {
726 - v4l2_dbg(1, bcm2835_v4l2_debug,
727 - &dev->v4l2_dev,
728 - "%s failed to create connection\n",
729 - __func__);
730 - /* ensure capture is not going to be tried */
731 - dev->capture.port = NULL;
732 - }
733 + &dev->v4l2_dev,
734 + "JPG - buf size now %d was %d\n",
735 + f->fmt.pix.sizeimage,
736 + port->current_buffer.size);
737 + port->current_buffer.size =
738 + (f->fmt.pix.sizeimage <
739 + (100 << 10))
740 + ? (100 << 10) : f->fmt.pix.
741 + sizeimage;
742 }
743 + v4l2_dbg(1, bcm2835_v4l2_debug,
744 + &dev->v4l2_dev,
745 + "vid_cap - cur_buf.size set to %d\n",
746 + f->fmt.pix.sizeimage);
747 + port->current_buffer.alignment = 0;
748 }
749 } else {
750 /* configure buffering */
751 @@ -1001,13 +1162,20 @@ static int mmal_setup_components(struct
752 if (!ret) {
753 dev->capture.fmt = mfmt;
754 dev->capture.stride = f->fmt.pix.bytesperline;
755 - dev->capture.width = port->es.video.crop.width;
756 - dev->capture.height = port->es.video.crop.height;
757 + dev->capture.width = camera_port->es.video.crop.width;
758 + dev->capture.height = camera_port->es.video.crop.height;
759 + dev->capture.buffersize = port->current_buffer.size;
760
761 /* select port for capture */
762 dev->capture.port = port;
763 dev->capture.camera_port = camera_port;
764 dev->capture.encode_component = encode_component;
765 + v4l2_dbg(1, bcm2835_v4l2_debug,
766 + &dev->v4l2_dev,
767 + "Set dev->capture.fmt %08X, %dx%d, stride %d, size %d",
768 + port->format.encoding,
769 + dev->capture.width, dev->capture.height,
770 + dev->capture.stride, dev->capture.buffersize);
771 }
772 }
773
774 @@ -1048,14 +1216,115 @@ static int vidioc_s_fmt_vid_cap(struct f
775 }
776
777 ret = mmal_setup_components(dev, f);
778 - if (ret != 0)
779 + if (ret != 0) {
780 v4l2_err(&dev->v4l2_dev,
781 "%s: failed to setup mmal components: %d\n",
782 __func__, ret);
783 + ret = -EINVAL;
784 + }
785
786 return ret;
787 }
788
789 +int vidioc_enum_framesizes(struct file *file, void *fh,
790 + struct v4l2_frmsizeenum *fsize)
791 +{
792 + static const struct v4l2_frmsize_stepwise sizes = {
793 + MIN_WIDTH, MAX_WIDTH, 2,
794 + MIN_HEIGHT, MAX_HEIGHT, 2
795 + };
796 + int i;
797 +
798 + if (fsize->index)
799 + return -EINVAL;
800 + for (i = 0; i < ARRAY_SIZE(formats); i++)
801 + if (formats[i].fourcc == fsize->pixel_format)
802 + break;
803 + if (i == ARRAY_SIZE(formats))
804 + return -EINVAL;
805 + fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
806 + fsize->stepwise = sizes;
807 + return 0;
808 +}
809 +
810 +/* timeperframe is arbitrary and continous */
811 +static int vidioc_enum_frameintervals(struct file *file, void *priv,
812 + struct v4l2_frmivalenum *fival)
813 +{
814 + int i;
815 +
816 + if (fival->index)
817 + return -EINVAL;
818 +
819 + for (i = 0; i < ARRAY_SIZE(formats); i++)
820 + if (formats[i].fourcc == fival->pixel_format)
821 + break;
822 + if (i == ARRAY_SIZE(formats))
823 + return -EINVAL;
824 +
825 + /* regarding width & height - we support any within range */
826 + if (fival->width < MIN_WIDTH || fival->width > MAX_WIDTH ||
827 + fival->height < MIN_HEIGHT || fival->height > MAX_HEIGHT)
828 + return -EINVAL;
829 +
830 + fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS;
831 +
832 + /* fill in stepwise (step=1.0 is requred by V4L2 spec) */
833 + fival->stepwise.min = tpf_min;
834 + fival->stepwise.max = tpf_max;
835 + fival->stepwise.step = (struct v4l2_fract) {1, 1};
836 +
837 + return 0;
838 +}
839 +
840 +static int vidioc_g_parm(struct file *file, void *priv,
841 + struct v4l2_streamparm *parm)
842 +{
843 + struct bm2835_mmal_dev *dev = video_drvdata(file);
844 +
845 + if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
846 + return -EINVAL;
847 +
848 + parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
849 + parm->parm.capture.timeperframe = dev->capture.timeperframe;
850 + parm->parm.capture.readbuffers = 1;
851 + return 0;
852 +}
853 +
854 +#define FRACT_CMP(a, OP, b) \
855 + ((u64)(a).numerator * (b).denominator OP \
856 + (u64)(b).numerator * (a).denominator)
857 +
858 +static int vidioc_s_parm(struct file *file, void *priv,
859 + struct v4l2_streamparm *parm)
860 +{
861 + struct bm2835_mmal_dev *dev = video_drvdata(file);
862 + struct v4l2_fract tpf;
863 + struct mmal_parameter_rational fps_param;
864 +
865 + if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
866 + return -EINVAL;
867 +
868 + tpf = parm->parm.capture.timeperframe;
869 +
870 + /* tpf: {*, 0} resets timing; clip to [min, max]*/
871 + tpf = tpf.denominator ? tpf : tpf_default;
872 + tpf = FRACT_CMP(tpf, <, tpf_min) ? tpf_min : tpf;
873 + tpf = FRACT_CMP(tpf, >, tpf_max) ? tpf_max : tpf;
874 +
875 + dev->capture.timeperframe = tpf;
876 + parm->parm.capture.timeperframe = tpf;
877 + parm->parm.capture.readbuffers = 1;
878 +
879 + fps_param.num = 0; /* Select variable fps, and then use
880 + * FPS_RANGE to select the actual limits.
881 + */
882 + fps_param.den = 1;
883 + set_framerate_params(dev);
884 +
885 + return 0;
886 +}
887 +
888 static const struct v4l2_ioctl_ops camera0_ioctl_ops = {
889 /* overlay */
890 .vidioc_enum_fmt_vid_overlay = vidioc_enum_fmt_vid_overlay,
891 @@ -1084,6 +1353,51 @@ static const struct v4l2_ioctl_ops camer
892 .vidioc_querybuf = vb2_ioctl_querybuf,
893 .vidioc_qbuf = vb2_ioctl_qbuf,
894 .vidioc_dqbuf = vb2_ioctl_dqbuf,
895 + .vidioc_enum_framesizes = vidioc_enum_framesizes,
896 + .vidioc_enum_frameintervals = vidioc_enum_frameintervals,
897 + .vidioc_g_parm = vidioc_g_parm,
898 + .vidioc_s_parm = vidioc_s_parm,
899 + .vidioc_streamon = vb2_ioctl_streamon,
900 + .vidioc_streamoff = vb2_ioctl_streamoff,
901 +
902 + .vidioc_log_status = v4l2_ctrl_log_status,
903 + .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
904 + .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
905 +};
906 +
907 +static const struct v4l2_ioctl_ops camera0_ioctl_ops_gstreamer = {
908 + /* overlay */
909 + .vidioc_enum_fmt_vid_overlay = vidioc_enum_fmt_vid_overlay,
910 + .vidioc_g_fmt_vid_overlay = vidioc_g_fmt_vid_overlay,
911 + .vidioc_try_fmt_vid_overlay = vidioc_try_fmt_vid_overlay,
912 + .vidioc_s_fmt_vid_overlay = vidioc_s_fmt_vid_overlay,
913 + .vidioc_overlay = vidioc_overlay,
914 + .vidioc_g_fbuf = vidioc_g_fbuf,
915 +
916 + /* inputs */
917 + .vidioc_enum_input = vidioc_enum_input,
918 + .vidioc_g_input = vidioc_g_input,
919 + .vidioc_s_input = vidioc_s_input,
920 +
921 + /* capture */
922 + .vidioc_querycap = vidioc_querycap,
923 + .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
924 + .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap,
925 + .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
926 + .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
927 +
928 + /* buffer management */
929 + .vidioc_reqbufs = vb2_ioctl_reqbufs,
930 + .vidioc_create_bufs = vb2_ioctl_create_bufs,
931 + .vidioc_prepare_buf = vb2_ioctl_prepare_buf,
932 + .vidioc_querybuf = vb2_ioctl_querybuf,
933 + .vidioc_qbuf = vb2_ioctl_qbuf,
934 + .vidioc_dqbuf = vb2_ioctl_dqbuf,
935 + /* Remove this function ptr to fix gstreamer bug
936 + .vidioc_enum_framesizes = vidioc_enum_framesizes, */
937 + .vidioc_enum_frameintervals = vidioc_enum_frameintervals,
938 + .vidioc_g_parm = vidioc_g_parm,
939 + .vidioc_s_parm = vidioc_s_parm,
940 .vidioc_streamon = vb2_ioctl_streamon,
941 .vidioc_streamoff = vb2_ioctl_streamoff,
942
943 @@ -1122,8 +1436,10 @@ static int set_camera_parameters(struct
944 .max_stills_h = MAX_HEIGHT,
945 .stills_yuv422 = 1,
946 .one_shot_stills = 1,
947 - .max_preview_video_w = 1920,
948 - .max_preview_video_h = 1088,
949 + .max_preview_video_w = (max_video_width > 1920) ?
950 + max_video_width : 1920,
951 + .max_preview_video_h = (max_video_height > 1088) ?
952 + max_video_height : 1088,
953 .num_preview_video_frames = 3,
954 .stills_capture_circular_buffer_height = 0,
955 .fast_preview_resume = 0,
956 @@ -1141,6 +1457,7 @@ static int __init mmal_init(struct bm283
957 {
958 int ret;
959 struct mmal_es_format *format;
960 + u32 bool_true = 1;
961
962 ret = vchiq_mmal_init(&dev->instance);
963 if (ret < 0)
964 @@ -1176,8 +1493,8 @@ static int __init mmal_init(struct bm283
965 format->es->video.crop.y = 0;
966 format->es->video.crop.width = 1024;
967 format->es->video.crop.height = 768;
968 - format->es->video.frame_rate.num = PREVIEW_FRAME_RATE_NUM;
969 - format->es->video.frame_rate.den = PREVIEW_FRAME_RATE_DEN;
970 + format->es->video.frame_rate.num = 0; /* Rely on fps_range */
971 + format->es->video.frame_rate.den = 1;
972
973 format =
974 &dev->component[MMAL_COMPONENT_CAMERA]->
975 @@ -1192,8 +1509,14 @@ static int __init mmal_init(struct bm283
976 format->es->video.crop.y = 0;
977 format->es->video.crop.width = 1024;
978 format->es->video.crop.height = 768;
979 - format->es->video.frame_rate.num = PREVIEW_FRAME_RATE_NUM;
980 - format->es->video.frame_rate.den = PREVIEW_FRAME_RATE_DEN;
981 + format->es->video.frame_rate.num = 0; /* Rely on fps_range */
982 + format->es->video.frame_rate.den = 1;
983 +
984 + vchiq_mmal_port_parameter_set(dev->instance,
985 + &dev->component[MMAL_COMPONENT_CAMERA]->
986 + output[MMAL_CAMERA_PORT_VIDEO],
987 + MMAL_PARAMETER_NO_IMAGE_PADDING,
988 + &bool_true, sizeof(bool_true));
989
990 format =
991 &dev->component[MMAL_COMPONENT_CAMERA]->
992 @@ -1207,13 +1530,22 @@ static int __init mmal_init(struct bm283
993 format->es->video.crop.y = 0;
994 format->es->video.crop.width = 2592;
995 format->es->video.crop.height = 1944;
996 - format->es->video.frame_rate.num = 30;
997 + format->es->video.frame_rate.num = 0; /* Rely on fps_range */
998 format->es->video.frame_rate.den = 1;
999
1000 dev->capture.width = format->es->video.width;
1001 dev->capture.height = format->es->video.height;
1002 dev->capture.fmt = &formats[0];
1003 dev->capture.encode_component = NULL;
1004 + dev->capture.timeperframe = tpf_default;
1005 + dev->capture.enc_profile = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH;
1006 + dev->capture.enc_level = V4L2_MPEG_VIDEO_H264_LEVEL_4_0;
1007 +
1008 + vchiq_mmal_port_parameter_set(dev->instance,
1009 + &dev->component[MMAL_COMPONENT_CAMERA]->
1010 + output[MMAL_CAMERA_PORT_CAPTURE],
1011 + MMAL_PARAMETER_NO_IMAGE_PADDING,
1012 + &bool_true, sizeof(bool_true));
1013
1014 /* get the preview component ready */
1015 ret = vchiq_mmal_component_init(
1016 @@ -1260,6 +1592,14 @@ static int __init mmal_init(struct bm283
1017 }
1018
1019 {
1020 + struct vchiq_mmal_port *encoder_port =
1021 + &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
1022 + encoder_port->format.encoding = MMAL_ENCODING_H264;
1023 + ret = vchiq_mmal_port_set_format(dev->instance,
1024 + encoder_port);
1025 + }
1026 +
1027 + {
1028 unsigned int enable = 1;
1029 vchiq_mmal_port_parameter_set(
1030 dev->instance,
1031 @@ -1312,6 +1652,11 @@ static int __init bm2835_mmal_init_devic
1032 int ret;
1033
1034 *vfd = vdev_template;
1035 + if (gst_v4l2src_is_broken) {
1036 + v4l2_info(&dev->v4l2_dev,
1037 + "Work-around for gstreamer issue is active.\n");
1038 + vfd->ioctl_ops = &camera0_ioctl_ops_gstreamer;
1039 + }
1040
1041 vfd->v4l2_dev = &dev->v4l2_dev;
1042
1043 @@ -1328,8 +1673,9 @@ static int __init bm2835_mmal_init_devic
1044 if (ret < 0)
1045 return ret;
1046
1047 - v4l2_info(vfd->v4l2_dev, "V4L2 device registered as %s\n",
1048 - video_device_node_name(vfd));
1049 + v4l2_info(vfd->v4l2_dev,
1050 + "V4L2 device registered as %s - stills mode > %dx%d\n",
1051 + video_device_node_name(vfd), max_video_width, max_video_height);
1052
1053 return 0;
1054 }
1055 @@ -1337,9 +1683,9 @@ static int __init bm2835_mmal_init_devic
1056 static struct v4l2_format default_v4l2_format = {
1057 .fmt.pix.pixelformat = V4L2_PIX_FMT_JPEG,
1058 .fmt.pix.width = 1024,
1059 - .fmt.pix.bytesperline = 1024 * 3 / 2,
1060 + .fmt.pix.bytesperline = 1024,
1061 .fmt.pix.height = 768,
1062 - .fmt.pix.sizeimage = 1<<18,
1063 + .fmt.pix.sizeimage = 1024*768,
1064 };
1065
1066 static int __init bm2835_mmal_init(void)
1067 @@ -1402,6 +1748,9 @@ static int __init bm2835_mmal_init(void)
1068 if (ret < 0)
1069 goto unreg_dev;
1070
1071 + /* Really want to call vidioc_s_fmt_vid_cap with the default
1072 + * format, but currently the APIs don't join up.
1073 + */
1074 ret = mmal_setup_components(dev, &default_v4l2_format);
1075 if (ret < 0) {
1076 v4l2_err(&dev->v4l2_dev,
1077 --- a/drivers/media/platform/bcm2835/bcm2835-camera.h
1078 +++ b/drivers/media/platform/bcm2835/bcm2835-camera.h
1079 @@ -15,7 +15,7 @@
1080 * core driver device
1081 */
1082
1083 -#define V4L2_CTRL_COUNT 18 /* number of v4l controls */
1084 +#define V4L2_CTRL_COUNT 28 /* number of v4l controls */
1085
1086 enum {
1087 MMAL_COMPONENT_CAMERA = 0,
1088 @@ -32,9 +32,6 @@ enum {
1089 MMAL_CAMERA_PORT_COUNT
1090 };
1091
1092 -#define PREVIEW_FRAME_RATE_NUM 30
1093 -#define PREVIEW_FRAME_RATE_DEN 1
1094 -
1095 #define PREVIEW_LAYER 2
1096
1097 extern int bcm2835_v4l2_debug;
1098 @@ -48,9 +45,19 @@ struct bm2835_mmal_dev {
1099 /* controls */
1100 struct v4l2_ctrl_handler ctrl_handler;
1101 struct v4l2_ctrl *ctrls[V4L2_CTRL_COUNT];
1102 + enum v4l2_scene_mode scene_mode;
1103 struct mmal_colourfx colourfx;
1104 int hflip;
1105 int vflip;
1106 + int red_gain;
1107 + int blue_gain;
1108 + enum mmal_parameter_exposuremode exposure_mode_user;
1109 + enum v4l2_exposure_auto_type exposure_mode_v4l2_user;
1110 + /* active exposure mode may differ if selected via a scene mode */
1111 + enum mmal_parameter_exposuremode exposure_mode_active;
1112 + enum mmal_parameter_exposuremeteringmode metering_mode;
1113 + unsigned int manual_shutter_speed;
1114 + bool exp_auto_priority;
1115
1116 /* allocated mmal instance and components */
1117 struct vchiq_mmal_instance *instance;
1118 @@ -63,12 +70,18 @@ struct bm2835_mmal_dev {
1119 unsigned int width; /* width */
1120 unsigned int height; /* height */
1121 unsigned int stride; /* stride */
1122 + unsigned int buffersize; /* buffer size with padding */
1123 struct mmal_fmt *fmt;
1124 + struct v4l2_fract timeperframe;
1125
1126 /* H264 encode bitrate */
1127 int encode_bitrate;
1128 /* H264 bitrate mode. CBR/VBR */
1129 int encode_bitrate_mode;
1130 + /* H264 profile */
1131 + enum v4l2_mpeg_video_h264_profile enc_profile;
1132 + /* H264 level */
1133 + enum v4l2_mpeg_video_h264_level enc_level;
1134 /* JPEG Q-factor */
1135 int q_factor;
1136
1137 @@ -98,7 +111,7 @@ int bm2835_mmal_init_controls(
1138 struct v4l2_ctrl_handler *hdl);
1139
1140 int bm2835_mmal_set_all_camera_controls(struct bm2835_mmal_dev *dev);
1141 -
1142 +int set_framerate_params(struct bm2835_mmal_dev *dev);
1143
1144 /* Debug helpers */
1145
1146 --- a/drivers/media/platform/bcm2835/controls.c
1147 +++ b/drivers/media/platform/bcm2835/controls.c
1148 @@ -30,11 +30,23 @@
1149 #include "mmal-parameters.h"
1150 #include "bcm2835-camera.h"
1151
1152 -/* The supported V4L2_CID_AUTO_EXPOSURE_BIAS values are from -24 to +24.
1153 - * These are in 1/6th increments so the effective range is -4.0EV to +4.0EV.
1154 +/* The supported V4L2_CID_AUTO_EXPOSURE_BIAS values are from -4.0 to +4.0.
1155 + * MMAL values are in 1/6th increments so the MMAL range is -24 to +24.
1156 + * V4L2 docs say value "is expressed in terms of EV, drivers should interpret
1157 + * the values as 0.001 EV units, where the value 1000 stands for +1 EV."
1158 + * V4L2 is limited to a max of 32 values in a menu, so count in 1/3rds from
1159 + * -4 to +4
1160 */
1161 static const s64 ev_bias_qmenu[] = {
1162 - -24, -21, -18, -15, -12, -9, -6, -3, 0, 3, 6, 9, 12, 15, 18, 21, 24
1163 + -4000, -3667, -3333,
1164 + -3000, -2667, -2333,
1165 + -2000, -1667, -1333,
1166 + -1000, -667, -333,
1167 + 0, 333, 667,
1168 + 1000, 1333, 1667,
1169 + 2000, 2333, 2667,
1170 + 3000, 3333, 3667,
1171 + 4000
1172 };
1173
1174 /* Supported ISO values
1175 @@ -44,13 +56,19 @@ static const s64 iso_qmenu[] = {
1176 0, 100, 200, 400, 800,
1177 };
1178
1179 +static const s64 mains_freq_qmenu[] = {
1180 + V4L2_CID_POWER_LINE_FREQUENCY_DISABLED,
1181 + V4L2_CID_POWER_LINE_FREQUENCY_50HZ,
1182 + V4L2_CID_POWER_LINE_FREQUENCY_60HZ,
1183 + V4L2_CID_POWER_LINE_FREQUENCY_AUTO
1184 +};
1185 +
1186 /* Supported video encode modes */
1187 static const s64 bitrate_mode_qmenu[] = {
1188 (s64)V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
1189 (s64)V4L2_MPEG_VIDEO_BITRATE_MODE_CBR,
1190 };
1191
1192 -
1193 enum bm2835_mmal_ctrl_type {
1194 MMAL_CONTROL_TYPE_STD,
1195 MMAL_CONTROL_TYPE_STD_MENU,
1196 @@ -77,6 +95,7 @@ struct bm2835_mmal_v4l2_ctrl {
1197 const s64 *imenu; /* integer menu array */
1198 u32 mmal_id; /* mmal parameter id */
1199 bm2835_mmal_v4l2_ctrl_cb *setter;
1200 + bool ignore_errors;
1201 };
1202
1203 struct v4l2_to_mmal_effects_setting {
1204 @@ -126,6 +145,25 @@ static const struct v4l2_to_mmal_effects
1205 1, 1, 0, 0, 0, {0, 0, 0, 0, 0} }
1206 };
1207
1208 +struct v4l2_mmal_scene_config {
1209 + enum v4l2_scene_mode v4l2_scene;
1210 + enum mmal_parameter_exposuremode exposure_mode;
1211 + enum mmal_parameter_exposuremeteringmode metering_mode;
1212 +};
1213 +
1214 +static const struct v4l2_mmal_scene_config scene_configs[] = {
1215 + /* V4L2_SCENE_MODE_NONE automatically added */
1216 + {
1217 + V4L2_SCENE_MODE_NIGHT,
1218 + MMAL_PARAM_EXPOSUREMODE_NIGHT,
1219 + MMAL_PARAM_EXPOSUREMETERINGMODE_AVERAGE
1220 + },
1221 + {
1222 + V4L2_SCENE_MODE_SPORTS,
1223 + MMAL_PARAM_EXPOSUREMODE_SPORTS,
1224 + MMAL_PARAM_EXPOSUREMETERINGMODE_AVERAGE
1225 + },
1226 +};
1227
1228 /* control handlers*/
1229
1230 @@ -133,10 +171,7 @@ static int ctrl_set_rational(struct bm28
1231 struct v4l2_ctrl *ctrl,
1232 const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1233 {
1234 - struct {
1235 - s32 num; /**< Numerator */
1236 - s32 den; /**< Denominator */
1237 - } rational_value;
1238 + struct mmal_parameter_rational rational_value;
1239 struct vchiq_mmal_port *control;
1240
1241 control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
1242 @@ -166,6 +201,41 @@ static int ctrl_set_value(struct bm2835_
1243 &u32_value, sizeof(u32_value));
1244 }
1245
1246 +static int ctrl_set_value_menu(struct bm2835_mmal_dev *dev,
1247 + struct v4l2_ctrl *ctrl,
1248 + const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1249 +{
1250 + u32 u32_value;
1251 + struct vchiq_mmal_port *control;
1252 +
1253 + if (ctrl->val > mmal_ctrl->max || ctrl->val < mmal_ctrl->min)
1254 + return 1;
1255 +
1256 + control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
1257 +
1258 + u32_value = mmal_ctrl->imenu[ctrl->val];
1259 +
1260 + return vchiq_mmal_port_parameter_set(dev->instance, control,
1261 + mmal_ctrl->mmal_id,
1262 + &u32_value, sizeof(u32_value));
1263 +}
1264 +
1265 +static int ctrl_set_value_ev(struct bm2835_mmal_dev *dev,
1266 + struct v4l2_ctrl *ctrl,
1267 + const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1268 +{
1269 + s32 s32_value;
1270 + struct vchiq_mmal_port *control;
1271 +
1272 + control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
1273 +
1274 + s32_value = (ctrl->val-12)*2; /* Convert from index to 1/6ths */
1275 +
1276 + return vchiq_mmal_port_parameter_set(dev->instance, control,
1277 + mmal_ctrl->mmal_id,
1278 + &s32_value, sizeof(s32_value));
1279 +}
1280 +
1281 static int ctrl_set_rotate(struct bm2835_mmal_dev *dev,
1282 struct v4l2_ctrl *ctrl,
1283 const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1284 @@ -245,37 +315,97 @@ static int ctrl_set_exposure(struct bm28
1285 struct v4l2_ctrl *ctrl,
1286 const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1287 {
1288 - u32 u32_value;
1289 + enum mmal_parameter_exposuremode exp_mode = dev->exposure_mode_user;
1290 + u32 shutter_speed = 0;
1291 struct vchiq_mmal_port *control;
1292 + int ret = 0;
1293
1294 control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
1295
1296 + if (mmal_ctrl->mmal_id == MMAL_PARAMETER_SHUTTER_SPEED) {
1297 + /* V4L2 is in 100usec increments.
1298 + * MMAL is 1usec.
1299 + */
1300 + dev->manual_shutter_speed = ctrl->val * 100;
1301 + } else if (mmal_ctrl->mmal_id == MMAL_PARAMETER_EXPOSURE_MODE) {
1302 + switch (ctrl->val) {
1303 + case V4L2_EXPOSURE_AUTO:
1304 + exp_mode = MMAL_PARAM_EXPOSUREMODE_AUTO;
1305 + break;
1306 +
1307 + case V4L2_EXPOSURE_MANUAL:
1308 + exp_mode = MMAL_PARAM_EXPOSUREMODE_OFF;
1309 + break;
1310 + }
1311 + dev->exposure_mode_user = exp_mode;
1312 + dev->exposure_mode_v4l2_user = ctrl->val;
1313 + } else if (mmal_ctrl->id == V4L2_CID_EXPOSURE_AUTO_PRIORITY) {
1314 + dev->exp_auto_priority = ctrl->val;
1315 + }
1316 +
1317 + if (dev->scene_mode == V4L2_SCENE_MODE_NONE) {
1318 + if (exp_mode == MMAL_PARAM_EXPOSUREMODE_OFF)
1319 + shutter_speed = dev->manual_shutter_speed;
1320 +
1321 + ret = vchiq_mmal_port_parameter_set(dev->instance,
1322 + control,
1323 + MMAL_PARAMETER_SHUTTER_SPEED,
1324 + &shutter_speed,
1325 + sizeof(shutter_speed));
1326 + ret += vchiq_mmal_port_parameter_set(dev->instance,
1327 + control,
1328 + MMAL_PARAMETER_EXPOSURE_MODE,
1329 + &exp_mode,
1330 + sizeof(u32));
1331 + dev->exposure_mode_active = exp_mode;
1332 + }
1333 + /* exposure_dynamic_framerate (V4L2_CID_EXPOSURE_AUTO_PRIORITY) should
1334 + * always apply irrespective of scene mode.
1335 + */
1336 + ret += set_framerate_params(dev);
1337 +
1338 + return ret;
1339 +}
1340 +
1341 +static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev,
1342 + struct v4l2_ctrl *ctrl,
1343 + const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1344 +{
1345 switch (ctrl->val) {
1346 - case V4L2_EXPOSURE_AUTO:
1347 - u32_value = MMAL_PARAM_EXPOSUREMODE_AUTO;
1348 + case V4L2_EXPOSURE_METERING_AVERAGE:
1349 + dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_AVERAGE;
1350 break;
1351
1352 - case V4L2_EXPOSURE_MANUAL:
1353 - u32_value = MMAL_PARAM_EXPOSUREMODE_OFF;
1354 + case V4L2_EXPOSURE_METERING_CENTER_WEIGHTED:
1355 + dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_BACKLIT;
1356 break;
1357
1358 - case V4L2_EXPOSURE_SHUTTER_PRIORITY:
1359 - u32_value = MMAL_PARAM_EXPOSUREMODE_SPORTS;
1360 + case V4L2_EXPOSURE_METERING_SPOT:
1361 + dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_SPOT;
1362 break;
1363
1364 - case V4L2_EXPOSURE_APERTURE_PRIORITY:
1365 - u32_value = MMAL_PARAM_EXPOSUREMODE_NIGHT;
1366 + /* todo matrix weighting not added to Linux API till 3.9
1367 + case V4L2_EXPOSURE_METERING_MATRIX:
1368 + dev->metering_mode = MMAL_PARAM_EXPOSUREMETERINGMODE_MATRIX;
1369 break;
1370 + */
1371
1372 }
1373
1374 - /* todo: what about the other ten modes there are MMAL parameters for */
1375 - return vchiq_mmal_port_parameter_set(dev->instance, control,
1376 + if (dev->scene_mode == V4L2_SCENE_MODE_NONE) {
1377 + struct vchiq_mmal_port *control;
1378 + u32 u32_value = dev->metering_mode;
1379 +
1380 + control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
1381 +
1382 + return vchiq_mmal_port_parameter_set(dev->instance, control,
1383 mmal_ctrl->mmal_id,
1384 &u32_value, sizeof(u32_value));
1385 + } else
1386 + return 0;
1387 }
1388
1389 -static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev,
1390 +static int ctrl_set_flicker_avoidance(struct bm2835_mmal_dev *dev,
1391 struct v4l2_ctrl *ctrl,
1392 const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1393 {
1394 @@ -285,24 +415,18 @@ static int ctrl_set_metering_mode(struct
1395 control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
1396
1397 switch (ctrl->val) {
1398 - case V4L2_EXPOSURE_METERING_AVERAGE:
1399 - u32_value = MMAL_PARAM_EXPOSUREMETERINGMODE_AVERAGE;
1400 + case V4L2_CID_POWER_LINE_FREQUENCY_DISABLED:
1401 + u32_value = MMAL_PARAM_FLICKERAVOID_OFF;
1402 break;
1403 -
1404 - case V4L2_EXPOSURE_METERING_CENTER_WEIGHTED:
1405 - u32_value = MMAL_PARAM_EXPOSUREMETERINGMODE_BACKLIT;
1406 + case V4L2_CID_POWER_LINE_FREQUENCY_50HZ:
1407 + u32_value = MMAL_PARAM_FLICKERAVOID_50HZ;
1408 break;
1409 -
1410 - case V4L2_EXPOSURE_METERING_SPOT:
1411 - u32_value = MMAL_PARAM_EXPOSUREMETERINGMODE_SPOT;
1412 + case V4L2_CID_POWER_LINE_FREQUENCY_60HZ:
1413 + u32_value = MMAL_PARAM_FLICKERAVOID_60HZ;
1414 break;
1415 -
1416 - /* todo matrix weighting not added to Linux API till 3.9
1417 - case V4L2_EXPOSURE_METERING_MATRIX:
1418 - u32_value = MMAL_PARAM_EXPOSUREMETERINGMODE_MATRIX;
1419 + case V4L2_CID_POWER_LINE_FREQUENCY_AUTO:
1420 + u32_value = MMAL_PARAM_FLICKERAVOID_AUTO;
1421 break;
1422 - */
1423 -
1424 }
1425
1426 return vchiq_mmal_port_parameter_set(dev->instance, control,
1427 @@ -367,6 +491,29 @@ static int ctrl_set_awb_mode(struct bm28
1428 &u32_value, sizeof(u32_value));
1429 }
1430
1431 +static int ctrl_set_awb_gains(struct bm2835_mmal_dev *dev,
1432 + struct v4l2_ctrl *ctrl,
1433 + const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1434 +{
1435 + struct vchiq_mmal_port *control;
1436 + struct mmal_parameter_awbgains gains;
1437 +
1438 + control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
1439 +
1440 + if (ctrl->id == V4L2_CID_RED_BALANCE)
1441 + dev->red_gain = ctrl->val;
1442 + else if (ctrl->id == V4L2_CID_BLUE_BALANCE)
1443 + dev->blue_gain = ctrl->val;
1444 +
1445 + gains.r_gain.num = dev->red_gain;
1446 + gains.b_gain.num = dev->blue_gain;
1447 + gains.r_gain.den = gains.b_gain.den = 1000;
1448 +
1449 + return vchiq_mmal_port_parameter_set(dev->instance, control,
1450 + mmal_ctrl->mmal_id,
1451 + &gains, sizeof(gains));
1452 +}
1453 +
1454 static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev,
1455 struct v4l2_ctrl *ctrl,
1456 const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1457 @@ -443,8 +590,8 @@ static int ctrl_set_colfx(struct bm2835_
1458 &dev->colourfx, sizeof(dev->colourfx));
1459
1460 v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
1461 - "After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
1462 - mmal_ctrl, ctrl->id, ctrl->val, ret,
1463 + "%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
1464 + __func__, mmal_ctrl, ctrl->id, ctrl->val, ret,
1465 (ret == 0 ? 0 : -EINVAL));
1466 return (ret == 0 ? 0 : EINVAL);
1467 }
1468 @@ -494,7 +641,7 @@ static int ctrl_set_bitrate_mode(struct
1469 return 0;
1470 }
1471
1472 -static int ctrl_set_q_factor(struct bm2835_mmal_dev *dev,
1473 +static int ctrl_set_image_encode_output(struct bm2835_mmal_dev *dev,
1474 struct v4l2_ctrl *ctrl,
1475 const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1476 {
1477 @@ -510,12 +657,247 @@ static int ctrl_set_q_factor(struct bm28
1478 &u32_value, sizeof(u32_value));
1479 }
1480
1481 +static int ctrl_set_video_encode_param_output(struct bm2835_mmal_dev *dev,
1482 + struct v4l2_ctrl *ctrl,
1483 + const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1484 +{
1485 + u32 u32_value;
1486 + struct vchiq_mmal_port *vid_enc_ctl;
1487 +
1488 + vid_enc_ctl = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
1489 +
1490 + u32_value = ctrl->val;
1491 +
1492 + return vchiq_mmal_port_parameter_set(dev->instance, vid_enc_ctl,
1493 + mmal_ctrl->mmal_id,
1494 + &u32_value, sizeof(u32_value));
1495 +}
1496 +
1497 +static int ctrl_set_video_encode_profile_level(struct bm2835_mmal_dev *dev,
1498 + struct v4l2_ctrl *ctrl,
1499 + const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1500 +{
1501 + struct mmal_parameter_video_profile param;
1502 + int ret = 0;
1503 +
1504 + if (ctrl->id == V4L2_CID_MPEG_VIDEO_H264_PROFILE) {
1505 + switch (ctrl->val) {
1506 + case V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE:
1507 + case V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE:
1508 + case V4L2_MPEG_VIDEO_H264_PROFILE_MAIN:
1509 + case V4L2_MPEG_VIDEO_H264_PROFILE_HIGH:
1510 + dev->capture.enc_profile = ctrl->val;
1511 + break;
1512 + default:
1513 + ret = -EINVAL;
1514 + break;
1515 + }
1516 + } else if (ctrl->id == V4L2_CID_MPEG_VIDEO_H264_LEVEL) {
1517 + switch (ctrl->val) {
1518 + case V4L2_MPEG_VIDEO_H264_LEVEL_1_0:
1519 + case V4L2_MPEG_VIDEO_H264_LEVEL_1B:
1520 + case V4L2_MPEG_VIDEO_H264_LEVEL_1_1:
1521 + case V4L2_MPEG_VIDEO_H264_LEVEL_1_2:
1522 + case V4L2_MPEG_VIDEO_H264_LEVEL_1_3:
1523 + case V4L2_MPEG_VIDEO_H264_LEVEL_2_0:
1524 + case V4L2_MPEG_VIDEO_H264_LEVEL_2_1:
1525 + case V4L2_MPEG_VIDEO_H264_LEVEL_2_2:
1526 + case V4L2_MPEG_VIDEO_H264_LEVEL_3_0:
1527 + case V4L2_MPEG_VIDEO_H264_LEVEL_3_1:
1528 + case V4L2_MPEG_VIDEO_H264_LEVEL_3_2:
1529 + case V4L2_MPEG_VIDEO_H264_LEVEL_4_0:
1530 + dev->capture.enc_level = ctrl->val;
1531 + break;
1532 + default:
1533 + ret = -EINVAL;
1534 + break;
1535 + }
1536 + }
1537 +
1538 + if (!ret) {
1539 + switch (dev->capture.enc_profile) {
1540 + case V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE:
1541 + param.profile = MMAL_VIDEO_PROFILE_H264_BASELINE;
1542 + break;
1543 + case V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE:
1544 + param.profile =
1545 + MMAL_VIDEO_PROFILE_H264_CONSTRAINED_BASELINE;
1546 + break;
1547 + case V4L2_MPEG_VIDEO_H264_PROFILE_MAIN:
1548 + param.profile = MMAL_VIDEO_PROFILE_H264_MAIN;
1549 + break;
1550 + case V4L2_MPEG_VIDEO_H264_PROFILE_HIGH:
1551 + param.profile = MMAL_VIDEO_PROFILE_H264_HIGH;
1552 + break;
1553 + default:
1554 + /* Should never get here */
1555 + break;
1556 + }
1557 +
1558 + switch (dev->capture.enc_level) {
1559 + case V4L2_MPEG_VIDEO_H264_LEVEL_1_0:
1560 + param.level = MMAL_VIDEO_LEVEL_H264_1;
1561 + break;
1562 + case V4L2_MPEG_VIDEO_H264_LEVEL_1B:
1563 + param.level = MMAL_VIDEO_LEVEL_H264_1b;
1564 + break;
1565 + case V4L2_MPEG_VIDEO_H264_LEVEL_1_1:
1566 + param.level = MMAL_VIDEO_LEVEL_H264_11;
1567 + break;
1568 + case V4L2_MPEG_VIDEO_H264_LEVEL_1_2:
1569 + param.level = MMAL_VIDEO_LEVEL_H264_12;
1570 + break;
1571 + case V4L2_MPEG_VIDEO_H264_LEVEL_1_3:
1572 + param.level = MMAL_VIDEO_LEVEL_H264_13;
1573 + break;
1574 + case V4L2_MPEG_VIDEO_H264_LEVEL_2_0:
1575 + param.level = MMAL_VIDEO_LEVEL_H264_2;
1576 + break;
1577 + case V4L2_MPEG_VIDEO_H264_LEVEL_2_1:
1578 + param.level = MMAL_VIDEO_LEVEL_H264_21;
1579 + break;
1580 + case V4L2_MPEG_VIDEO_H264_LEVEL_2_2:
1581 + param.level = MMAL_VIDEO_LEVEL_H264_22;
1582 + break;
1583 + case V4L2_MPEG_VIDEO_H264_LEVEL_3_0:
1584 + param.level = MMAL_VIDEO_LEVEL_H264_3;
1585 + break;
1586 + case V4L2_MPEG_VIDEO_H264_LEVEL_3_1:
1587 + param.level = MMAL_VIDEO_LEVEL_H264_31;
1588 + break;
1589 + case V4L2_MPEG_VIDEO_H264_LEVEL_3_2:
1590 + param.level = MMAL_VIDEO_LEVEL_H264_32;
1591 + break;
1592 + case V4L2_MPEG_VIDEO_H264_LEVEL_4_0:
1593 + param.level = MMAL_VIDEO_LEVEL_H264_4;
1594 + break;
1595 + default:
1596 + /* Should never get here */
1597 + break;
1598 + }
1599 +
1600 + ret = vchiq_mmal_port_parameter_set(dev->instance,
1601 + &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0],
1602 + mmal_ctrl->mmal_id,
1603 + &param, sizeof(param));
1604 + }
1605 + return ret;
1606 +}
1607 +
1608 +static int ctrl_set_scene_mode(struct bm2835_mmal_dev *dev,
1609 + struct v4l2_ctrl *ctrl,
1610 + const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
1611 +{
1612 + int ret = 0;
1613 + int shutter_speed;
1614 + struct vchiq_mmal_port *control;
1615 +
1616 + v4l2_dbg(0, bcm2835_v4l2_debug, &dev->v4l2_dev,
1617 + "scene mode selected %d, was %d\n", ctrl->val,
1618 + dev->scene_mode);
1619 + control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
1620 +
1621 + if (ctrl->val == dev->scene_mode)
1622 + return 0;
1623 +
1624 + if (ctrl->val == V4L2_SCENE_MODE_NONE) {
1625 + /* Restore all user selections */
1626 + dev->scene_mode = V4L2_SCENE_MODE_NONE;
1627 +
1628 + if (dev->exposure_mode_user == MMAL_PARAM_EXPOSUREMODE_OFF)
1629 + shutter_speed = dev->manual_shutter_speed;
1630 + else
1631 + shutter_speed = 0;
1632 +
1633 + v4l2_dbg(0, bcm2835_v4l2_debug, &dev->v4l2_dev,
1634 + "%s: scene mode none: shut_speed %d, exp_mode %d, metering %d\n",
1635 + __func__, shutter_speed, dev->exposure_mode_user,
1636 + dev->metering_mode);
1637 + ret = vchiq_mmal_port_parameter_set(dev->instance,
1638 + control,
1639 + MMAL_PARAMETER_SHUTTER_SPEED,
1640 + &shutter_speed,
1641 + sizeof(shutter_speed));
1642 + ret += vchiq_mmal_port_parameter_set(dev->instance,
1643 + control,
1644 + MMAL_PARAMETER_EXPOSURE_MODE,
1645 + &dev->exposure_mode_user,
1646 + sizeof(u32));
1647 + dev->exposure_mode_active = dev->exposure_mode_user;
1648 + ret += vchiq_mmal_port_parameter_set(dev->instance,
1649 + control,
1650 + MMAL_PARAMETER_EXP_METERING_MODE,
1651 + &dev->metering_mode,
1652 + sizeof(u32));
1653 + ret += set_framerate_params(dev);
1654 + } else {
1655 + /* Set up scene mode */
1656 + int i;
1657 + const struct v4l2_mmal_scene_config *scene = NULL;
1658 + int shutter_speed;
1659 + enum mmal_parameter_exposuremode exposure_mode;
1660 + enum mmal_parameter_exposuremeteringmode metering_mode;
1661 +
1662 + for (i = 0; i < ARRAY_SIZE(scene_configs); i++) {
1663 + if (scene_configs[i].v4l2_scene ==
1664 + ctrl->val) {
1665 + scene = &scene_configs[i];
1666 + break;
1667 + }
1668 + }
1669 + if (i >= ARRAY_SIZE(scene_configs))
1670 + return -EINVAL;
1671 +
1672 + /* Set all the values */
1673 + dev->scene_mode = ctrl->val;
1674 +
1675 + if (scene->exposure_mode == MMAL_PARAM_EXPOSUREMODE_OFF)
1676 + shutter_speed = dev->manual_shutter_speed;
1677 + else
1678 + shutter_speed = 0;
1679 + exposure_mode = scene->exposure_mode;
1680 + metering_mode = scene->metering_mode;
1681 +
1682 + v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
1683 + "%s: scene mode none: shut_speed %d, exp_mode %d, metering %d\n",
1684 + __func__, shutter_speed, exposure_mode, metering_mode);
1685 +
1686 + ret = vchiq_mmal_port_parameter_set(dev->instance, control,
1687 + MMAL_PARAMETER_SHUTTER_SPEED,
1688 + &shutter_speed,
1689 + sizeof(shutter_speed));
1690 + ret += vchiq_mmal_port_parameter_set(dev->instance,
1691 + control,
1692 + MMAL_PARAMETER_EXPOSURE_MODE,
1693 + &exposure_mode,
1694 + sizeof(u32));
1695 + dev->exposure_mode_active = exposure_mode;
1696 + ret += vchiq_mmal_port_parameter_set(dev->instance, control,
1697 + MMAL_PARAMETER_EXPOSURE_MODE,
1698 + &exposure_mode,
1699 + sizeof(u32));
1700 + ret += vchiq_mmal_port_parameter_set(dev->instance, control,
1701 + MMAL_PARAMETER_EXP_METERING_MODE,
1702 + &metering_mode,
1703 + sizeof(u32));
1704 + ret += set_framerate_params(dev);
1705 + }
1706 + if (ret) {
1707 + v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
1708 + "%s: Setting scene to %d, ret=%d\n",
1709 + __func__, ctrl->val, ret);
1710 + ret = -EINVAL;
1711 + }
1712 + return 0;
1713 +}
1714 +
1715 static int bm2835_mmal_s_ctrl(struct v4l2_ctrl *ctrl)
1716 {
1717 struct bm2835_mmal_dev *dev =
1718 container_of(ctrl->handler, struct bm2835_mmal_dev,
1719 ctrl_handler);
1720 const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl = ctrl->priv;
1721 + int ret;
1722
1723 if ((mmal_ctrl == NULL) ||
1724 (mmal_ctrl->id != ctrl->id) ||
1725 @@ -524,7 +906,13 @@ static int bm2835_mmal_s_ctrl(struct v4l
1726 return -EINVAL;
1727 }
1728
1729 - return mmal_ctrl->setter(dev, ctrl, mmal_ctrl);
1730 + ret = mmal_ctrl->setter(dev, ctrl, mmal_ctrl);
1731 + if (ret)
1732 + pr_warn("ctrl id:%d/MMAL param %08X- returned ret %d\n",
1733 + ctrl->id, mmal_ctrl->mmal_id, ret);
1734 + if (mmal_ctrl->ignore_errors)
1735 + ret = 0;
1736 + return ret;
1737 }
1738
1739 static const struct v4l2_ctrl_ops bm2835_mmal_ctrl_ops = {
1740 @@ -537,40 +925,54 @@ static const struct bm2835_mmal_v4l2_ctr
1741 {
1742 V4L2_CID_SATURATION, MMAL_CONTROL_TYPE_STD,
1743 -100, 100, 0, 1, NULL,
1744 - MMAL_PARAMETER_SATURATION, &ctrl_set_rational
1745 + MMAL_PARAMETER_SATURATION,
1746 + &ctrl_set_rational,
1747 + false
1748 },
1749 {
1750 V4L2_CID_SHARPNESS, MMAL_CONTROL_TYPE_STD,
1751 -100, 100, 0, 1, NULL,
1752 - MMAL_PARAMETER_SHARPNESS, &ctrl_set_rational
1753 + MMAL_PARAMETER_SHARPNESS,
1754 + &ctrl_set_rational,
1755 + false
1756 },
1757 {
1758 V4L2_CID_CONTRAST, MMAL_CONTROL_TYPE_STD,
1759 -100, 100, 0, 1, NULL,
1760 - MMAL_PARAMETER_CONTRAST, &ctrl_set_rational
1761 + MMAL_PARAMETER_CONTRAST,
1762 + &ctrl_set_rational,
1763 + false
1764 },
1765 {
1766 V4L2_CID_BRIGHTNESS, MMAL_CONTROL_TYPE_STD,
1767 0, 100, 50, 1, NULL,
1768 - MMAL_PARAMETER_BRIGHTNESS, &ctrl_set_rational
1769 + MMAL_PARAMETER_BRIGHTNESS,
1770 + &ctrl_set_rational,
1771 + false
1772 },
1773 {
1774 V4L2_CID_ISO_SENSITIVITY, MMAL_CONTROL_TYPE_INT_MENU,
1775 0, ARRAY_SIZE(iso_qmenu) - 1, 0, 1, iso_qmenu,
1776 - MMAL_PARAMETER_ISO, &ctrl_set_value
1777 + MMAL_PARAMETER_ISO,
1778 + &ctrl_set_value_menu,
1779 + false
1780 },
1781 {
1782 V4L2_CID_IMAGE_STABILIZATION, MMAL_CONTROL_TYPE_STD,
1783 0, 1, 0, 1, NULL,
1784 - MMAL_PARAMETER_VIDEO_STABILISATION, &ctrl_set_value
1785 + MMAL_PARAMETER_VIDEO_STABILISATION,
1786 + &ctrl_set_value,
1787 + false
1788 },
1789 /* {
1790 0, MMAL_CONTROL_TYPE_CLUSTER, 3, 1, 0, NULL, 0, NULL
1791 - },
1792 -*/ {
1793 + }, */
1794 + {
1795 V4L2_CID_EXPOSURE_AUTO, MMAL_CONTROL_TYPE_STD_MENU,
1796 ~0x03, 3, V4L2_EXPOSURE_AUTO, 0, NULL,
1797 - MMAL_PARAMETER_EXPOSURE_MODE, &ctrl_set_exposure
1798 + MMAL_PARAMETER_EXPOSURE_MODE,
1799 + &ctrl_set_exposure,
1800 + false
1801 },
1802 /* todo this needs mixing in with set exposure
1803 {
1804 @@ -578,83 +980,258 @@ static const struct bm2835_mmal_v4l2_ctr
1805 },
1806 */
1807 {
1808 + V4L2_CID_EXPOSURE_ABSOLUTE, MMAL_CONTROL_TYPE_STD,
1809 + /* Units of 100usecs */
1810 + 1, 1*1000*10, 100*10, 1, NULL,
1811 + MMAL_PARAMETER_SHUTTER_SPEED,
1812 + &ctrl_set_exposure,
1813 + false
1814 + },
1815 + {
1816 V4L2_CID_AUTO_EXPOSURE_BIAS, MMAL_CONTROL_TYPE_INT_MENU,
1817 0, ARRAY_SIZE(ev_bias_qmenu) - 1,
1818 (ARRAY_SIZE(ev_bias_qmenu)+1)/2 - 1, 0, ev_bias_qmenu,
1819 - MMAL_PARAMETER_EXPOSURE_COMP, &ctrl_set_value
1820 + MMAL_PARAMETER_EXPOSURE_COMP,
1821 + &ctrl_set_value_ev,
1822 + false
1823 + },
1824 + {
1825 + V4L2_CID_EXPOSURE_AUTO_PRIORITY, MMAL_CONTROL_TYPE_STD,
1826 + 0, 1,
1827 + 0, 1, NULL,
1828 + 0, /* Dummy MMAL ID as it gets mapped into FPS range*/
1829 + &ctrl_set_exposure,
1830 + false
1831 },
1832 {
1833 V4L2_CID_EXPOSURE_METERING,
1834 MMAL_CONTROL_TYPE_STD_MENU,
1835 ~0x7, 2, V4L2_EXPOSURE_METERING_AVERAGE, 0, NULL,
1836 - MMAL_PARAMETER_EXP_METERING_MODE, &ctrl_set_metering_mode
1837 + MMAL_PARAMETER_EXP_METERING_MODE,
1838 + &ctrl_set_metering_mode,
1839 + false
1840 },
1841 {
1842 V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE,
1843 MMAL_CONTROL_TYPE_STD_MENU,
1844 - ~0x3fe, 9, V4L2_WHITE_BALANCE_AUTO, 0, NULL,
1845 - MMAL_PARAMETER_AWB_MODE, &ctrl_set_awb_mode
1846 + ~0x3ff, 9, V4L2_WHITE_BALANCE_AUTO, 0, NULL,
1847 + MMAL_PARAMETER_AWB_MODE,
1848 + &ctrl_set_awb_mode,
1849 + false
1850 + },
1851 + {
1852 + V4L2_CID_RED_BALANCE, MMAL_CONTROL_TYPE_STD,
1853 + 1, 7999, 1000, 1, NULL,
1854 + MMAL_PARAMETER_CUSTOM_AWB_GAINS,
1855 + &ctrl_set_awb_gains,
1856 + false
1857 + },
1858 + {
1859 + V4L2_CID_BLUE_BALANCE, MMAL_CONTROL_TYPE_STD,
1860 + 1, 7999, 1000, 1, NULL,
1861 + MMAL_PARAMETER_CUSTOM_AWB_GAINS,
1862 + &ctrl_set_awb_gains,
1863 + false
1864 },
1865 {
1866 V4L2_CID_COLORFX, MMAL_CONTROL_TYPE_STD_MENU,
1867 0, 15, V4L2_COLORFX_NONE, 0, NULL,
1868 - MMAL_PARAMETER_IMAGE_EFFECT, &ctrl_set_image_effect
1869 + MMAL_PARAMETER_IMAGE_EFFECT,
1870 + &ctrl_set_image_effect,
1871 + false
1872 },
1873 {
1874 V4L2_CID_COLORFX_CBCR, MMAL_CONTROL_TYPE_STD,
1875 0, 0xffff, 0x8080, 1, NULL,
1876 - MMAL_PARAMETER_COLOUR_EFFECT, &ctrl_set_colfx
1877 + MMAL_PARAMETER_COLOUR_EFFECT,
1878 + &ctrl_set_colfx,
1879 + false
1880 },
1881 {
1882 V4L2_CID_ROTATE, MMAL_CONTROL_TYPE_STD,
1883 0, 360, 0, 90, NULL,
1884 - MMAL_PARAMETER_ROTATION, &ctrl_set_rotate
1885 + MMAL_PARAMETER_ROTATION,
1886 + &ctrl_set_rotate,
1887 + false
1888 },
1889 {
1890 V4L2_CID_HFLIP, MMAL_CONTROL_TYPE_STD,
1891 0, 1, 0, 1, NULL,
1892 - MMAL_PARAMETER_MIRROR, &ctrl_set_flip
1893 + MMAL_PARAMETER_MIRROR,
1894 + &ctrl_set_flip,
1895 + false
1896 },
1897 {
1898 V4L2_CID_VFLIP, MMAL_CONTROL_TYPE_STD,
1899 0, 1, 0, 1, NULL,
1900 - MMAL_PARAMETER_MIRROR, &ctrl_set_flip
1901 + MMAL_PARAMETER_MIRROR,
1902 + &ctrl_set_flip,
1903 + false
1904 },
1905 {
1906 V4L2_CID_MPEG_VIDEO_BITRATE_MODE, MMAL_CONTROL_TYPE_STD_MENU,
1907 0, ARRAY_SIZE(bitrate_mode_qmenu) - 1,
1908 0, 0, bitrate_mode_qmenu,
1909 - MMAL_PARAMETER_RATECONTROL, &ctrl_set_bitrate_mode
1910 + MMAL_PARAMETER_RATECONTROL,
1911 + &ctrl_set_bitrate_mode,
1912 + false
1913 },
1914 {
1915 V4L2_CID_MPEG_VIDEO_BITRATE, MMAL_CONTROL_TYPE_STD,
1916 25*1000, 25*1000*1000, 10*1000*1000, 25*1000, NULL,
1917 - MMAL_PARAMETER_VIDEO_BIT_RATE, &ctrl_set_bitrate
1918 + MMAL_PARAMETER_VIDEO_BIT_RATE,
1919 + &ctrl_set_bitrate,
1920 + false
1921 },
1922 {
1923 V4L2_CID_JPEG_COMPRESSION_QUALITY, MMAL_CONTROL_TYPE_STD,
1924 - 0, 100,
1925 + 1, 100,
1926 30, 1, NULL,
1927 - MMAL_PARAMETER_JPEG_Q_FACTOR, &ctrl_set_q_factor
1928 + MMAL_PARAMETER_JPEG_Q_FACTOR,
1929 + &ctrl_set_image_encode_output,
1930 + false
1931 + },
1932 + {
1933 + V4L2_CID_POWER_LINE_FREQUENCY, MMAL_CONTROL_TYPE_STD_MENU,
1934 + 0, ARRAY_SIZE(mains_freq_qmenu) - 1,
1935 + 1, 1, NULL,
1936 + MMAL_PARAMETER_FLICKER_AVOID,
1937 + &ctrl_set_flicker_avoidance,
1938 + false
1939 + },
1940 + {
1941 + V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER, MMAL_CONTROL_TYPE_STD,
1942 + 0, 1,
1943 + 0, 1, NULL,
1944 + MMAL_PARAMETER_VIDEO_ENCODE_INLINE_HEADER,
1945 + &ctrl_set_video_encode_param_output,
1946 + true /* Errors ignored as requires latest firmware to work */
1947 + },
1948 + {
1949 + V4L2_CID_MPEG_VIDEO_H264_PROFILE,
1950 + MMAL_CONTROL_TYPE_STD_MENU,
1951 + ~((1<<V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |
1952 + (1<<V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |
1953 + (1<<V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |
1954 + (1<<V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
1955 + V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,
1956 + V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, 1, NULL,
1957 + MMAL_PARAMETER_PROFILE,
1958 + &ctrl_set_video_encode_profile_level,
1959 + false
1960 + },
1961 + {
1962 + V4L2_CID_MPEG_VIDEO_H264_LEVEL, MMAL_CONTROL_TYPE_STD_MENU,
1963 + ~((1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |
1964 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1B) |
1965 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |
1966 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |
1967 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |
1968 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |
1969 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |
1970 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |
1971 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
1972 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
1973 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
1974 + (1<<V4L2_MPEG_VIDEO_H264_LEVEL_4_0)),
1975 + V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
1976 + V4L2_MPEG_VIDEO_H264_LEVEL_4_0, 1, NULL,
1977 + MMAL_PARAMETER_PROFILE,
1978 + &ctrl_set_video_encode_profile_level,
1979 + false
1980 + },
1981 + {
1982 + V4L2_CID_SCENE_MODE, MMAL_CONTROL_TYPE_STD_MENU,
1983 + -1, /* Min is computed at runtime */
1984 + V4L2_SCENE_MODE_TEXT,
1985 + V4L2_SCENE_MODE_NONE, 1, NULL,
1986 + MMAL_PARAMETER_PROFILE,
1987 + &ctrl_set_scene_mode,
1988 + false
1989 + },
1990 + {
1991 + V4L2_CID_MPEG_VIDEO_H264_I_PERIOD, MMAL_CONTROL_TYPE_STD,
1992 + 0, 0x7FFFFFFF, 60, 1, NULL,
1993 + MMAL_PARAMETER_INTRAPERIOD,
1994 + &ctrl_set_video_encode_param_output,
1995 + false
1996 },
1997 };
1998
1999 int bm2835_mmal_set_all_camera_controls(struct bm2835_mmal_dev *dev)
2000 {
2001 int c;
2002 - int ret;
2003 + int ret = 0;
2004
2005 for (c = 0; c < V4L2_CTRL_COUNT; c++) {
2006 if ((dev->ctrls[c]) && (v4l2_ctrls[c].setter)) {
2007 ret = v4l2_ctrls[c].setter(dev, dev->ctrls[c],
2008 &v4l2_ctrls[c]);
2009 - if (ret)
2010 + if (!v4l2_ctrls[c].ignore_errors && ret) {
2011 + v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
2012 + "Failed when setting default values for ctrl %d\n",
2013 + c);
2014 break;
2015 + }
2016 }
2017 }
2018 return ret;
2019 }
2020
2021 +int set_framerate_params(struct bm2835_mmal_dev *dev)
2022 +{
2023 + struct mmal_parameter_fps_range fps_range;
2024 + int ret;
2025 +
2026 + if ((dev->exposure_mode_active != MMAL_PARAM_EXPOSUREMODE_OFF) &&
2027 + (dev->exp_auto_priority)) {
2028 + /* Variable FPS. Define min FPS as 1fps.
2029 + * Max as max defined FPS.
2030 + */
2031 + fps_range.fps_low.num = 1;
2032 + fps_range.fps_low.den = 1;
2033 + fps_range.fps_high.num = dev->capture.timeperframe.denominator;
2034 + fps_range.fps_high.den = dev->capture.timeperframe.numerator;
2035 + } else {
2036 + /* Fixed FPS - set min and max to be the same */
2037 + fps_range.fps_low.num = fps_range.fps_high.num =
2038 + dev->capture.timeperframe.denominator;
2039 + fps_range.fps_low.den = fps_range.fps_high.den =
2040 + dev->capture.timeperframe.numerator;
2041 + }
2042 +
2043 + v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
2044 + "Set fps range to %d/%d to %d/%d\n",
2045 + fps_range.fps_low.num,
2046 + fps_range.fps_low.den,
2047 + fps_range.fps_high.num,
2048 + fps_range.fps_high.den
2049 + );
2050 +
2051 + ret = vchiq_mmal_port_parameter_set(dev->instance,
2052 + &dev->component[MMAL_COMPONENT_CAMERA]->
2053 + output[MMAL_CAMERA_PORT_PREVIEW],
2054 + MMAL_PARAMETER_FPS_RANGE,
2055 + &fps_range, sizeof(fps_range));
2056 + ret += vchiq_mmal_port_parameter_set(dev->instance,
2057 + &dev->component[MMAL_COMPONENT_CAMERA]->
2058 + output[MMAL_CAMERA_PORT_VIDEO],
2059 + MMAL_PARAMETER_FPS_RANGE,
2060 + &fps_range, sizeof(fps_range));
2061 + ret += vchiq_mmal_port_parameter_set(dev->instance,
2062 + &dev->component[MMAL_COMPONENT_CAMERA]->
2063 + output[MMAL_CAMERA_PORT_CAPTURE],
2064 + MMAL_PARAMETER_FPS_RANGE,
2065 + &fps_range, sizeof(fps_range));
2066 + if (ret)
2067 + v4l2_dbg(0, bcm2835_v4l2_debug, &dev->v4l2_dev,
2068 + "Failed to set fps ret %d\n",
2069 + ret);
2070 +
2071 + return ret;
2072 +
2073 +}
2074 +
2075 int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev,
2076 struct v4l2_ctrl_handler *hdl)
2077 {
2078 @@ -674,10 +1251,30 @@ int bm2835_mmal_init_controls(struct bm2
2079 break;
2080
2081 case MMAL_CONTROL_TYPE_STD_MENU:
2082 + {
2083 + int mask = ctrl->min;
2084 +
2085 + if (ctrl->id == V4L2_CID_SCENE_MODE) {
2086 + /* Special handling to work out the mask
2087 + * value based on the scene_configs array
2088 + * at runtime. Reduces the chance of
2089 + * mismatches.
2090 + */
2091 + int i;
2092 + mask = 1<<V4L2_SCENE_MODE_NONE;
2093 + for (i = 0;
2094 + i < ARRAY_SIZE(scene_configs);
2095 + i++) {
2096 + mask |= 1<<scene_configs[i].v4l2_scene;
2097 + }
2098 + mask = ~mask;
2099 + }
2100 +
2101 dev->ctrls[c] = v4l2_ctrl_new_std_menu(hdl,
2102 &bm2835_mmal_ctrl_ops, ctrl->id,
2103 - ctrl->max, ctrl->min, ctrl->def);
2104 + ctrl->max, mask, ctrl->def);
2105 break;
2106 + }
2107
2108 case MMAL_CONTROL_TYPE_INT_MENU:
2109 dev->ctrls[c] = v4l2_ctrl_new_int_menu(hdl,
2110 --- a/drivers/media/platform/bcm2835/mmal-common.h
2111 +++ b/drivers/media/platform/bcm2835/mmal-common.h
2112 @@ -26,6 +26,7 @@
2113 struct mmal_fmt {
2114 char *name;
2115 u32 fourcc; /* v4l2 format id */
2116 + int flags; /* v4l2 flags field */
2117 u32 mmal;
2118 int depth;
2119 u32 mmal_component; /* MMAL component index to be used to encode */
2120 --- a/drivers/media/platform/bcm2835/mmal-encodings.h
2121 +++ b/drivers/media/platform/bcm2835/mmal-encodings.h
2122 @@ -12,6 +12,8 @@
2123 * Simon Mellor <simellor@broadcom.com>
2124 * Luke Diamand <luked@broadcom.com>
2125 */
2126 +#ifndef MMAL_ENCODINGS_H
2127 +#define MMAL_ENCODINGS_H
2128
2129 #define MMAL_ENCODING_H264 MMAL_FOURCC('H', '2', '6', '4')
2130 #define MMAL_ENCODING_H263 MMAL_FOURCC('H', '2', '6', '3')
2131 @@ -27,6 +29,7 @@
2132 #define MMAL_ENCODING_VP6 MMAL_FOURCC('V', 'P', '6', ' ')
2133 #define MMAL_ENCODING_THEORA MMAL_FOURCC('T', 'H', 'E', 'O')
2134 #define MMAL_ENCODING_SPARK MMAL_FOURCC('S', 'P', 'R', 'K')
2135 +#define MMAL_ENCODING_MJPEG MMAL_FOURCC('M', 'J', 'P', 'G')
2136
2137 #define MMAL_ENCODING_JPEG MMAL_FOURCC('J', 'P', 'E', 'G')
2138 #define MMAL_ENCODING_GIF MMAL_FOURCC('G', 'I', 'F', ' ')
2139 @@ -91,3 +94,34 @@
2140 #define MMAL_ENCODING_VARIANT_H264_AVC1 MMAL_FOURCC('A', 'V', 'C', '1')
2141 /** Implicitly delineated NAL units without emulation prevention */
2142 #define MMAL_ENCODING_VARIANT_H264_RAW MMAL_FOURCC('R', 'A', 'W', ' ')
2143 +
2144 +
2145 +/** \defgroup MmalColorSpace List of pre-defined video color spaces
2146 + * This defines a list of common color spaces. This list isn't exhaustive and
2147 + * is only provided as a convenience to avoid clients having to use FourCC
2148 + * codes directly. However components are allowed to define and use their own
2149 + * FourCC codes.
2150 + */
2151 +/* @{ */
2152 +
2153 +/** Unknown color space */
2154 +#define MMAL_COLOR_SPACE_UNKNOWN 0
2155 +/** ITU-R BT.601-5 [SDTV] */
2156 +#define MMAL_COLOR_SPACE_ITUR_BT601 MMAL_FOURCC('Y', '6', '0', '1')
2157 +/** ITU-R BT.709-3 [HDTV] */
2158 +#define MMAL_COLOR_SPACE_ITUR_BT709 MMAL_FOURCC('Y', '7', '0', '9')
2159 +/** JPEG JFIF */
2160 +#define MMAL_COLOR_SPACE_JPEG_JFIF MMAL_FOURCC('Y', 'J', 'F', 'I')
2161 +/** Title 47 Code of Federal Regulations (2003) 73.682 (a) (20) */
2162 +#define MMAL_COLOR_SPACE_FCC MMAL_FOURCC('Y', 'F', 'C', 'C')
2163 +/** Society of Motion Picture and Television Engineers 240M (1999) */
2164 +#define MMAL_COLOR_SPACE_SMPTE240M MMAL_FOURCC('Y', '2', '4', '0')
2165 +/** ITU-R BT.470-2 System M */
2166 +#define MMAL_COLOR_SPACE_BT470_2_M MMAL_FOURCC('Y', '_', '_', 'M')
2167 +/** ITU-R BT.470-2 System BG */
2168 +#define MMAL_COLOR_SPACE_BT470_2_BG MMAL_FOURCC('Y', '_', 'B', 'G')
2169 +/** JPEG JFIF, but with 16..255 luma */
2170 +#define MMAL_COLOR_SPACE_JFIF_Y16_255 MMAL_FOURCC('Y', 'Y', '1', '6')
2171 +/* @} MmalColorSpace List */
2172 +
2173 +#endif /* MMAL_ENCODINGS_H */
2174 --- a/drivers/media/platform/bcm2835/mmal-parameters.h
2175 +++ b/drivers/media/platform/bcm2835/mmal-parameters.h
2176 @@ -57,7 +57,8 @@ enum mmal_parameter_common_type {
2177 MMAL_PARAMETER_SEEK, /**< MMAL_PARAMETER_SEEK_T */
2178 MMAL_PARAMETER_POWERMON_ENABLE, /**< MMAL_PARAMETER_BOOLEAN_T */
2179 MMAL_PARAMETER_LOGGING, /**< MMAL_PARAMETER_LOGGING_T */
2180 - MMAL_PARAMETER_SYSTEM_TIME /**< MMAL_PARAMETER_UINT64_T */
2181 + MMAL_PARAMETER_SYSTEM_TIME, /**< MMAL_PARAMETER_UINT64_T */
2182 + MMAL_PARAMETER_NO_IMAGE_PADDING /**< MMAL_PARAMETER_BOOLEAN_T */
2183 };
2184
2185 /* camera parameters */
2186 @@ -161,6 +162,13 @@ enum mmal_parameter_camera_type {
2187 MMAL_PARAMETER_SW_SHARPEN_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
2188 MMAL_PARAMETER_FLASH_REQUIRED, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
2189 MMAL_PARAMETER_SW_SATURATION_DISABLE, /**< @ref MMAL_PARAMETER_BOOLEAN_T */
2190 + MMAL_PARAMETER_SHUTTER_SPEED, /**< Takes a @ref MMAL_PARAMETER_UINT32_T */
2191 + MMAL_PARAMETER_CUSTOM_AWB_GAINS, /**< Takes a @ref MMAL_PARAMETER_AWB_GAINS_T */
2192 +};
2193 +
2194 +struct mmal_parameter_rational {
2195 + s32 num; /**< Numerator */
2196 + s32 den; /**< Denominator */
2197 };
2198
2199 enum mmal_parameter_camera_config_timestamp_mode {
2200 @@ -176,6 +184,14 @@ enum mmal_parameter_camera_config_timest
2201 */
2202 };
2203
2204 +struct mmal_parameter_fps_range {
2205 + /**< Low end of the permitted framerate range */
2206 + struct mmal_parameter_rational fps_low;
2207 + /**< High end of the permitted framerate range */
2208 + struct mmal_parameter_rational fps_high;
2209 +};
2210 +
2211 +
2212 /* camera configuration parameter */
2213 struct mmal_parameter_camera_config {
2214 /* Parameters for setting up the image pools */
2215 @@ -270,6 +286,19 @@ enum mmal_parameter_imagefx {
2216 MMAL_PARAM_IMAGEFX_CARTOON,
2217 };
2218
2219 +enum MMAL_PARAM_FLICKERAVOID_T {
2220 + MMAL_PARAM_FLICKERAVOID_OFF,
2221 + MMAL_PARAM_FLICKERAVOID_AUTO,
2222 + MMAL_PARAM_FLICKERAVOID_50HZ,
2223 + MMAL_PARAM_FLICKERAVOID_60HZ,
2224 + MMAL_PARAM_FLICKERAVOID_MAX = 0x7FFFFFFF
2225 +};
2226 +
2227 +struct mmal_parameter_awbgains {
2228 + struct mmal_parameter_rational r_gain; /**< Red gain */
2229 + struct mmal_parameter_rational b_gain; /**< Blue gain */
2230 +};
2231 +
2232 /** Manner of video rate control */
2233 enum mmal_parameter_rate_control_mode {
2234 MMAL_VIDEO_RATECONTROL_DEFAULT,
2235 @@ -279,6 +308,85 @@ enum mmal_parameter_rate_control_mode {
2236 MMAL_VIDEO_RATECONTROL_CONSTANT_SKIP_FRAMES
2237 };
2238
2239 +enum mmal_video_profile {
2240 + MMAL_VIDEO_PROFILE_H263_BASELINE,
2241 + MMAL_VIDEO_PROFILE_H263_H320CODING,
2242 + MMAL_VIDEO_PROFILE_H263_BACKWARDCOMPATIBLE,
2243 + MMAL_VIDEO_PROFILE_H263_ISWV2,
2244 + MMAL_VIDEO_PROFILE_H263_ISWV3,
2245 + MMAL_VIDEO_PROFILE_H263_HIGHCOMPRESSION,
2246 + MMAL_VIDEO_PROFILE_H263_INTERNET,
2247 + MMAL_VIDEO_PROFILE_H263_INTERLACE,
2248 + MMAL_VIDEO_PROFILE_H263_HIGHLATENCY,
2249 + MMAL_VIDEO_PROFILE_MP4V_SIMPLE,
2250 + MMAL_VIDEO_PROFILE_MP4V_SIMPLESCALABLE,
2251 + MMAL_VIDEO_PROFILE_MP4V_CORE,
2252 + MMAL_VIDEO_PROFILE_MP4V_MAIN,
2253 + MMAL_VIDEO_PROFILE_MP4V_NBIT,
2254 + MMAL_VIDEO_PROFILE_MP4V_SCALABLETEXTURE,
2255 + MMAL_VIDEO_PROFILE_MP4V_SIMPLEFACE,
2256 + MMAL_VIDEO_PROFILE_MP4V_SIMPLEFBA,
2257 + MMAL_VIDEO_PROFILE_MP4V_BASICANIMATED,
2258 + MMAL_VIDEO_PROFILE_MP4V_HYBRID,
2259 + MMAL_VIDEO_PROFILE_MP4V_ADVANCEDREALTIME,
2260 + MMAL_VIDEO_PROFILE_MP4V_CORESCALABLE,
2261 + MMAL_VIDEO_PROFILE_MP4V_ADVANCEDCODING,
2262 + MMAL_VIDEO_PROFILE_MP4V_ADVANCEDCORE,
2263 + MMAL_VIDEO_PROFILE_MP4V_ADVANCEDSCALABLE,
2264 + MMAL_VIDEO_PROFILE_MP4V_ADVANCEDSIMPLE,
2265 + MMAL_VIDEO_PROFILE_H264_BASELINE,
2266 + MMAL_VIDEO_PROFILE_H264_MAIN,
2267 + MMAL_VIDEO_PROFILE_H264_EXTENDED,
2268 + MMAL_VIDEO_PROFILE_H264_HIGH,
2269 + MMAL_VIDEO_PROFILE_H264_HIGH10,
2270 + MMAL_VIDEO_PROFILE_H264_HIGH422,
2271 + MMAL_VIDEO_PROFILE_H264_HIGH444,
2272 + MMAL_VIDEO_PROFILE_H264_CONSTRAINED_BASELINE,
2273 + MMAL_VIDEO_PROFILE_DUMMY = 0x7FFFFFFF
2274 +};
2275 +
2276 +enum mmal_video_level {
2277 + MMAL_VIDEO_LEVEL_H263_10,
2278 + MMAL_VIDEO_LEVEL_H263_20,
2279 + MMAL_VIDEO_LEVEL_H263_30,
2280 + MMAL_VIDEO_LEVEL_H263_40,
2281 + MMAL_VIDEO_LEVEL_H263_45,
2282 + MMAL_VIDEO_LEVEL_H263_50,
2283 + MMAL_VIDEO_LEVEL_H263_60,
2284 + MMAL_VIDEO_LEVEL_H263_70,
2285 + MMAL_VIDEO_LEVEL_MP4V_0,
2286 + MMAL_VIDEO_LEVEL_MP4V_0b,
2287 + MMAL_VIDEO_LEVEL_MP4V_1,
2288 + MMAL_VIDEO_LEVEL_MP4V_2,
2289 + MMAL_VIDEO_LEVEL_MP4V_3,
2290 + MMAL_VIDEO_LEVEL_MP4V_4,
2291 + MMAL_VIDEO_LEVEL_MP4V_4a,
2292 + MMAL_VIDEO_LEVEL_MP4V_5,
2293 + MMAL_VIDEO_LEVEL_MP4V_6,
2294 + MMAL_VIDEO_LEVEL_H264_1,
2295 + MMAL_VIDEO_LEVEL_H264_1b,
2296 + MMAL_VIDEO_LEVEL_H264_11,
2297 + MMAL_VIDEO_LEVEL_H264_12,
2298 + MMAL_VIDEO_LEVEL_H264_13,
2299 + MMAL_VIDEO_LEVEL_H264_2,
2300 + MMAL_VIDEO_LEVEL_H264_21,
2301 + MMAL_VIDEO_LEVEL_H264_22,
2302 + MMAL_VIDEO_LEVEL_H264_3,
2303 + MMAL_VIDEO_LEVEL_H264_31,
2304 + MMAL_VIDEO_LEVEL_H264_32,
2305 + MMAL_VIDEO_LEVEL_H264_4,
2306 + MMAL_VIDEO_LEVEL_H264_41,
2307 + MMAL_VIDEO_LEVEL_H264_42,
2308 + MMAL_VIDEO_LEVEL_H264_5,
2309 + MMAL_VIDEO_LEVEL_H264_51,
2310 + MMAL_VIDEO_LEVEL_DUMMY = 0x7FFFFFFF
2311 +};
2312 +
2313 +struct mmal_parameter_video_profile {
2314 + enum mmal_video_profile profile;
2315 + enum mmal_video_level level;
2316 +};
2317 +
2318 /* video parameters */
2319
2320 enum mmal_parameter_video_type {
2321 @@ -407,7 +515,16 @@ enum mmal_parameter_video_type {
2322 MMAL_PARAMETER_VIDEO_DRM_PROTECT_BUFFER,
2323
2324 /** @ref MMAL_PARAMETER_BYTES_T */
2325 - MMAL_PARAMETER_VIDEO_DECODE_CONFIG_VD3
2326 + MMAL_PARAMETER_VIDEO_DECODE_CONFIG_VD3,
2327 +
2328 + /**< @ref MMAL_PARAMETER_BOOLEAN_T */
2329 + MMAL_PARAMETER_VIDEO_ENCODE_H264_VCL_HRD_PARAMETERS,
2330 +
2331 + /**< @ref MMAL_PARAMETER_BOOLEAN_T */
2332 + MMAL_PARAMETER_VIDEO_ENCODE_H264_LOW_DELAY_HRD_FLAG,
2333 +
2334 + /**< @ref MMAL_PARAMETER_BOOLEAN_T */
2335 + MMAL_PARAMETER_VIDEO_ENCODE_INLINE_HEADER
2336 };
2337
2338 /** Valid mirror modes */
2339 --- a/drivers/media/platform/bcm2835/mmal-vchiq.c
2340 +++ b/drivers/media/platform/bcm2835/mmal-vchiq.c
2341 @@ -742,7 +742,7 @@ static int send_synchronous_mmal_msg(str
2342 return ret;
2343 }
2344
2345 - ret = wait_for_completion_timeout(&msg_context.u.sync.cmplt, HZ);
2346 + ret = wait_for_completion_timeout(&msg_context.u.sync.cmplt, 3*HZ);
2347 if (ret <= 0) {
2348 pr_err("error %d waiting for sync completion\n", ret);
2349 if (ret == 0)
2350 @@ -1326,7 +1326,7 @@ static int port_parameter_get(struct vch
2351 memcpy(value, &rmsg->u.port_parameter_get_reply.value,
2352 rmsg->u.port_parameter_get_reply.size);
2353
2354 - pr_info("%s:result:%d component:0x%x port:%d parameter:%d\n", __func__,
2355 + pr_debug("%s:result:%d component:0x%x port:%d parameter:%d\n", __func__,
2356 ret, port->component->handle, port->handle, parameter_id);
2357
2358 release_msg:
OpenWrt Source Repository