From 675be9a4d73a6058f4b613dc0b1c72ead1f03f8c Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@kernellabs.com>
Date: Sat, 31 Jul 2010 15:03:31 -0300
Subject: [PATCH] --- yaml --- r: 219367 b: refs/heads/master c:
 f91d095c92e8fdcb6bd8cb35e8fa9c87d9c10768 h: refs/heads/master i:   219365:
 39b40d822899ac810e4cb2f37a8eb35ecf21605f   219363:
 d056de69855bd9c5d9a3b981f5574a8d6bf1b492   219359:
 a2a660ae87b647e6bc555843e778570d8b520a32 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/media/video/saa7164/saa7164-api.c     | 5 +++++
 trunk/drivers/media/video/saa7164/saa7164-encoder.c | 9 +++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a4d4cff5b3ac..1257464697dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 968b11b20143036098a7013817a15615a54383d3
+refs/heads/master: f91d095c92e8fdcb6bd8cb35e8fa9c87d9c10768
diff --git a/trunk/drivers/media/video/saa7164/saa7164-api.c b/trunk/drivers/media/video/saa7164/saa7164-api.c
index 54568cfe933d..5f72bb854e60 100644
--- a/trunk/drivers/media/video/saa7164/saa7164-api.c
+++ b/trunk/drivers/media/video/saa7164/saa7164-api.c
@@ -53,6 +53,11 @@ int saa7164_api_set_encoder(struct saa7164_port *port)
 	dprintk(DBGLVL_ENC, "%s() unitid=0x%x\n", __func__,
 		port->hwcfg.sourceid);
 
+	if (port->encoder_params.stream_type == V4L2_MPEG_STREAM_TYPE_MPEG2_PS)
+		port->encoder_profile = EU_PROFILE_PS_DVD;
+	else
+		port->encoder_profile = EU_PROFILE_TS_HQ;
+
 	ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, SET_CUR,
 		EU_PROFILE_CONTROL, sizeof(u8), &port->encoder_profile);
 	if (ret != SAA_OK)
diff --git a/trunk/drivers/media/video/saa7164/saa7164-encoder.c b/trunk/drivers/media/video/saa7164/saa7164-encoder.c
index c1265b821b2b..c357e2db1ac3 100644
--- a/trunk/drivers/media/video/saa7164/saa7164-encoder.c
+++ b/trunk/drivers/media/video/saa7164/saa7164-encoder.c
@@ -43,6 +43,7 @@ static const u32 saa7164_v4l2_ctrls[] = {
 	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 @@ static int saa7164_try_ctrl(struct v4l2_ext_control *ctrl, int ac3)
 			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 @@ static int fill_queryctrl(struct saa7164_encoder_params *params,
 	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 @@ int saa7164_encoder_register(struct saa7164_port *port)
 	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;