Hi Sergei, On Tuesday 26 Apr 2016 21:09:10 Sergei Shtylyov wrote: > On 04/26/2016 12:36 AM, Laurent Pinchart wrote: > > Turn the helper into a function that can retrieve crop and compose > > selection rectangles. > > > > Signed-off-by: Laurent Pinchart > > <[email protected]> > > --- > > > > drivers/media/platform/vsp1/vsp1_entity.c | 24 ++++++++++++++++++++---- > > drivers/media/platform/vsp1/vsp1_entity.h | 6 +++--- > > drivers/media/platform/vsp1/vsp1_rpf.c | 7 ++++--- > > 3 files changed, 27 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/media/platform/vsp1/vsp1_entity.c > > b/drivers/media/platform/vsp1/vsp1_entity.c index > > f60d7926d53f..8c49a74381a1 100644 > > --- a/drivers/media/platform/vsp1/vsp1_entity.c > > +++ b/drivers/media/platform/vsp1/vsp1_entity.c > > @@ -87,12 +87,28 @@ vsp1_entity_get_pad_format(struct vsp1_entity *entity, > > > > return v4l2_subdev_get_try_format(&entity->subdev, cfg, pad); > > > > } > > > > +/** > > + * vsp1_entity_get_pad_selection - Get a pad selection from storage for > > entity + * @entity: the entity > > + * @cfg: the configuration storage > > + * @pad: the pad number > > + * @target: the selection target > > + * > > + * Return the selection rectangle stored in the given configuration for > > an > > + * entity's pad. The configuration can be an ACTIVE or TRY configuration. > > The + * selection target can be COMPOSE or CROP. > > + */ > > > > struct v4l2_rect * > > > > -vsp1_entity_get_pad_compose(struct vsp1_entity *entity, > > - struct v4l2_subdev_pad_config *cfg, > > - unsigned int pad) > > +vsp1_entity_get_pad_selection(struct vsp1_entity *entity, > > + struct v4l2_subdev_pad_config *cfg, > > + unsigned int pad, unsigned int target) > > > > { > > > > - return v4l2_subdev_get_try_compose(&entity->subdev, cfg, pad); > > + if (target == V4L2_SEL_TGT_COMPOSE) > > + return v4l2_subdev_get_try_compose(&entity->subdev, cfg, pad); > > + else if (target == V4L2_SEL_TGT_CROP) > > + return v4l2_subdev_get_try_crop(&entity->subdev, cfg, pad); > > + else > > + return NULL; > > How about *switch* instead?
That's certainly an option. It don't think it would make a big difference, but I'll change it nonetheless. I won't post a new of the series now just for that change though, but I'll include it when I'll do. -- Regards, Laurent Pinchart
