diff options
| author |   Andy Walls <awalls@radix.net> | 2010-01-01 13:25:41 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 15:10:30 -0300 |
| commit | 5ada57732a17521689d7d8eecf7c9b93b7484386 (patch) | |
| tree | 0fe82a263279753e6e13ad9c1564b19aeb244cfe /drivers/media/video/cx18 | |
| parent | V4L/DVB (13909): cx18: Clean up dead code from ivtv once used for IDX processing (diff) | |
| download | linux-dev-5ada57732a17521689d7d8eecf7c9b93b7484386.tar.xz linux-dev-5ada57732a17521689d7d8eecf7c9b93b7484386.zip | |
V4L/DVB (13910): cx18: Fix set indextable command to properly select I/P/B index entries
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>
Diffstat (limited to 'drivers/media/video/cx18')
| -rw-r--r-- | drivers/media/video/cx18/cx18-streams.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/cx18/cx23418.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c index 680e7da5e5e4..253b98ab39c5 100644 --- 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 868806effdcf..2c00980acfcb 100644 --- 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 |