Commit 01dcfd53 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: uapi: Move parsed HEVC pixel format out of staging 



Move HEVC pixel format since we are ready to stabilize the uAPI

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Acked-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Tested-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 311027bd

Documentation/userspace-api/media/v4l/pixfmt-compressed.rst

+0 −5
Original line number Diff line number Diff line
@@ -215,11 +215,6 @@ Compressed Formats 
	See the :ref:`associated Codec Control IDs <v4l2-mpeg-hevc>`.

	Buffers associated with this pixel format must contain the appropriate

	number of macroblocks to decode a full corresponding frame.



	.. note::



	   This format is not yet part of the public kernel API and it

	   is expected to change.

    * .. _V4L2-PIX-FMT-FWHT:



      - ``V4L2_PIX_FMT_FWHT``

include/media/hevc-ctrls.h

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 


#include <linux/videodev2.h>



/* The pixel format isn't stable at the moment and will likely be renamed. */

#define V4L2_PIX_FMT_HEVC_SLICE v4l2_fourcc('S', '2', '6', '5') /* HEVC parsed slices */



#define V4L2_CID_STATELESS_HEVC_SPS		(V4L2_CID_CODEC_BASE + 1008)

#define V4L2_CID_STATELESS_HEVC_PPS		(V4L2_CID_CODEC_BASE + 1009)

#define V4L2_CID_STATELESS_HEVC_SLICE_PARAMS	(V4L2_CID_CODEC_BASE + 1010)

include/uapi/linux/videodev2.h

+1 −0
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ struct v4l2_pix_format { 
#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 */

#define V4L2_PIX_FMT_HEVC_SLICE v4l2_fourcc('S', '2', '6', '5') /* HEVC parsed slices */



/*  Vendor-specific formats   */

#define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */