V4L/DVB (13910): cx18: Fix set indextable command to properly select I/P/B index...

The CX18_CPU_SET_INDEXTABLE command was being called with the wrong number
of arguments causing the index table frame type selection mask to be set wrong.
Now the IDX stream properly sends entries for I, P, and B frames.

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

diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index 680e7da..253b98a 100644 (file)
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -686,8 +686,8 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
                 * generation.
                 */
                s_idx = &cx->streams[CX18_ENC_STREAM_TYPE_IDX];
-               cx18_vapi_result(cx, data, CX18_CPU_SET_INDEXTABLE, 1,
-                                cx18_stream_enabled(s_idx) ? 7 : 0);
+               cx18_vapi_result(cx, data, CX18_CPU_SET_INDEXTABLE, 2,
+                                s->handle, cx18_stream_enabled(s_idx) ? 7 : 0);
 
                /* Call out to the common CX2341x API setup for user controls */
                priv.cx = cx;

diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h
index 868806e..2c00980 100644 (file)
--- a/drivers/media/video/cx18/cx23418.h
+++ b/drivers/media/video/cx18/cx23418.h
@@ -191,7 +191,8 @@
 #define CX18_CPU_SET_MEDIAN_CORING             (CPU_CMD_MASK_CAPTURE | 0x000E)
 
 /* Description: This command set the picture type mask for index file
-   IN[0] -     0 = disable index file output
+   IN[0] - Task handle (ignored by firmware)
+   IN[1] -     0 = disable index file output
                        1 = output I picture
                        2 = P picture
                        4 = B picture