V4L/DVB (11622): cx18: Allow IVTV format VBI insertion in MPEG-2 SVCD and DVD streams

Both the MPEG-2 SVCD stream format and the MPEG-2 DVD stream format should
use an MPEG-2 PS container.  This makes it safe to stuff IVTV Private Stream 1
VBI packets in these stream types using the existing cx18 driver routines.

Reported-by: Helen Buus <mythtv@hbuus.com>
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c
index 82fc2f9d4021..8e35c3aed544 100644
--- a/drivers/media/video/cx18/cx18-controls.c
+++ b/drivers/media/video/cx18/cx18-controls.c
@@ -176,8 +176,10 @@ static int cx18_setup_vbi_fmt(struct cx18 *cx,
                 return -EBUSY;
 
         if (fmt != V4L2_MPEG_STREAM_VBI_FMT_IVTV ||
-            type != V4L2_MPEG_STREAM_TYPE_MPEG2_PS) {
-                /* We don't do VBI insertion aside from IVTV format in a PS */
+            !(type == V4L2_MPEG_STREAM_TYPE_MPEG2_PS ||
+              type == V4L2_MPEG_STREAM_TYPE_MPEG2_DVD ||
+              type == V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD)) {
+                /* Only IVTV fmt VBI insertion & only MPEG-2 PS type streams */
                 cx->vbi.insert_mpeg = V4L2_MPEG_STREAM_VBI_FMT_NONE;
                 CX18_DEBUG_INFO("disabled insertion of sliced VBI data into "
                                 "the MPEG stream\n");