All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: kernel@collabora.com, Jonas Karlman <jonas@kwiboo.se>,
	Hans Verkuil <hverkuil@xs4all.nl>,
	Nicolas Dufresne <nicolas.dufresne@collabora.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Maxime Ripard <mripard@kernel.org>,
	Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
	Jernej Skrabec <jernej.skrabec@siol.net>,
	Ezequiel Garcia <ezequiel@collabora.com>
Subject: [PATCH v2 7/9] media: uapi: Move the H264 stateless control types out of staging
Date: Fri, 13 Nov 2020 18:51:19 -0300	[thread overview]
Message-ID: <20201113215121.505173-8-ezequiel@collabora.com> (raw)
In-Reply-To: <20201113215121.505173-1-ezequiel@collabora.com>

Move the H264 stateless control types out of staging,
and re-number them to avoid any confusion.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
 include/media/h264-ctrls.h     | 8 --------
 include/uapi/linux/videodev2.h | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h
index 4be80969fa44..192f491220f8 100644
--- a/include/media/h264-ctrls.h
+++ b/include/media/h264-ctrls.h
@@ -35,14 +35,6 @@
 #define V4L2_CID_MPEG_VIDEO_H264_START_CODE	(V4L2_CID_CODEC_BASE+1006)
 #define V4L2_CID_MPEG_VIDEO_H264_PRED_WEIGHTS	(V4L2_CID_CODEC_BASE+1007)
 
-/* enum v4l2_ctrl_type type values */
-#define V4L2_CTRL_TYPE_H264_SPS			0x0110
-#define V4L2_CTRL_TYPE_H264_PPS			0x0111
-#define V4L2_CTRL_TYPE_H264_SCALING_MATRIX	0x0112
-#define V4L2_CTRL_TYPE_H264_SLICE_PARAMS	0x0113
-#define V4L2_CTRL_TYPE_H264_DECODE_PARAMS	0x0114
-#define V4L2_CTRL_TYPE_H264_PRED_WEIGHTS	0x0115
-
 /**
  * enum v4l2_mpeg_video_h264_decode_mode - Decoding mode
  *
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 306d569bec11..261123cb6642 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -1776,6 +1776,13 @@ enum v4l2_ctrl_type {
 	V4L2_CTRL_TYPE_U16	     = 0x0101,
 	V4L2_CTRL_TYPE_U32	     = 0x0102,
 	V4L2_CTRL_TYPE_AREA          = 0x0106,
+
+	V4L2_CTRL_TYPE_H264_SPS             = 0x0200,
+	V4L2_CTRL_TYPE_H264_PPS		    = 0x0201,
+	V4L2_CTRL_TYPE_H264_SCALING_MATRIX  = 0x0202,
+	V4L2_CTRL_TYPE_H264_SLICE_PARAMS    = 0x0203,
+	V4L2_CTRL_TYPE_H264_DECODE_PARAMS   = 0x0204,
+	V4L2_CTRL_TYPE_H264_PRED_WEIGHTS    = 0x0205,
 };
 
 /*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-- 
2.27.0


  parent reply	other threads:[~2020-11-13 21:52 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-13 21:51 [PATCH v2 0/9] Stateless H.264 de-staging Ezequiel Garcia
2020-11-13 21:51 ` [PATCH v2 1/9] media: rkvdec: h264: Support profile and level controls Ezequiel Garcia
2020-11-13 21:51 ` [PATCH v2 2/9] media: cedrus: " Ezequiel Garcia
2020-11-17 19:24   ` Jernej Škrabec
2020-11-17 19:40     ` Ezequiel Garcia
2020-11-17 19:55       ` Jernej Škrabec
2020-11-17 19:55         ` Ezequiel Garcia
2020-11-13 21:51 ` [PATCH v2 3/9] media: Rename stateful codec control macros Ezequiel Garcia
2020-11-14 12:53   ` Hans Verkuil
2020-11-15  1:12     ` Ezequiel Garcia
2020-11-13 21:51 ` [PATCH v2 4/9] media: Clean stateless control includes Ezequiel Garcia
2020-11-13 21:51 ` [PATCH v2 5/9] media: controls: Add the stateless codec control class Ezequiel Garcia
2020-11-13 21:51 ` [PATCH v2 6/9] media: uapi: Move parsed H264 pixel format out of staging Ezequiel Garcia
2020-11-13 21:51 ` Ezequiel Garcia [this message]
2020-11-13 21:51 ` [PATCH v2 8/9] media: uapi: move H264 stateless controls " Ezequiel Garcia
2020-11-13 21:51 ` [PATCH v2 9/9] media: docs: Move the H264 stateless codec uAPI Ezequiel Garcia
2020-11-14 12:57   ` Hans Verkuil
2020-11-15  1:11     ` Ezequiel Garcia
2020-11-14 12:58 ` [PATCH v2 0/9] Stateless H.264 de-staging Hans Verkuil
2020-11-15  0:02   ` Ezequiel Garcia

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=20201113215121.505173-8-ezequiel@collabora.com \
    --to=ezequiel@collabora.com \
    --cc=hverkuil@xs4all.nl \
    --cc=jernej.skrabec@siol.net \
    --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 \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.