diff options
| author |  Ezequiel Garcia <ezequiel@collabora.com>
| 2020-11-26 10:36:13 +0100 |
|---|---|---|
| committer |  Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| 2020-12-03 12:27:33 +0100 |
| commit | 95e95ebe9119dcdf04e8aa9e1d9e8de4f1150c67 (patch) | |
| tree | 0b34a57e9d298aa08e26bcb55c0101428f5f0315 /include | |
| parent | media: controls: Add the stateless codec control class (diff) | |
| download | linux-95e95ebe9119dcdf04e8aa9e1d9e8de4f1150c67.tar.gz linux-95e95ebe9119dcdf04e8aa9e1d9e8de4f1150c67.tar.bz2 linux-95e95ebe9119dcdf04e8aa9e1d9e8de4f1150c67.zip | |
media: uapi: Move parsed H264 pixel format out of staging
Since we are ready to stabilize the H264 stateless API,
start by first moving the parsed H264 pixel format.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Tested-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/h264-ctrls.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/videodev2.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h index 083899c3ea19..d98c5b885379 100644 --- a/include/media/h264-ctrls.h +++ b/include/media/h264-ctrls.h @@ -21,9 +21,6 @@ #define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES) -/* Our pixel format isn't stable at the moment */ -#define V4L2_PIX_FMT_H264_SLICE 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 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 761ac9da3ffd..ed6a85f1442e 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -703,6 +703,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_HEVC v4l2_fourcc('H', 'E', 'V', 'C') /* HEVC aka H.265 */ #define V4L2_PIX_FMT_FWHT v4l2_fourcc('F', 'W', 'H', 'T') /* Fast Walsh Hadamard Transform (vicodec) */ #define V4L2_PIX_FMT_FWHT_STATELESS v4l2_fourcc('S', 'F', 'W', 'H') /* Stateless FWHT (vicodec) */ +#define V4L2_PIX_FMT_H264_SLICE v4l2_fourcc('S', '2', '6', '4') /* H264 parsed slices */ /* Vendor-specific formats */ #define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */ |