diff options
| author | Sakari Ailus <sakari.ailus@iki.fi> | 2014-02-08 14:21:35 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-05 16:47:15 -0300 |
| commit | 309f4d62eda0e864c2d4eef536cc82e41931c3c5 (patch) | |
| tree | d5750f1dce1f46da1c35935cc02d344c3d4b4899 /drivers/media/platform/s5p-jpeg | |
| parent | 599b08929efe9b90e44b504454218a120bb062a0 (diff) | |
| download | blackbird-op-linux-309f4d62eda0e864c2d4eef536cc82e41931c3c5.tar.gz blackbird-op-linux-309f4d62eda0e864c2d4eef536cc82e41931c3c5.zip | |
[media] v4l: Copy timestamp source flags to destination on m2m devices
Copy the flags containing the timestamp source from source buffer flags to
the destination buffer flags on memory-to-memory devices. This is analogous
to copying the timestamp field from source to destination.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/s5p-jpeg')
| -rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index f5e987035fdb..da0ad886a5bf 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1766,6 +1766,9 @@ static irqreturn_t s5p_jpeg_irq(int irq, void *dev_id) dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode; dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp; + dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK; + dst_buf->v4l2_buf.flags |= + src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK; v4l2_m2m_buf_done(src_buf, state); if (curr_ctx->mode == S5P_JPEG_ENCODE) |
