Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 563df3d0 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: Unify selection flags 



Unify flags on the selection interfaces on V4L2 and V4L2 subdev. Flags are
very similar to targets in this case: there are more similarities than
differences between the two interfaces.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 64b9ce83

drivers/media/video/omap3isp/ispccdc.c

+1 −1
Original line number Diff line number Diff line
@@ -2064,7 +2064,7 @@ static int ccdc_set_selection(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 
	 * pad. If the KEEP_CONFIG flag is set, just return the current crop

	 * rectangle.

	 */

	if (sel->flags & V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG) {

	if (sel->flags & V4L2_SEL_FLAG_KEEP_CONFIG) {

		sel->r = *__ccdc_get_crop(ccdc, fh, sel->which);

		return 0;

	}

drivers/media/video/omap3isp/isppreview.c

+1 −1
Original line number Diff line number Diff line
@@ -2000,7 +2000,7 @@ static int preview_set_selection(struct v4l2_subdev *sd, 
	 * pad. If the KEEP_CONFIG flag is set, just return the current crop

	 * rectangle.

	 */

	if (sel->flags & V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG) {

	if (sel->flags & V4L2_SEL_FLAG_KEEP_CONFIG) {

		sel->r = *__preview_get_crop(prev, fh, sel->which);

		return 0;

	}

drivers/media/video/smiapp/smiapp-core.c

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "smiapp.h"



#define SMIAPP_ALIGN_DIM(dim, flags)	\

	((flags) & V4L2_SUBDEV_SEL_FLAG_SIZE_GE	\

	((flags) & V4L2_SEL_FLAG_GE	\

	 ? ALIGN((dim), 2)		\

	 : (dim) & ~1)
@@ -1747,14 +1747,14 @@ static int scaling_goodness(struct v4l2_subdev *subdev, int w, int ask_w, 
	h &= ~1;

	ask_h &= ~1;



	if (flags & V4L2_SUBDEV_SEL_FLAG_SIZE_GE) {

	if (flags & V4L2_SEL_FLAG_GE) {

		if (w < ask_w)

			val -= SCALING_GOODNESS;

		if (h < ask_h)

			val -= SCALING_GOODNESS;

	}



	if (flags & V4L2_SUBDEV_SEL_FLAG_SIZE_LE) {

	if (flags & V4L2_SEL_FLAG_LE) {

		if (w > ask_w)

			val -= SCALING_GOODNESS;

		if (h > ask_h)

include/linux/v4l2-common.h

+17 −3
Original line number Diff line number Diff line
@@ -29,7 +29,11 @@ 
#ifndef __V4L2_COMMON__

#define __V4L2_COMMON__



/* Selection target definitions */

/*

 *

 * Selection interface definitions

 *

 */



/* Current cropping area */

#define V4L2_SEL_TGT_CROP		0x0000
@@ -46,7 +50,7 @@ 
/* Current composing area plus all padding pixels */

#define V4L2_SEL_TGT_COMPOSE_PADDED	0x0103



/* Backward compatibility definitions */

/* Backward compatibility target definitions --- to be removed. */

#define V4L2_SEL_TGT_CROP_ACTIVE	V4L2_SEL_TGT_CROP

#define V4L2_SEL_TGT_COMPOSE_ACTIVE	V4L2_SEL_TGT_COMPOSE

#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL \
@@ -54,4 +58,14 @@ 
#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL \

	V4L2_SEL_TGT_COMPOSE



/* Selection flags */

#define V4L2_SEL_FLAG_GE		(1 << 0)

#define V4L2_SEL_FLAG_LE		(1 << 1)

#define V4L2_SEL_FLAG_KEEP_CONFIG	(1 << 2)



/* Backward compatibility flag definitions --- to be removed. */

#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE	V4L2_SEL_FLAG_GE

#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE	V4L2_SEL_FLAG_LE

#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG



#endif /* __V4L2_COMMON__ */

include/linux/v4l2-subdev.h

+1 −5
Original line number Diff line number Diff line
@@ -124,10 +124,6 @@ struct v4l2_subdev_frame_interval_enum { 
	__u32 reserved[9];

};



#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE			(1 << 0)

#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE			(1 << 1)

#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG		(1 << 2)



/**

 * struct v4l2_subdev_selection - selection info

 *
@@ -135,7 +131,7 @@ struct v4l2_subdev_frame_interval_enum { 
 * @pad: pad number, as reported by the media API

 * @target: Selection target, used to choose one of possible rectangles,

 *	    defined in v4l2-common.h; V4L2_SEL_TGT_* .

 * @flags: constraint flags

 * @flags: constraint flags, defined in v4l2-common.h; V4L2_SEL_FLAG_*.

 * @r: coordinates of the selection window

 * @reserved: for future use, set to zero for now

 *