diff options
Diffstat (limited to 'isp')
| -rw-r--r-- | isp/omap3isp-priv.h | 1 | ||||
| -rw-r--r-- | isp/omap3isp.c | 10 |
2 files changed, 3 insertions, 8 deletions
diff --git a/isp/omap3isp-priv.h b/isp/omap3isp-priv.h index b143b13..e9dae0c 100644 --- a/isp/omap3isp-priv.h +++ b/isp/omap3isp-priv.h @@ -121,7 +121,6 @@ struct omap3_isp_device { struct media_entity *ccdc; struct media_entity *preview; - struct media_entity *resizer; struct media_entity *sensor; struct v4l2_mbus_framefmt sensor_format; diff --git a/isp/omap3isp.c b/isp/omap3isp.c index 24d956c..5a11135 100644 --- a/isp/omap3isp.c +++ b/isp/omap3isp.c @@ -587,9 +587,8 @@ struct omap3_isp_device *omap3_isp_open(const char *devname, */ isp->ccdc = media_get_entity_by_name(isp->mdev, ENTITY_CCDC); isp->preview = media_get_entity_by_name(isp->mdev, ENTITY_PREVIEW); - isp->resizer = media_get_entity_by_name(isp->mdev, ENTITY_RESIZER); - if (isp->ccdc == NULL || isp->preview == NULL || isp->resizer == NULL) { + if (isp->ccdc == NULL || isp->preview == NULL) { printf("error: unable to locate one or more ISP entities.\n"); goto error; } @@ -835,23 +834,20 @@ int omap3_isp_snapshot_setup(struct omap3_isp_device *isp, struct v4l2_mbus_framefmt *ofmt) { struct v4l2_video_buffer buffer; - struct media_entity *entity; unsigned int i; int ret; - /* Locate the entity at the end of the pipeline. Use the CCDC for raw - * capture and the resizer for YUV capture. + /* Build the pipeline. Capture on the CCDC output for raw formats and on + * on the resizer output for YUV formats. */ switch (ofmt->code) { case V4L2_MBUS_FMT_UYVY8_1X16: case V4L2_MBUS_FMT_YUYV8_1X16: - entity = isp->resizer; ret = omap3_isp_pipeline_build(isp, &isp->snapshot, ENTITY_SENSOR, ENTITY_CCDC, ENTITY_PREVIEW, ENTITY_RESIZER, ENTITY_RESIZER_OUTPUT, NULL); break; default: - entity = isp->ccdc; ret = omap3_isp_pipeline_build(isp, &isp->snapshot, ENTITY_SENSOR, ENTITY_CCDC, ENTITY_CCDC_OUTPUT, NULL); break; |