|
@@ -328,11 +328,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
|
|
|
pr_debug("Grab another frame");
|
|
|
vchiq_mmal_port_parameter_set(
|
|
|
instance,
|
|
|
- dev->capture.
|
|
|
- camera_port,
|
|
|
+ dev->capture.camera_port,
|
|
|
MMAL_PARAMETER_CAPTURE,
|
|
|
- &dev->capture.
|
|
|
- frame_count,
|
|
|
+ &dev->capture.frame_count,
|
|
|
sizeof(dev->capture.frame_count));
|
|
|
}
|
|
|
} else {
|
|
@@ -368,11 +366,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
|
|
|
"Grab another frame as buffer has EOS");
|
|
|
vchiq_mmal_port_parameter_set(
|
|
|
instance,
|
|
|
- dev->capture.
|
|
|
- camera_port,
|
|
|
+ dev->capture.camera_port,
|
|
|
MMAL_PARAMETER_CAPTURE,
|
|
|
- &dev->capture.
|
|
|
- frame_count,
|
|
|
+ &dev->capture.frame_count,
|
|
|
sizeof(dev->capture.frame_count));
|
|
|
}
|
|
|
} else {
|
|
@@ -1194,8 +1190,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
|
|
|
port->current_buffer.size =
|
|
|
(f->fmt.pix.sizeimage <
|
|
|
(100 << 10))
|
|
|
- ? (100 << 10) : f->fmt.pix.
|
|
|
- sizeimage;
|
|
|
+ ? (100 << 10)
|
|
|
+ : f->fmt.pix.sizeimage;
|
|
|
}
|
|
|
v4l2_dbg(1, bcm2835_v4l2_debug,
|
|
|
&dev->v4l2_dev,
|