Commit 7bb3c32a authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: uapi: h264: Rename pixel format 



The V4L2_PIX_FMT_H264_SLICE_RAW name was originally suggested
because the pixel format would represent H264 slices without any
start code.

However, as we will now introduce a start code menu control,
give the pixel format a more meaningful name, while it's
still early enough to do so.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Tested-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 4333fb96

Documentation/media/uapi/v4l/pixfmt-compressed.rst

+2 −2
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ Compressed Formats 
      - ``V4L2_PIX_FMT_H264_MVC``

      - 'M264'

      - H264 MVC video elementary stream.

    * .. _V4L2-PIX-FMT-H264-SLICE-RAW:

    * .. _V4L2-PIX-FMT-H264-SLICE:



      - ``V4L2_PIX_FMT_H264_SLICE_RAW``

      - ``V4L2_PIX_FMT_H264_SLICE``

      - 'S264'

      - H264 parsed slice data, without the start code and as

	extracted from the H264 bitstream.  This format is adapted for

drivers/media/v4l2-core/v4l2-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) 
		case V4L2_PIX_FMT_H264:		descr = "H.264"; break;

		case V4L2_PIX_FMT_H264_NO_SC:	descr = "H.264 (No Start Codes)"; break;

		case V4L2_PIX_FMT_H264_MVC:	descr = "H.264 MVC"; break;

		case V4L2_PIX_FMT_H264_SLICE_RAW:	descr = "H.264 Parsed Slice Data"; break;

		case V4L2_PIX_FMT_H264_SLICE:	descr = "H.264 Parsed Slice Data"; break;

		case V4L2_PIX_FMT_H263:		descr = "H.263"; break;

		case V4L2_PIX_FMT_MPEG1:	descr = "MPEG-1 ES"; break;

		case V4L2_PIX_FMT_MPEG2:	descr = "MPEG-2 ES"; break;

drivers/staging/media/sunxi/cedrus/cedrus_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void cedrus_device_run(void *priv) 
			V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION);

		break;



	case V4L2_PIX_FMT_H264_SLICE_RAW:

	case V4L2_PIX_FMT_H264_SLICE:

		run.h264.decode_params = cedrus_find_control_data(ctx,

			V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS);

		run.h264.pps = cedrus_find_control_data(ctx,

drivers/staging/media/sunxi/cedrus/cedrus_video.c

+3 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static struct cedrus_format cedrus_formats[] = { 
		.directions	= CEDRUS_DECODE_SRC,

	},

	{

		.pixelformat	= V4L2_PIX_FMT_H264_SLICE_RAW,

		.pixelformat	= V4L2_PIX_FMT_H264_SLICE,

		.directions	= CEDRUS_DECODE_SRC,

	},

	{
@@ -104,7 +104,7 @@ static void cedrus_prepare_format(struct v4l2_pix_format *pix_fmt) 


	switch (pix_fmt->pixelformat) {

	case V4L2_PIX_FMT_MPEG2_SLICE:

	case V4L2_PIX_FMT_H264_SLICE_RAW:

	case V4L2_PIX_FMT_H264_SLICE:

		/* Zero bytes per line for encoded source. */

		bytesperline = 0;
@@ -449,7 +449,7 @@ static int cedrus_start_streaming(struct vb2_queue *vq, unsigned int count) 
		ctx->current_codec = CEDRUS_CODEC_MPEG2;

		break;



	case V4L2_PIX_FMT_H264_SLICE_RAW:

	case V4L2_PIX_FMT_H264_SLICE:

		ctx->current_codec = CEDRUS_CODEC_H264;

		break;

include/media/h264-ctrls.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/videodev2.h>



/* Our pixel format isn't stable at the moment */

#define V4L2_PIX_FMT_H264_SLICE_RAW v4l2_fourcc('S', '2', '6', '4') /* H264 parsed slices */

#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

CRA Git | Maintained and supported by SUSTech CRA and CCSE