commit f91d095c92e8fdcb6bd8cb35e8fa9c87d9c10768
author Steven Toth <stoth@kernellabs.com> Sat Jul 31 15:03:31 2010 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Thu Oct 21 07:54:48 2010 -0200
tree d3dbe13ed4e35ca4bb905a70c87e7a7bf62b932e
parent 968b11b20143036098a7013817a15615a54383d3

[media] saa7164: allow encoder output format to be user configurable

Allow PS and TS.

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/video/saa7164/saa7164-encoder.c

diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
index c1265b8..c357e2d 100644
--- a/drivers/media/video/saa7164/saa7164-encoder.c
+++ b/drivers/media/video/saa7164/saa7164-encoder.c
@@ -43,6 +43,7 @@
 	V4L2_CID_AUDIO_VOLUME,
 	V4L2_CID_SHARPNESS,
 	V4L2_CID_MPEG_VIDEO_ASPECT,
+	V4L2_CID_MPEG_VIDEO_GOP_SIZE,
 	V4L2_CID_MPEG_STREAM_TYPE,
 	V4L2_CID_MPEG_AUDIO_MUTE,
 	V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
@@ -432,7 +433,8 @@
 			ret = 0;
 		break;
 	case V4L2_CID_MPEG_STREAM_TYPE:
-		if (ctrl->value == V4L2_MPEG_STREAM_TYPE_MPEG2_PS)
+		if ((ctrl->value == V4L2_MPEG_STREAM_TYPE_MPEG2_PS) ||
+			(ctrl->value == V4L2_MPEG_STREAM_TYPE_MPEG2_TS))
 			ret = 0;
 		break;
 	case V4L2_CID_MPEG_AUDIO_MUTE:
@@ -694,8 +696,8 @@
 	case V4L2_CID_MPEG_STREAM_TYPE:
 		return v4l2_ctrl_query_fill(c,
 			V4L2_MPEG_STREAM_TYPE_MPEG2_PS,
-			V4L2_MPEG_STREAM_TYPE_MPEG2_PS,
-			0, V4L2_MPEG_STREAM_TYPE_MPEG2_PS);
+			V4L2_MPEG_STREAM_TYPE_MPEG2_TS,
+			1, V4L2_MPEG_STREAM_TYPE_MPEG2_PS);
 	case V4L2_CID_MPEG_VIDEO_ASPECT:
 		return v4l2_ctrl_query_fill(c,
 			V4L2_MPEG_VIDEO_ASPECT_1x1,
@@ -1324,7 +1326,6 @@
 	port->encodernorm = saa7164_tvnorms[0];
 	port->width = 720;
 	port->mux_input = 1; /* Composite */
-	port->encoder_profile = EU_PROFILE_PS_DVD;
 	port->video_format = EU_VIDEO_FORMAT_MPEG_2;
 	port->audio_format = 0;
 	port->video_resolution = 0;