From: Maxime Ripard <maxime.ripard@bootlin.com>
To: hans.verkuil@cisco.com, acourbot@chromium.org,
sakari.ailus@linux.intel.com,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: tfiga@chromium.org, posciak@chromium.org,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org, nicolas.dufresne@collabora.com,
jenskuske@gmail.com, jernej.skrabec@gmail.com, jonas@kwiboo.se,
ezequiel@collabora.com, linux-sunxi@googlegroups.com,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Maxime Ripard <maxime.ripard@bootlin.com>
Subject: [PATCH v9 2/4] media: pixfmt: Add H264 Slice format
Date: Thu, 11 Apr 2019 11:37:01 +0200 [thread overview]
Message-ID: <a448b24674fee0458c2899153b018325e605be15.1554975396.git-series.maxime.ripard@bootlin.com> (raw)
In-Reply-To: <cover.dec5630d6b289e0a50e1880be436050471a05269.1554975396.git-series.maxime.ripard@bootlin.com>
The H264_SLICE_RAW format is meant to hold the parsed slice data without
the start code. This will be needed by stateless decoders.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
---
drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
include/media/h264-ctrls.h | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index ac87c3e37280..f6e1254064d2 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1325,6 +1325,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_H264: descr = "H.264"; break;
case V4L2_PIX_FMT_H264_NO_SC: descr = "H.264 (No Start Codes)"; break;
case V4L2_PIX_FMT_H264_MVC: descr = "H.264 MVC"; break;
+ case V4L2_PIX_FMT_H264_SLICE_RAW: descr = "H.264 Parsed Slice Data"; break;
case V4L2_PIX_FMT_H263: descr = "H.263"; break;
case V4L2_PIX_FMT_MPEG1: descr = "MPEG-1 ES"; break;
case V4L2_PIX_FMT_MPEG2: descr = "MPEG-2 ES"; break;
diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h
index e2f83b3cdbef..e1404d78d6ff 100644
--- a/include/media/h264-ctrls.h
+++ b/include/media/h264-ctrls.h
@@ -11,6 +11,11 @@
#ifndef _H264_CTRLS_H_
#define _H264_CTRLS_H_
+#include <linux/videodev2.h>
+
+/* Our pixel format isn't stable at the moment */
+#define V4L2_PIX_FMT_H264_SLICE_RAW v4l2_fourcc('S', '2', '6', '4') /* H264 parsed slices */
+
/*
* This is put insanely high to avoid conflicting with controls that
* would be added during the phase where those controls are not
--
git-series 0.9.1
next prev parent reply other threads:[~2019-04-11 9:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-11 9:36 [PATCH v9 0/4] media: cedrus: Add H264 decoding support Maxime Ripard
2019-04-11 9:37 ` [PATCH v9 1/4] media: uapi: Add H264 low-level decoder API compound controls Maxime Ripard
2019-04-11 9:37 ` Maxime Ripard [this message]
2019-04-11 9:37 ` [PATCH v9 3/4] media: pixfmt: Add H264_SLICE_RAW format documentation Maxime Ripard
2019-04-11 9:37 ` [PATCH v9 4/4] media: cedrus: Add H264 decoding support Maxime Ripard
2019-04-23 11:40 ` 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=a448b24674fee0458c2899153b018325e605be15.1554975396.git-series.maxime.ripard@bootlin.com \
--to=maxime.ripard@bootlin.com \
--cc=acourbot@chromium.org \
--cc=ezequiel@collabora.com \
--cc=hans.verkuil@cisco.com \
--cc=jenskuske@gmail.com \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=nicolas.dufresne@collabora.com \
--cc=paul.kocialkowski@bootlin.com \
--cc=posciak@chromium.org \
--cc=sakari.ailus@linux.intel.com \
--cc=tfiga@chromium.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=wens@csie.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).