| From 97f689d68f479ebe9adc99a2e2f762b1b9935b50 Mon Sep 17 00:00:00 2001 |
| From: Ezequiel Garcia <ezequiel@collabora.com> |
| Date: Thu, 26 Nov 2020 10:36:13 +0100 |
| Subject: [PATCH] BACKPORT: 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> |
| (cherry picked from commit 95e95ebe9119dcdf04e8aa9e1d9e8de4f1150c67) |
| |
| Conflicts: |
| include/media/h264-ctrls.h |
| include/uapi/linux/videodev2.h |
| |
| Dropped h264-ctrls.h part, which doesn't exist in v4.14. |
| |
| BUG=b:278157861 |
| TEST=check header |
| |
| Change-Id: Ic0be1c2a9ede17e810b29c8765b473faeb25f2a4 |
| Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> |
| --- |
| include/uapi/linux/videodev2.h | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h |
| index ba937f51c15d..c1e1e0f1a013 100644 |
| --- a/include/uapi/linux/videodev2.h |
| +++ b/include/uapi/linux/videodev2.h |
| @@ -636,6 +636,7 @@ struct v4l2_pix_format { |
| #define V4L2_PIX_FMT_VP8 v4l2_fourcc('V', 'P', '8', '0') /* VP8 */ |
| #define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0') /* VP9 */ |
| #define V4L2_PIX_FMT_HEVC v4l2_fourcc('H', 'E', 'V', 'C') /* HEVC aka H.265 */ |
| +#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 */ |
| -- |
| 2.39.2 |
| |
