Commit 1fb03333 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

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



Since we are ready to stabilize the VP8 stateless API,
move the parsed VP8 pixel format.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent dacd5945

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

+0 −5
Original line number Diff line number Diff line
@@ -164,11 +164,6 @@ Compressed Formats 
	of macroblocks to decode a full corresponding frame to the matching

	capture buffer.



	.. note::



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

	   is expected to change.



    * .. _V4L2-PIX-FMT-VP9:



      - ``V4L2_PIX_FMT_VP9``

include/media/vp8-ctrls.h

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 


#include <linux/types.h>



#define V4L2_PIX_FMT_VP8_FRAME v4l2_fourcc('V', 'P', '8', 'F')



#define V4L2_CID_MPEG_VIDEO_VP8_FRAME (V4L2_CID_CODEC_BASE + 2000)

#define V4L2_CTRL_TYPE_VP8_FRAME 0x301

include/uapi/linux/videodev2.h

+1 −0
Original line number Diff line number Diff line
@@ -694,6 +694,7 @@ struct v4l2_pix_format { 
#define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */

#define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */

#define V4L2_PIX_FMT_VP8      v4l2_fourcc('V', 'P', '8', '0') /* VP8 */

#define V4L2_PIX_FMT_VP8_FRAME v4l2_fourcc('V', 'P', '8', 'F') /* VP8 parsed frame */

#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_FWHT     v4l2_fourcc('F', 'W', 'H', 'T') /* Fast Walsh Hadamard Transform (vicodec) */