From: Ezequiel Garcia <ezequiel@collabora.com>
To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
Nicolas Dufresne <nicolas.dufresne@collabora.com>,
Alexandre Courbot <acourbot@chromium.org>,
Ezequiel Garcia <ezequiel@collabora.com>,
kernel@collabora.com
Subject: [PATCH 5/7] media: uapi: Move the VP8 stateless control type out of staging
Date: Tue, 2 Mar 2021 17:54:03 -0300 [thread overview]
Message-ID: <20210302205405.69538-6-ezequiel@collabora.com> (raw)
In-Reply-To: <20210302205405.69538-1-ezequiel@collabora.com>
Move the VP8 stateless control types out of staging,
and re-number it to avoid any confusion.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
include/media/vp8-ctrls.h | 1 -
include/uapi/linux/videodev2.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/media/vp8-ctrls.h b/include/media/vp8-ctrls.h
index 1a5a3d8ab444..051700f33863 100644
--- a/include/media/vp8-ctrls.h
+++ b/include/media/vp8-ctrls.h
@@ -14,7 +14,6 @@
#include <linux/types.h>
#define V4L2_CID_MPEG_VIDEO_VP8_FRAME (V4L2_CID_CODEC_BASE + 2000)
-#define V4L2_CTRL_TYPE_VP8_FRAME 0x301
#define V4L2_VP8_SEGMENT_FLAG_ENABLED 0x01
#define V4L2_VP8_SEGMENT_FLAG_UPDATE_MAP 0x02
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index a1d903c6f9f0..611b75df7f17 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -1793,6 +1793,8 @@ enum v4l2_ctrl_type {
V4L2_CTRL_TYPE_H264_PRED_WEIGHTS = 0x0205,
V4L2_CTRL_TYPE_FWHT_PARAMS = 0x0220,
+
+ V4L2_CTRL_TYPE_VP8_FRAME = 0x0240,
};
/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
--
2.30.0
next prev parent reply other threads:[~2021-03-02 22:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-02 20:53 [PATCH 0/7] V4L2 stateless VP8 de-staging Ezequiel Garcia
2021-03-02 20:53 ` [PATCH 1/7] media: uapi: vp8: Remove "header" from symbol names and macros Ezequiel Garcia
2021-03-02 20:54 ` [PATCH 2/7] media: uapi: vp8: Rename v4l2_vp8_loopfilter to v4l2_vp8_loop_filter Ezequiel Garcia
2021-03-02 20:54 ` [PATCH 3/7] media: uapi: vp8: Add proper kernel-doc documentation Ezequiel Garcia
2021-03-02 20:54 ` [PATCH 4/7] media: uapi: Move parsed VP8 pixel format out of staging Ezequiel Garcia
2021-03-02 20:54 ` Ezequiel Garcia [this message]
2021-03-02 20:54 ` [PATCH 6/7] media: controls: Log VP8 stateless control in .std_log Ezequiel Garcia
2021-03-02 20:54 ` [PATCH 7/7] media: uapi: move VP8 stateless controls out of staging Ezequiel Garcia
2021-03-03 14:29 ` 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=20210302205405.69538-6-ezequiel@collabora.com \
--to=ezequiel@collabora.com \
--cc=acourbot@chromium.org \
--cc=hverkuil@xs4all.nl \
--cc=kernel@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=nicolas.dufresne@collabora.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 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).