leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: bcm2835-camera: Move video component setup in its own function

Browse Source 
The function mmal_setup_components has to many indention levels. So move
the setup code for video component in its own function.

Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1585485901-10172-7-git-send-email-stefan.wahren@i2se.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stefan Wahren 2020-03-29 14:44:58 +02:00 committed by Greg Kroah-Hartman
parent 3c0b37483b
commit 1a59532382
1 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
View File

@ -1001,6 +1001,53 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
return 0;
}
static int mmal_setup_video_component(struct bm2835_mmal_dev *dev,
struct v4l2_format *f)
{
bool overlay_enabled = !!dev->component[COMP_PREVIEW]->enabled;
struct vchiq_mmal_port *preview_port;
int ret;
preview_port = &dev->component[COMP_CAMERA]->output[CAM_PORT_PREVIEW];
/* Preview and encode ports need to match on resolution */
if (overlay_enabled) {
/* Need to disable the overlay before we can update
* the resolution
*/
ret = vchiq_mmal_port_disable(dev->instance, preview_port);
if (!ret) {
ret = vchiq_mmal_port_connect_tunnel(dev->instance,
preview_port,
NULL);
}
}
preview_port->es.video.width = f->fmt.pix.width;
preview_port->es.video.height = f->fmt.pix.height;
preview_port->es.video.crop.x = 0;
preview_port->es.video.crop.y = 0;
preview_port->es.video.crop.width = f->fmt.pix.width;
preview_port->es.video.crop.height = f->fmt.pix.height;
preview_port->es.video.frame_rate.num =
dev->capture.timeperframe.denominator;
preview_port->es.video.frame_rate.den =
dev->capture.timeperframe.numerator;
ret = vchiq_mmal_port_set_format(dev->instance, preview_port);
if (overlay_enabled) {
ret = vchiq_mmal_port_connect_tunnel(dev->instance,
preview_port,
&dev->component[COMP_PREVIEW]->input[0]);
if (ret)
return ret;
ret = vchiq_mmal_port_enable(dev->instance, preview_port, NULL);
}
return ret;
}
static int mmal_setup_encode_component(struct bm2835_mmal_dev *dev,
struct v4l2_format *f,
struct vchiq_mmal_port *port,
@ -1184,46 +1231,7 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
if (!ret &&
camera_port ==
&dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO]) {
bool overlay_enabled =
!!dev->component[COMP_PREVIEW]->enabled;
struct vchiq_mmal_port *preview_port =
&dev->component[COMP_CAMERA]->output[CAM_PORT_PREVIEW];
/* Preview and encode ports need to match on resolution */
if (overlay_enabled) {
/* Need to disable the overlay before we can update
* the resolution
*/
ret =
vchiq_mmal_port_disable(dev->instance,
preview_port);
if (!ret)
ret =
vchiq_mmal_port_connect_tunnel(
dev->instance,
preview_port,
NULL);
}
preview_port->es.video.width = f->fmt.pix.width;
preview_port->es.video.height = f->fmt.pix.height;
preview_port->es.video.crop.x = 0;
preview_port->es.video.crop.y = 0;
preview_port->es.video.crop.width = f->fmt.pix.width;
preview_port->es.video.crop.height = f->fmt.pix.height;
preview_port->es.video.frame_rate.num =
dev->capture.timeperframe.denominator;
preview_port->es.video.frame_rate.den =
dev->capture.timeperframe.numerator;
ret = vchiq_mmal_port_set_format(dev->instance, preview_port);
if (overlay_enabled) {
ret = vchiq_mmal_port_connect_tunnel(
dev->instance,
preview_port,
&dev->component[COMP_PREVIEW]->input[0]);
if (!ret)
ret = vchiq_mmal_port_enable(dev->instance,
preview_port,
NULL);
}
ret = mmal_setup_video_component(dev, f);
}
if (ret) {