openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] marvell-ccic: fix streaming issues 

- fill in timestamp
- fill in field
- start the sequence counter at 0, not 1

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-03-05 17:48:39 -03:00 committed by Mauro Carvalho Chehab
parent ca16a64bfc
commit 5342342998
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/marvell-ccic/mcam-core.c
View File

@ -239,6 +239,8 @@ static void mcam_buffer_done(struct mcam_camera *cam, int frame,
{ {
vbuf->v4l2_buf.bytesused = cam->pix_format.sizeimage; vbuf->v4l2_buf.bytesused = cam->pix_format.sizeimage;
vbuf->v4l2_buf.sequence = cam->buf_seq[frame]; vbuf->v4l2_buf.sequence = cam->buf_seq[frame];
vbuf->v4l2_buf.field = V4L2_FIELD_NONE;
v4l2_get_timestamp(&vbuf->v4l2_buf.timestamp);
vb2_set_plane_payload(vbuf, 0, cam->pix_format.sizeimage); vb2_set_plane_payload(vbuf, 0, cam->pix_format.sizeimage);
vb2_buffer_done(vbuf, VB2_BUF_STATE_DONE); vb2_buffer_done(vbuf, VB2_BUF_STATE_DONE);
} }
@ -1671,7 +1673,7 @@ static void mcam_frame_complete(struct mcam_camera *cam, int frame)
set_bit(frame, &cam->flags); set_bit(frame, &cam->flags);
clear_bit(CF_DMA_ACTIVE, &cam->flags); clear_bit(CF_DMA_ACTIVE, &cam->flags);
cam->next_buf = frame; cam->next_buf = frame;
cam->buf_seq[frame] = ++(cam->sequence); cam->buf_seq[frame] = cam->sequence++;
cam->frame_state.frames++; cam->frame_state.frames++;
/* /*
* "This should never happen" * "This should never happen"