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

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

V4L/DVB (6086): ivtv: fix output mode processing: UDMA_YUV wasn't cleared 



- Always clear when stopping the decoder
- Clear if the filehandle that is being close was used for UDMA_YUV output.

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

drivers/media/video/ivtv/ivtv-driver.h

+1 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ struct ivtv_stream { 
struct ivtv_open_id {

	u32 open_id;

	int type;

	int yuv_frames;

	enum v4l2_priority prio;

	struct ivtv *itv;

};

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

+2 −5
Original line number Diff line number Diff line
@@ -757,6 +757,7 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts) 
		IVTV_DEBUG_INFO("close stopping decode\n");



		ivtv_stop_v4l2_decode_stream(s, flags, pts);

		itv->output_mode = OUT_NONE;

	}

	clear_bit(IVTV_F_S_APPL_IO, &s->s_flags);

	clear_bit(IVTV_F_S_STREAMOFF, &s->s_flags);
@@ -764,11 +765,7 @@ static void ivtv_stop_decoding(struct ivtv_open_id *id, int flags, u64 pts) 
		/* Restore registers we've changed & clean up any mess we've made */

		ivtv_yuv_close(itv);

	}

	if (s->type == IVTV_DEC_STREAM_TYPE_YUV && itv->output_mode == OUT_YUV)

		itv->output_mode = OUT_NONE;

	else if (s->type == IVTV_DEC_STREAM_TYPE_YUV && itv->output_mode == OUT_UDMA_YUV)

		itv->output_mode = OUT_NONE;

	else if (s->type == IVTV_DEC_STREAM_TYPE_MPG && itv->output_mode == OUT_MPG)

	if (itv->output_mode == OUT_UDMA_YUV && id->yuv_frames)

		itv->output_mode = OUT_NONE;



	itv->speed = 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -1346,6 +1346,8 @@ static int ivtv_decoder_ioctls(struct file *filp, unsigned int cmd, void *arg) 
			ivtv_release_stream(s);

			return -EBUSY;

		}

		/* Mark that this file handle started the UDMA_YUV mode */

		id->yuv_frames = 1;

		if (args->y_source == NULL)

			return 0;

		return ivtv_yuv_prep_frame(itv, args);