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

media: uapi: h264: Drop SLICE_PARAMS 'size' field 



The SLICE_PARAMS control is intended for slice-based
devices. In this mode, the OUTPUT buffer contains
a single slice, and so the buffer's plane payload size
can be used to query the slice size.

To reduce the API surface drop the size from the
SLICE_PARAMS control.

A follow-up change will remove other members in SLICE_PARAMS
so we don't need to add padding fields here.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Tested-by: default avatarJonas Karlman <jonas@kwiboo.se>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent f9879eb3

Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst

+0 −3
Original line number Diff line number Diff line
@@ -1760,9 +1760,6 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - 
    :stub-columns: 0

    :widths:       1 1 2



    * - __u32

      - ``size``

      -

    * - __u32

      - ``start_byte_offset``

        Offset (in bytes) from the beginning of the OUTPUT buffer to the start

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

+3 −4
Original line number Diff line number Diff line
@@ -324,17 +324,16 @@ static void cedrus_set_params(struct cedrus_ctx *ctx, 
	struct vb2_buffer *src_buf = &run->src->vb2_buf;

	struct cedrus_dev *dev = ctx->dev;

	dma_addr_t src_buf_addr;

	u32 len = slice->size * 8;

	size_t slice_bytes = vb2_get_plane_payload(src_buf, 0);

	unsigned int pic_width_in_mbs;

	bool mbaff_pic;

	u32 reg;



	cedrus_write(dev, VE_H264_VLD_LEN, len);

	cedrus_write(dev, VE_H264_VLD_LEN, slice_bytes * 8);

	cedrus_write(dev, VE_H264_VLD_OFFSET, 0);



	src_buf_addr = vb2_dma_contig_plane_dma_addr(src_buf, 0);

	cedrus_write(dev, VE_H264_VLD_END,

		     src_buf_addr + vb2_get_plane_payload(src_buf, 0));

	cedrus_write(dev, VE_H264_VLD_END, src_buf_addr + slice_bytes);

	cedrus_write(dev, VE_H264_VLD_ADDR,

		     VE_H264_VLD_ADDR_VAL(src_buf_addr) |

		     VE_H264_VLD_ADDR_FIRST | VE_H264_VLD_ADDR_VALID |

include/media/h264-ctrls.h

+0 −3
Original line number Diff line number Diff line
@@ -163,9 +163,6 @@ struct v4l2_h264_reference { 
};



struct v4l2_ctrl_h264_slice_params {

	/* Size in bytes, including header */

	__u32 size;



	/* Offset in bytes to the start of slice in the OUTPUT buffer. */

	__u32 start_byte_offset;

CRA Git | Maintained and supported by SUSTech CRA and CCSE