From: Hans Verkuil <hverkuil@xs4all.nl>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Tomasz Figa <tfiga@chromium.org>
Subject: [GIT PULL FOR v5.1] vb2/cedrus: use timestamps to identify buffers
Date: Mon, 7 Jan 2019 12:30:25 +0100 [thread overview]
Message-ID: <b3bbcd9c-fcaf-4a13-2c46-7e2231e9e8e0@xs4all.nl> (raw)
As was discussed here (among other places):
https://lkml.org/lkml/2018/10/19/440
using capture queue buffer indices to refer to reference frames is
not a good idea.
Instead, after a long irc discussion:
https://linuxtv.org/irc/irclogger_log/v4l?date=2018-12-12,Wed
it was decided to use the timestamp in v4l2_buffer for this.
However, struct timeval cannot be used in a compound control since
the size of struct timeval differs between 32 and 64 bit architectures,
and there are also changes upcoming for y2038 support.
But internally the kernel converts the timeval to a u64 (nsecs since
boot). So we provide a helper function in videodev2.h that converts
the timeval to a u64, and that u64 can be used inside compound controls.
In the not too distant future we want to create a new struct v4l2_buffer,
and then we'll use u64 from the start, so in that case the helper function
would no longer be needed.
The first three patches add a new m2m helper function to correctly copy
the relevant data from an output buffer to a capture buffer. This will
simplify m2m drivers (in fact, many m2m drivers do not do this quite
right, so a helper function was really needed).
The fourth patch clears up messy timecode documentation that I came
across while working on this.
Patch 5 adds the new v4l2_timeval_to_ns helper function to videodev2.h.
The next patch adds the vb2_find_timestamp() function to find buffers
with a specific u64 timestamp.
Finally the cedrus driver and documentation are updated to use a
timestamp as buffer identifier.
I also removed the 'pad' fields from the mpeg2 control structs (it
should never been added in the first place) and aligned the structs
to a u32 boundary.
Regards,
Hans
The following changes since commit 4bd46aa0353e022c2401a258e93b107880a66533:
media: cx23885: only reset DMA on problematic CPUs (2018-12-20 06:52:01 -0500)
are available in the Git repository at:
git://linuxtv.org/hverkuil/media_tree.git tags/br-buftag
for you to fetch changes up to 690da7b0ab96f6761e72bb0c5c861e1e13acb327:
extended-controls.rst: update the mpeg2 compound controls (2019-01-07 12:23:49 +0100)
----------------------------------------------------------------
Tag branch
----------------------------------------------------------------
Hans Verkuil (8):
v4l2-mem2mem: add v4l2_m2m_buf_copy_data helper function
vim2m: use v4l2_m2m_buf_copy_data
vicodec: use v4l2_m2m_buf_copy_data
buffer.rst: clean up timecode documentation
videodev2.h: add v4l2_timeval_to_ns inline function
vb2: add vb2_find_timestamp()
cedrus: identify buffers by timestamp
extended-controls.rst: update the mpeg2 compound controls
Documentation/media/uapi/v4l/buffer.rst | 11 +++++------
Documentation/media/uapi/v4l/extended-controls.rst | 28 +++++++++++++++++-----------
drivers/media/common/videobuf2/videobuf2-v4l2.c | 19 ++++++++++++++++++-
drivers/media/platform/vicodec/vicodec-core.c | 12 +-----------
drivers/media/platform/vim2m.c | 12 +-----------
drivers/media/v4l2-core/v4l2-ctrls.c | 9 ---------
drivers/media/v4l2-core/v4l2-mem2mem.c | 20 ++++++++++++++++++++
drivers/staging/media/sunxi/cedrus/cedrus.h | 9 ++++++---
drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 2 ++
drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 23 +++++++++++------------
include/media/mpeg2-ctrls.h | 14 +++++---------
include/media/v4l2-mem2mem.h | 20 ++++++++++++++++++++
include/media/videobuf2-v4l2.h | 17 +++++++++++++++++
include/uapi/linux/videodev2.h | 12 ++++++++++++
14 files changed, 135 insertions(+), 73 deletions(-)
next reply other threads:[~2019-01-07 11:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 11:30 Hans Verkuil [this message]
2019-01-07 11:36 ` [GIT PULL FOR v5.1] vb2/cedrus: use timestamps to identify buffers Hans Verkuil
2019-01-08 9:16 ` Re: [GIT PULL FOR v5.1] vb2/cedrus: use timestamps to identify buffers[Please note,mail behalf by linux-media-owner@vger.kernel.org] Randy Li
[not found] ` <1468691710.6518623.1546938541229.JavaMail.javamailuser@localhost>
2019-01-08 9:59 ` [GIT PULL FOR v5.1] vb2/cedrus: use timestamps to identify buffers Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b3bbcd9c-fcaf-4a13-2c46-7e2231e9e8e0@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=linux-media@vger.kernel.org \
--cc=maxime.ripard@bootlin.com \
--cc=paul.kocialkowski@bootlin.com \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).