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

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

[media] ivtv: add IVTV_IOC_PASSTHROUGH_MODE 



With this private ioctl it is possible to use the ivtv decoder without
requiring the dvb/video.h and dvb/audio.h headers.

Eventually support for those DVB APIs will be dropped from ivtv.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 85eeece7

drivers/media/video/ivtv/ivtv-ioctl.c

+8 −0
Original line number Diff line number Diff line
@@ -1625,6 +1625,12 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) 
		return ivtv_yuv_prep_frame(itv, args);

	}



	case IVTV_IOC_PASSTHROUGH_MODE:

		IVTV_DEBUG_IOCTL("IVTV_IOC_PASSTHROUGH_MODE\n");

		if (!(itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT))

			return -EINVAL;

		return ivtv_passthrough_mode(itv, *(int *)arg != 0);



	case VIDEO_GET_PTS: {

		s64 *pts = arg;

		s64 frame;
@@ -1786,6 +1792,7 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio, 


	if (!valid_prio) {

		switch (cmd) {

		case IVTV_IOC_PASSTHROUGH_MODE:

		case VIDEO_PLAY:

		case VIDEO_STOP:

		case VIDEO_FREEZE:
@@ -1811,6 +1818,7 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio, 
	}



	case IVTV_IOC_DMA_FRAME:

	case IVTV_IOC_PASSTHROUGH_MODE:

	case VIDEO_GET_PTS:

	case VIDEO_GET_FRAME_COUNT:

	case VIDEO_GET_EVENT:

include/linux/ivtv.h

+5 −1
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ struct ivtv_dma_frame { 


#define IVTV_IOC_DMA_FRAME		_IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtv_dma_frame)



/* Select the passthrough mode (if the argument is non-zero). In the passthrough

   mode the output of the encoder is passed immediately into the decoder. */

#define IVTV_IOC_PASSTHROUGH_MODE	_IOW ('V', BASE_VIDIOC_PRIVATE+1, int)



/* Deprecated defines: applications should use the defines from videodev2.h */

#define IVTV_SLICED_TYPE_TELETEXT_B     V4L2_MPEG_VBI_IVTV_TELETEXT_B

#define IVTV_SLICED_TYPE_CAPTION_525    V4L2_MPEG_VBI_IVTV_CAPTION_525