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

Commit c1d7f4f1 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8524): videodev: copy the VID_TYPE defines to videodev.h 



The VID_TYPE defines are V4L1 specific, so copy them back to videodev.h.
In videodev2.h ensure that they are not used in the kernel (you need
to include videodev.h instead) and mark them are deprecated.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0ea6bc8d

include/linux/videodev.h

+15 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,21 @@ 




#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)

#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)





#define VID_TYPE_CAPTURE	1	/* Can capture */

#define VID_TYPE_TUNER		2	/* Can tune */

#define VID_TYPE_TELETEXT	4	/* Does teletext */

#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */

#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */

#define VID_TYPE_CLIPPING	32	/* Can clip */

#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */

#define VID_TYPE_SCALES		128	/* Scalable */

#define VID_TYPE_MONOCHROME	256	/* Monochrome only */

#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */

#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */

#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */

#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */

#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */



struct video_capability

struct video_capability

{

{

	char name[32];

	char name[32];

include/linux/videodev2.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -71,6 +71,11 @@ 
 */

 */

#define VIDEO_MAX_FRAME               32

#define VIDEO_MAX_FRAME               32





#ifndef __KERNEL__



/* These defines are V4L1 specific and should not be used with the V4L2 API!

   They will be removed from this header in the future. */



#define VID_TYPE_CAPTURE	1	/* Can capture */

#define VID_TYPE_CAPTURE	1	/* Can capture */

#define VID_TYPE_TUNER		2	/* Can tune */

#define VID_TYPE_TUNER		2	/* Can tune */

#define VID_TYPE_TELETEXT	4	/* Does teletext */

#define VID_TYPE_TELETEXT	4	/* Does teletext */
@@ -85,6 +90,7 @@ 
#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */

#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */

#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */

#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */

#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */

#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */

#endif





/*

/*

 *	M I S C E L L A N E O U S

 *	M I S C E L L A N E O U S