diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-07-25 12:10:23 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-09-04 15:38:29 +0200 |
| commit | 42dba873f0da63e8ef40b233438eaf623515e294 (patch) | |
| tree | 5b3db5ff22c16b78ec951195e9f0d379ecac1152 /isp | |
| parent | bedefdf34cfe948169136865a13a82ba57eaef51 (diff) | |
omap3isp: Move scaler field from omap3_isp_video to omap3_isp_pipeline
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'isp')
| -rw-r--r-- | isp/omap3isp-priv.h | 4 | ||||
| -rw-r--r-- | isp/omap3isp.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/isp/omap3isp-priv.h b/isp/omap3isp-priv.h index 7864c63..b4d2114 100644 --- a/isp/omap3isp-priv.h +++ b/isp/omap3isp-priv.h @@ -65,7 +65,6 @@ struct omap3_isp_entity { * @video: V4L2 capture device * @format: Current video format * @pool: Buffers pool - * @scaler: Whether scaling should be performed on the ISP or the sensor * @dequeued: Bitmask of dequeued buffers that belong to the application * @queued: Number of buffers queued to the driver * @running: Whether video capture is running on the device @@ -75,7 +74,6 @@ struct omap3_isp_video { struct v4l2_device *video; struct v4l2_mbus_framefmt format; struct v4l2_buffers_pool *pool; - enum omap3_isp_scaler scaler; unsigned int dequeued; unsigned int queued; bool running; @@ -86,10 +84,12 @@ struct omap3_isp_video { /* * struct omap3_isp_pipeline - OMAP3 pipeline * @entitites: Entities in the pipeline + * @scaler: Whether scaling should be performed on the ISP or the sensor * @output: Video device at the output of the pipeline */ struct omap3_isp_pipeline { struct list_entry entities; + enum omap3_isp_scaler scaler; struct omap3_isp_video *output; }; diff --git a/isp/omap3isp.c b/isp/omap3isp.c index 8a5acc8..7bd58c8 100644 --- a/isp/omap3isp.c +++ b/isp/omap3isp.c @@ -498,11 +498,11 @@ int omap3_isp_viewfinder_setup(struct omap3_isp_device *isp, return ret; } - isp->viewfinder.output->scaler = OMAP3_ISP_SCALER_ISP; + isp->viewfinder.scaler = OMAP3_ISP_SCALER_ISP; /* Try the format. */ ret = omap3_isp_pipeline_try_format(isp, &isp->viewfinder, ofmt, - isp->viewfinder.output->scaler); + isp->viewfinder.scaler); if (ret < 0) return ret; @@ -557,10 +557,10 @@ int omap3_isp_viewfinder_set_scaler(struct omap3_isp_device *isp, struct v4l2_mbus_framefmt format; int ret; - if (isp->viewfinder.output->scaler == scaler) + if (isp->viewfinder.scaler == scaler) return 0; - isp->viewfinder.output->scaler = scaler; + isp->viewfinder.scaler = scaler; /* If omap3_isp_viewfinder_setup() hasn't been called yet return now. */ if (isp->viewfinder.output->format.width == 0 || @@ -569,7 +569,7 @@ int omap3_isp_viewfinder_set_scaler(struct omap3_isp_device *isp, format = isp->viewfinder.output->format; ret = omap3_isp_pipeline_try_format(isp, &isp->viewfinder, &format, - isp->viewfinder.output->scaler); + isp->viewfinder.scaler); if (ret < 0) return ret; @@ -718,7 +718,7 @@ int omap3_isp_snapshot_setup(struct omap3_isp_device *isp, return ret; } - isp->snapshot.output->scaler = OMAP3_ISP_SCALER_ISP; + isp->snapshot.scaler = OMAP3_ISP_SCALER_ISP; /* Try the format. */ ret = omap3_isp_pipeline_try_format(isp, &isp->snapshot, ofmt, |