| Message ID | 1366889768-16677-5-git-send-email-k.debski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Kamil, Am Donnerstag, den 25.04.2013, 13:36 +0200 schrieb Kamil Debski: > Since the introduction of the timestamp_type field, it is necessary that > the driver chooses which type it will use. This patch adds support for > the timestamp_type. > > Signed-off-by: Kamil Debski <k.debski@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Cc: Javier Martin <javier.martin@vista-silicon.com> > Cc: Fabio Estevam <fabio.estevam@freescale.com> Tested-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > drivers/media/platform/coda.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c > index 20827ba..5612329 100644 > --- a/drivers/media/platform/coda.c > +++ b/drivers/media/platform/coda.c > @@ -1422,6 +1422,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; > > ret = vb2_queue_init(src_vq); > if (ret) > @@ -1433,6 +1434,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; > > return vb2_queue_init(dst_vq); > } > @@ -1628,6 +1630,9 @@ static irqreturn_t coda_irq_handler(int irq, void *data) > dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME; > } > > + dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp; > + dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode; > + > v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE); > v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE); > regards Philipp -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Philipp, Thank you for testing the patch. I would love to add your Tested-by tag to the commit, but I had already sent the pull request to Mauro. It was already very late to post fixes. Best wishes,
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 20827ba..5612329 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -1422,6 +1422,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; ret = vb2_queue_init(src_vq); if (ret) @@ -1433,6 +1434,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; return vb2_queue_init(dst_vq); } @@ -1628,6 +1630,9 @@ static irqreturn_t coda_irq_handler(int irq, void *data) dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME; } + dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp; + dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode; + v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);