From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Tomasz Figa <tfiga@chromium.org>,
kernel@collabora.com, Jonas Karlman <jonas@kwiboo.se>,
Hans Verkuil <hverkuil@xs4all.nl>,
Alexandre Courbot <acourbot@chromium.org>,
Jeffrey Kardatzke <jkardatzke@chromium.org>,
Nicolas Dufresne <nicolas.dufresne@collabora.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Maxime Ripard <mripard@kernel.org>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
Ezequiel Garcia <ezequiel@collabora.com>
Subject: [RFC 7/7] media: uapi: make H264 stateless codec interface public
Date: Tue, 23 Jun 2020 15:28:09 -0300 [thread overview]
Message-ID: <20200623182809.1375-8-ezequiel@collabora.com> (raw)
In-Reply-To: <20200623182809.1375-1-ezequiel@collabora.com>
The H264 interface is now ready to be part of the official
public API.
In addition, sanitize header includes.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
drivers/staging/media/hantro/hantro_hw.h | 5 ++---
include/media/v4l2-ctrls.h | 3 ++-
include/media/v4l2-h264.h | 2 +-
.../{media/h264-ctrls.h => uapi/linux/v4l2-h264-ctrls.h} | 8 ++------
4 files changed, 7 insertions(+), 11 deletions(-)
rename include/{media/h264-ctrls.h => uapi/linux/v4l2-h264-ctrls.h} (96%)
diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h
index 4053d8710e04..48d5be144319 100644
--- a/drivers/staging/media/hantro/hantro_hw.h
+++ b/drivers/staging/media/hantro/hantro_hw.h
@@ -11,9 +11,8 @@
#include <linux/interrupt.h>
#include <linux/v4l2-controls.h>
-#include <media/h264-ctrls.h>
-#include <media/mpeg2-ctrls.h>
-#include <media/vp8-ctrls.h>
+
+#include <media/v4l2-ctrls.h>
#include <media/videobuf2-core.h>
#define DEC_8190_ALIGN_MASK 0x07U
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index f40e2cbb21d3..fc725ba2ebd8 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -13,13 +13,14 @@
#include <linux/videodev2.h>
#include <media/media-request.h>
+#include <linux/v4l2-h264-ctrls.h>
+
/*
* Include the stateless codec compound control definitions.
* This will move to the public headers once this API is fully stable.
*/
#include <media/mpeg2-ctrls.h>
#include <media/fwht-ctrls.h>
-#include <media/h264-ctrls.h>
#include <media/vp8-ctrls.h>
#include <media/hevc-ctrls.h>
diff --git a/include/media/v4l2-h264.h b/include/media/v4l2-h264.h
index f08ba181263d..d2314f4d4490 100644
--- a/include/media/v4l2-h264.h
+++ b/include/media/v4l2-h264.h
@@ -10,7 +10,7 @@
#ifndef _MEDIA_V4L2_H264_H
#define _MEDIA_V4L2_H264_H
-#include <media/h264-ctrls.h>
+#include <media/v4l2-ctrls.h>
/**
* struct v4l2_h264_reflist_builder - Reference list builder object
diff --git a/include/media/h264-ctrls.h b/include/uapi/linux/v4l2-h264-ctrls.h
similarity index 96%
rename from include/media/h264-ctrls.h
rename to include/uapi/linux/v4l2-h264-ctrls.h
index 6446ec9f283d..a06f60670d68 100644
--- a/include/media/h264-ctrls.h
+++ b/include/uapi/linux/v4l2-h264-ctrls.h
@@ -2,14 +2,10 @@
/*
* These are the H.264 state controls for use with stateless H.264
* codec drivers.
- *
- * It turns out that these structs are not stable yet and will undergo
- * more changes. So keep them private until they are stable and ready to
- * become part of the official public API.
*/
-#ifndef _H264_CTRLS_H_
-#define _H264_CTRLS_H_
+#ifndef __LINUX_V4L2_H264_CONTROLS_H
+#define __LINUX_V4L2_H264_CONTROLS_H
#include <linux/videodev2.h>
--
2.26.0.rc2
next prev parent reply other threads:[~2020-06-23 18:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 18:28 [RFC 0/7] media: Clean and make H264 stateless uAPI public Ezequiel Garcia
2020-06-23 18:28 ` [RFC 1/7] media: uapi: h264: update reference lists Ezequiel Garcia
2020-06-23 18:28 ` [RFC 2/7] fixup! " Ezequiel Garcia
2020-06-25 14:53 ` Nicolas Dufresne
2020-06-25 17:42 ` Ezequiel Garcia
2020-06-25 17:47 ` Nicolas Dufresne
2020-06-25 15:30 ` Tomasz Figa
2020-06-25 16:52 ` Ezequiel Garcia
2020-06-23 18:28 ` [RFC 3/7] media: uapi: h264: clarify pic_order_cnt_bit_size field Ezequiel Garcia
2020-06-25 15:06 ` Nicolas Dufresne
2020-06-23 18:28 ` [RFC 4/7] media: uapi: h264: increase size of fields Ezequiel Garcia
2020-06-25 15:01 ` Nicolas Dufresne
2020-06-25 15:29 ` Ezequiel Garcia
2020-06-23 18:28 ` [RFC 5/7] media: uapi: h264: pad v4l2_ctrl_h264_pps to 64-bit Ezequiel Garcia
2020-06-25 14:55 ` Nicolas Dufresne
2020-06-23 18:28 ` [RFC 6/7] media: uapi: h264: Clean slice invariants syntax elements Ezequiel Garcia
2020-06-25 15:05 ` Nicolas Dufresne
2020-06-26 19:34 ` Ezequiel Garcia
2020-06-23 18:28 ` Ezequiel Garcia [this message]
2020-06-25 7:52 ` [RFC 7/7] media: uapi: make H264 stateless codec interface public Hans Verkuil
2020-06-25 17:51 ` Ezequiel Garcia
2020-06-25 14:42 ` [RFC 0/7] media: Clean and make H264 stateless uAPI public Nicolas Dufresne
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=20200623182809.1375-8-ezequiel@collabora.com \
--to=ezequiel@collabora.com \
--cc=acourbot@chromium.org \
--cc=hverkuil@xs4all.nl \
--cc=jkardatzke@chromium.org \
--cc=jonas@kwiboo.se \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mripard@kernel.org \
--cc=nicolas.dufresne@collabora.com \
--cc=p.zabel@pengutronix.de \
--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).