diff options
author | Junghak Sung <jh1009.sung@samsung.com> | 2015-11-03 05:16:37 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-12-18 10:53:31 -0500 |
commit | d6dd645eae76eeb42cb47d9da69cd3f56b3f2cb6 (patch) | |
tree | 7cd1f67b772a7829c832aca35a69454b162ab2d0 /drivers/media/platform/coda/coda-bit.c | |
parent | 9057bc2b35cfdb5b5fb7d93708f11de5dd9b6b2e (diff) |
[media] media: videobuf2: Move timestamp to vb2_buffer
Move timestamp from struct vb2_v4l2_buffer to struct vb2_buffer
for common use, and change its type to u64 in order to handling
y2038 problem. This patch also includes all device drivers' changes related to
this restructuring.
Signed-off-by: Junghak Sung <jh1009.sung@samsung.com>
Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com>
Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/coda/coda-bit.c')
-rw-r--r-- | drivers/media/platform/coda/coda-bit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index 654e964f84a2..21beb97974c2 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c | |||
@@ -279,7 +279,7 @@ void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming) | |||
279 | if (meta) { | 279 | if (meta) { |
280 | meta->sequence = src_buf->sequence; | 280 | meta->sequence = src_buf->sequence; |
281 | meta->timecode = src_buf->timecode; | 281 | meta->timecode = src_buf->timecode; |
282 | meta->timestamp = src_buf->timestamp; | 282 | meta->timestamp = src_buf->vb2_buf.timestamp; |
283 | meta->start = start; | 283 | meta->start = start; |
284 | meta->end = ctx->bitstream_fifo.kfifo.in & | 284 | meta->end = ctx->bitstream_fifo.kfifo.in & |
285 | ctx->bitstream_fifo.kfifo.mask; | 285 | ctx->bitstream_fifo.kfifo.mask; |
@@ -1364,7 +1364,7 @@ static void coda_finish_encode(struct coda_ctx *ctx) | |||
1364 | dst_buf->flags &= ~V4L2_BUF_FLAG_KEYFRAME; | 1364 | dst_buf->flags &= ~V4L2_BUF_FLAG_KEYFRAME; |
1365 | } | 1365 | } |
1366 | 1366 | ||
1367 | dst_buf->timestamp = src_buf->timestamp; | 1367 | dst_buf->vb2_buf.timestamp = src_buf->vb2_buf.timestamp; |
1368 | dst_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; | 1368 | dst_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; |
1369 | dst_buf->flags |= | 1369 | dst_buf->flags |= |
1370 | src_buf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; | 1370 | src_buf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; |
@@ -2040,7 +2040,7 @@ static void coda_finish_decode(struct coda_ctx *ctx) | |||
2040 | dst_buf->flags |= ctx->frame_types[ctx->display_idx]; | 2040 | dst_buf->flags |= ctx->frame_types[ctx->display_idx]; |
2041 | meta = &ctx->frame_metas[ctx->display_idx]; | 2041 | meta = &ctx->frame_metas[ctx->display_idx]; |
2042 | dst_buf->timecode = meta->timecode; | 2042 | dst_buf->timecode = meta->timecode; |
2043 | dst_buf->timestamp = meta->timestamp; | 2043 | dst_buf->vb2_buf.timestamp = meta->timestamp; |
2044 | 2044 | ||
2045 | trace_coda_dec_rot_done(ctx, dst_buf, meta); | 2045 | trace_coda_dec_rot_done(ctx, dst_buf, meta); |
2046 | 2046 | ||