github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 05:55:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: rockchip: vicap: scale video capture follow main stream

Browse Source 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie1d052bae55027d42d8ecb5976c9dccddd1e784c
This commit is contained in:
Zefa Chen 2023-03-20 18:40:13 +08:00 committed by Tao Huang
parent 10f9176932
commit fd32f0f8d6
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/rockchip/cif/cif-scale.c
View File

@ -555,7 +555,6 @@ static int rkcif_scale_stop(struct rkcif_scale_vdev *scale_vdev)
static void rkcif_scale_vb2_stop_streaming(struct vb2_queue *vq)
{
struct rkcif_scale_vdev *scale_vdev = vq->drv_priv;
struct rkcif_stream *stream = scale_vdev->stream;
struct rkcif_device *dev = scale_vdev->cifdev;
struct rkcif_buffer *buf = NULL;
int ret = 0;
@ -586,7 +585,6 @@ static void rkcif_scale_vb2_stop_streaming(struct vb2_queue *vq)
vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
}
mutex_unlock(&dev->scale_lock);
rkcif_do_stop_stream(stream, RKCIF_STREAM_MODE_TOSCALE);
}
static int rkcif_scale_channel_init(struct rkcif_scale_vdev *scale_vdev)
@ -887,7 +885,6 @@ rkcif_scale_vb2_start_streaming(struct vb2_queue *queue,
return ret;
}
rkcif_do_start_stream(stream, RKCIF_STREAM_MODE_TOSCALE);
return 0;
}
@ -994,13 +991,13 @@ static void rkcif_scale_update_stream(struct rkcif_scale_vdev *scale_vdev, int c
RKCIF_YUV_ADDR_STATE_UPDATE,
ch);
scale_vdev->frame_idx = scale_vdev->stream->frame_idx;
if (active_buf && (!ret)) {
vb_done = &active_buf->vb;
vb_done->vb2_buf.timestamp = ktime_get_ns();
vb_done->sequence = scale_vdev->frame_idx;
rkcif_scale_vb_done_oneframe(scale_vdev, vb_done);
}
scale_vdev->frame_idx++;
}
void rkcif_irq_handle_scale(struct rkcif_device *cif_dev, unsigned int intstat_glb)