[media] v4l: Rename vb2_queue.timestamp_type as timestamp_flags
The timestamp_type field used to contain only the timestamp type. Soon it will be used for timestamp source flags as well. Rename the field accordingly. [m.chehab@samsung.com: do the change also to drivers/staging/media and at s2255] Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
parent
939f1377fb
commit
ade48681f1
|
@ -965,7 +965,7 @@ static struct qcam *qcam_init(struct parport *port)
|
|||
q->drv_priv = qcam;
|
||||
q->ops = &qcam_video_qops;
|
||||
q->mem_ops = &vb2_vmalloc_memops;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
err = vb2_queue_init(q);
|
||||
if (err < 0) {
|
||||
v4l2_err(v4l2_dev, "couldn't init vb2_queue for %s.\n", port->name);
|
||||
|
|
|
@ -997,7 +997,7 @@ static int bcap_probe(struct platform_device *pdev)
|
|||
q->buf_struct_size = sizeof(struct bcap_buffer);
|
||||
q->ops = &bcap_video_qops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret)
|
||||
|
|
|
@ -2428,7 +2428,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
src_vq->ops = &coda_qops;
|
||||
src_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
|
||||
ret = vb2_queue_init(src_vq);
|
||||
if (ret)
|
||||
|
@ -2440,7 +2440,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
dst_vq->ops = &coda_qops;
|
||||
dst_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
|
||||
return vb2_queue_init(dst_vq);
|
||||
}
|
||||
|
|
|
@ -1415,7 +1415,7 @@ static int vpbe_display_reqbufs(struct file *file, void *priv,
|
|||
q->ops = &video_qops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct vpbe_disp_buffer);
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret) {
|
||||
|
|
|
@ -1023,7 +1023,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
|
|||
q->ops = &video_qops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct vpif_cap_buffer);
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret) {
|
||||
|
|
|
@ -983,7 +983,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
|
|||
q->ops = &video_qops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct vpif_disp_buffer);
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret) {
|
||||
|
|
|
@ -590,7 +590,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
src_vq->ops = &gsc_m2m_qops;
|
||||
src_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
|
||||
ret = vb2_queue_init(src_vq);
|
||||
if (ret)
|
||||
|
@ -603,7 +603,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
dst_vq->ops = &gsc_m2m_qops;
|
||||
dst_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
|
||||
return vb2_queue_init(dst_vq);
|
||||
}
|
||||
|
|
|
@ -1782,7 +1782,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc,
|
|||
q->ops = &fimc_capture_qops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct fimc_vid_buffer);
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->lock = &fimc->lock;
|
||||
|
||||
ret = vb2_queue_init(q);
|
||||
|
|
|
@ -1313,7 +1313,7 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd)
|
|||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct flite_buffer);
|
||||
q->drv_priv = fimc;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->lock = &fimc->lock;
|
||||
|
||||
ret = vb2_queue_init(q);
|
||||
|
|
|
@ -557,7 +557,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
src_vq->ops = &fimc_qops;
|
||||
src_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->lock = &ctx->fimc_dev->lock;
|
||||
|
||||
ret = vb2_queue_init(src_vq);
|
||||
|
@ -570,7 +570,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
dst_vq->ops = &fimc_qops;
|
||||
dst_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->lock = &ctx->fimc_dev->lock;
|
||||
|
||||
return vb2_queue_init(dst_vq);
|
||||
|
|
|
@ -868,7 +868,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
src_vq->ops = &deinterlace_qops;
|
||||
src_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
q_data[V4L2_M2M_SRC].fmt = &formats[0];
|
||||
q_data[V4L2_M2M_SRC].width = 640;
|
||||
q_data[V4L2_M2M_SRC].height = 480;
|
||||
|
@ -885,7 +885,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
dst_vq->ops = &deinterlace_qops;
|
||||
dst_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
q_data[V4L2_M2M_DST].fmt = &formats[0];
|
||||
q_data[V4L2_M2M_DST].width = 640;
|
||||
q_data[V4L2_M2M_DST].height = 480;
|
||||
|
|
|
@ -777,7 +777,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
|
|||
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
src_vq->ops = &m2mtest_qops;
|
||||
src_vq->mem_ops = &vb2_vmalloc_memops;
|
||||
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->lock = &ctx->dev->dev_mutex;
|
||||
|
||||
ret = vb2_queue_init(src_vq);
|
||||
|
@ -790,7 +790,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
|
|||
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
dst_vq->ops = &m2mtest_qops;
|
||||
dst_vq->mem_ops = &vb2_vmalloc_memops;
|
||||
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->lock = &ctx->dev->dev_mutex;
|
||||
|
||||
return vb2_queue_init(dst_vq);
|
||||
|
|
|
@ -766,7 +766,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
src_vq->ops = &emmaprp_qops;
|
||||
src_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
|
||||
ret = vb2_queue_init(src_vq);
|
||||
if (ret)
|
||||
|
@ -778,7 +778,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
dst_vq->ops = &emmaprp_qops;
|
||||
dst_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
|
||||
return vb2_queue_init(dst_vq);
|
||||
}
|
||||
|
|
|
@ -1160,7 +1160,7 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
|
|||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct camif_buffer);
|
||||
q->drv_priv = vp;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret)
|
||||
|
|
|
@ -157,7 +157,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
src_vq->ops = &g2d_qops;
|
||||
src_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->lock = &ctx->dev->mutex;
|
||||
|
||||
ret = vb2_queue_init(src_vq);
|
||||
|
@ -170,7 +170,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
dst_vq->ops = &g2d_qops;
|
||||
dst_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->lock = &ctx->dev->mutex;
|
||||
|
||||
return vb2_queue_init(dst_vq);
|
||||
|
|
|
@ -1701,7 +1701,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
src_vq->ops = &s5p_jpeg_qops;
|
||||
src_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->lock = &ctx->jpeg->lock;
|
||||
|
||||
ret = vb2_queue_init(src_vq);
|
||||
|
@ -1714,7 +1714,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
dst_vq->ops = &s5p_jpeg_qops;
|
||||
dst_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->lock = &ctx->jpeg->lock;
|
||||
|
||||
return vb2_queue_init(dst_vq);
|
||||
|
|
|
@ -794,7 +794,7 @@ static int s5p_mfc_open(struct file *file)
|
|||
goto err_queue_init;
|
||||
}
|
||||
q->mem_ops = (struct vb2_mem_ops *)&vb2_dma_contig_memops;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret) {
|
||||
mfc_err("Failed to initialize videobuf2 queue(capture)\n");
|
||||
|
@ -816,7 +816,7 @@ static int s5p_mfc_open(struct file *file)
|
|||
goto err_queue_init;
|
||||
}
|
||||
q->mem_ops = (struct vb2_mem_ops *)&vb2_dma_contig_memops;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret) {
|
||||
mfc_err("Failed to initialize videobuf2 queue(output)\n");
|
||||
|
|
|
@ -472,7 +472,7 @@ static int isi_camera_init_videobuf(struct vb2_queue *q,
|
|||
q->buf_struct_size = sizeof(struct frame_buffer);
|
||||
q->ops = &isi_video_qops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
return vb2_queue_init(q);
|
||||
}
|
||||
|
|
|
@ -794,7 +794,7 @@ static int mx2_camera_init_videobuf(struct vb2_queue *q,
|
|||
q->ops = &mx2_videobuf_ops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct mx2_buffer);
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
return vb2_queue_init(q);
|
||||
}
|
||||
|
|
|
@ -453,7 +453,7 @@ static int mx3_camera_init_videobuf(struct vb2_queue *q,
|
|||
q->ops = &mx3_videobuf_ops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct mx3_camera_buffer);
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
return vb2_queue_init(q);
|
||||
}
|
||||
|
|
|
@ -1360,7 +1360,7 @@ static int rcar_vin_init_videobuf2(struct vb2_queue *vq,
|
|||
vq->ops = &rcar_vin_vb2_ops;
|
||||
vq->mem_ops = &vb2_dma_contig_memops;
|
||||
vq->buf_struct_size = sizeof(struct rcar_vin_buffer);
|
||||
vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
return vb2_queue_init(vq);
|
||||
}
|
||||
|
|
|
@ -1665,7 +1665,7 @@ static int sh_mobile_ceu_init_videobuf(struct vb2_queue *q,
|
|||
q->ops = &sh_mobile_ceu_videobuf_ops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct sh_mobile_ceu_buffer);
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
return vb2_queue_init(q);
|
||||
}
|
||||
|
|
|
@ -1770,7 +1770,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
src_vq->ops = &vpe_qops;
|
||||
src_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
|
||||
ret = vb2_queue_init(src_vq);
|
||||
if (ret)
|
||||
|
@ -1783,7 +1783,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
|
|||
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
|
||||
dst_vq->ops = &vpe_qops;
|
||||
dst_vq->mem_ops = &vb2_dma_contig_memops;
|
||||
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
|
||||
return vb2_queue_init(dst_vq);
|
||||
}
|
||||
|
|
|
@ -1429,7 +1429,7 @@ static int __init vivi_create_instance(int inst)
|
|||
q->buf_struct_size = sizeof(struct vivi_buffer);
|
||||
q->ops = &vivi_video_qops;
|
||||
q->mem_ops = &vb2_vmalloc_memops;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret)
|
||||
|
|
|
@ -1051,7 +1051,7 @@ int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf)
|
|||
video->queue.buf_struct_size = sizeof(struct vsp1_video_buffer);
|
||||
video->queue.ops = &vsp1_video_queue_qops;
|
||||
video->queue.mem_ops = &vb2_dma_contig_memops;
|
||||
video->queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
video->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
|
||||
ret = vb2_queue_init(&video->queue);
|
||||
if (ret < 0) {
|
||||
dev_err(video->vsp1->dev, "failed to initialize vb2 queue\n");
|
||||
|
|
|
@ -1029,7 +1029,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
|
|||
q = &dev->vb_vidq;
|
||||
q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->drv_priv = dev;
|
||||
q->buf_struct_size = sizeof(struct em28xx_buffer);
|
||||
q->ops = &em28xx_video_qops;
|
||||
|
@ -1043,7 +1043,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
|
|||
q = &dev->vb_vbiq;
|
||||
q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
|
||||
q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->drv_priv = dev;
|
||||
q->buf_struct_size = sizeof(struct em28xx_buffer);
|
||||
q->ops = &em28xx_vbi_qops;
|
||||
|
|
|
@ -1001,7 +1001,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
|
|||
pdev->vb_queue.buf_struct_size = sizeof(struct pwc_frame_buf);
|
||||
pdev->vb_queue.ops = &pwc_vb_queue_ops;
|
||||
pdev->vb_queue.mem_ops = &vb2_vmalloc_memops;
|
||||
pdev->vb_queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
pdev->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
rc = vb2_queue_init(&pdev->vb_queue);
|
||||
if (rc < 0) {
|
||||
PWC_ERROR("Oops, could not initialize vb2 queue.\n");
|
||||
|
|
|
@ -1664,7 +1664,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
|
|||
q->buf_struct_size = sizeof(struct s2255_buffer);
|
||||
q->mem_ops = &vb2_vmalloc_memops;
|
||||
q->ops = &s2255_video_qops;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret != 0) {
|
||||
dev_err(&dev->udev->dev,
|
||||
|
|
|
@ -641,7 +641,7 @@ int stk1160_vb2_setup(struct stk1160 *dev)
|
|||
q->buf_struct_size = sizeof(struct stk1160_buffer);
|
||||
q->ops = &stk1160_video_qops;
|
||||
q->mem_ops = &vb2_vmalloc_memops;
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
rc = vb2_queue_init(q);
|
||||
if (rc < 0)
|
||||
|
|
|
@ -679,7 +679,7 @@ int usbtv_video_init(struct usbtv *usbtv)
|
|||
usbtv->vb2q.buf_struct_size = sizeof(struct usbtv_buf);
|
||||
usbtv->vb2q.ops = &usbtv_vb2_ops;
|
||||
usbtv->vb2q.mem_ops = &vb2_vmalloc_memops;
|
||||
usbtv->vb2q.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
usbtv->vb2q.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
usbtv->vb2q.lock = &usbtv->vb2q_lock;
|
||||
ret = vb2_queue_init(&usbtv->vb2q);
|
||||
if (ret < 0) {
|
||||
|
|
|
@ -151,7 +151,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
|
|||
queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
|
||||
queue->queue.ops = &uvc_queue_qops;
|
||||
queue->queue.mem_ops = &vb2_vmalloc_memops;
|
||||
queue->queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
queue->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
ret = vb2_queue_init(&queue->queue);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
|
@ -488,7 +488,7 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b)
|
|||
* Clear any buffer state related flags.
|
||||
*/
|
||||
b->flags &= ~V4L2_BUFFER_MASK_FLAGS;
|
||||
b->flags |= q->timestamp_type;
|
||||
b->flags |= q->timestamp_flags;
|
||||
|
||||
switch (vb->state) {
|
||||
case VB2_BUF_STATE_QUEUED:
|
||||
|
@ -1473,7 +1473,7 @@ static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
|
|||
* For output buffers copy the timestamp if needed,
|
||||
* and the timecode field and flag if needed.
|
||||
*/
|
||||
if (q->timestamp_type == V4L2_BUF_FLAG_TIMESTAMP_COPY)
|
||||
if (q->timestamp_flags == V4L2_BUF_FLAG_TIMESTAMP_COPY)
|
||||
vb->v4l2_buf.timestamp = b->timestamp;
|
||||
vb->v4l2_buf.flags |= b->flags & V4L2_BUF_FLAG_TIMECODE;
|
||||
if (b->flags & V4L2_BUF_FLAG_TIMECODE)
|
||||
|
@ -2226,11 +2226,11 @@ int vb2_queue_init(struct vb2_queue *q)
|
|||
WARN_ON(!q->io_modes) ||
|
||||
WARN_ON(!q->ops->queue_setup) ||
|
||||
WARN_ON(!q->ops->buf_queue) ||
|
||||
WARN_ON(q->timestamp_type & ~V4L2_BUF_FLAG_TIMESTAMP_MASK))
|
||||
WARN_ON(q->timestamp_flags & ~V4L2_BUF_FLAG_TIMESTAMP_MASK))
|
||||
return -EINVAL;
|
||||
|
||||
/* Warn that the driver should choose an appropriate timestamp type */
|
||||
WARN_ON(q->timestamp_type == V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN);
|
||||
WARN_ON(q->timestamp_flags == V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN);
|
||||
|
||||
INIT_LIST_HEAD(&q->queued_list);
|
||||
INIT_LIST_HEAD(&q->done_list);
|
||||
|
|
|
@ -391,7 +391,7 @@ dt3155_open(struct file *filp)
|
|||
goto err_alloc_queue;
|
||||
}
|
||||
pd->q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
pd->q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
pd->q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
pd->q->io_modes = VB2_READ | VB2_MMAP;
|
||||
pd->q->ops = &q_ops;
|
||||
pd->q->mem_ops = &vb2_dma_contig_memops;
|
||||
|
|
|
@ -989,7 +989,7 @@ int go7007_v4l2_init(struct go7007 *go)
|
|||
go->vidq.mem_ops = &vb2_vmalloc_memops;
|
||||
go->vidq.drv_priv = go;
|
||||
go->vidq.buf_struct_size = sizeof(struct go7007_buffer);
|
||||
go->vidq.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
go->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
go->vidq.lock = &go->queue_lock;
|
||||
rv = vb2_queue_init(&go->vidq);
|
||||
if (rv)
|
||||
|
|
|
@ -1851,7 +1851,7 @@ static int msi3101_probe(struct usb_interface *intf,
|
|||
s->vb_queue.buf_struct_size = sizeof(struct msi3101_frame_buf);
|
||||
s->vb_queue.ops = &msi3101_vb2_ops;
|
||||
s->vb_queue.mem_ops = &vb2_vmalloc_memops;
|
||||
s->vb_queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
s->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
ret = vb2_queue_init(&s->vb_queue);
|
||||
if (ret < 0) {
|
||||
dev_err(&s->udev->dev, "Could not initialize vb2 queue\n");
|
||||
|
|
|
@ -1074,7 +1074,7 @@ static int iss_video_open(struct file *file)
|
|||
q->ops = &iss_video_vb2ops;
|
||||
q->mem_ops = &vb2_dma_contig_memops;
|
||||
q->buf_struct_size = sizeof(struct iss_buffer);
|
||||
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
|
||||
ret = vb2_queue_init(q);
|
||||
if (ret) {
|
||||
|
|
|
@ -1290,7 +1290,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
|
|||
solo_enc->vidq.mem_ops = &vb2_dma_sg_memops;
|
||||
solo_enc->vidq.drv_priv = solo_enc;
|
||||
solo_enc->vidq.gfp_flags = __GFP_DMA32;
|
||||
solo_enc->vidq.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
solo_enc->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
solo_enc->vidq.buf_struct_size = sizeof(struct solo_vb2_buf);
|
||||
solo_enc->vidq.lock = &solo_enc->lock;
|
||||
ret = vb2_queue_init(&solo_enc->vidq);
|
||||
|
|
|
@ -676,7 +676,7 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
|
|||
solo_dev->vidq.ops = &solo_video_qops;
|
||||
solo_dev->vidq.mem_ops = &vb2_dma_contig_memops;
|
||||
solo_dev->vidq.drv_priv = solo_dev;
|
||||
solo_dev->vidq.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
solo_dev->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
|
||||
solo_dev->vidq.gfp_flags = __GFP_DMA32;
|
||||
solo_dev->vidq.buf_struct_size = sizeof(struct solo_vb2_buf);
|
||||
solo_dev->vidq.lock = &solo_dev->lock;
|
||||
|
|
|
@ -342,7 +342,7 @@ struct vb2_queue {
|
|||
const struct vb2_mem_ops *mem_ops;
|
||||
void *drv_priv;
|
||||
unsigned int buf_struct_size;
|
||||
u32 timestamp_type;
|
||||
u32 timestamp_flags;
|
||||
gfp_t gfp_flags;
|
||||
|
||||
/* private: internal use only */
|
||||
|
|
Loading…
Reference in a new issue