target/linux/brcm2708/patches-3.18/0028-V4L2-Fixes-from-6by9.patch

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