Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: uapi: v4l2-controls: Cleanup codec definitions
Move some fields closer to where they are used, add missing tabs
and remove an extra newline.
Signed-off-by: Paul Kocialkowski <paulk@sys-base.io>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
authored by
Paul Kocialkowski
and committed by
Hans Verkuil
34837c44
9df928c9
+11
-12
+11
-12
include/uapi/linux/v4l2-controls.h
+11
-12
include/uapi/linux/v4l2-controls.h
···
1537
1537
struct v4l2_h264_weight_factors weight_factors[2];
1538
1538
};
1539
1539
1540
-
#define V4L2_H264_SLICE_TYPE_P 0
1541
-
#define V4L2_H264_SLICE_TYPE_B 1
1542
-
#define V4L2_H264_SLICE_TYPE_I 2
1543
-
#define V4L2_H264_SLICE_TYPE_SP 3
1544
-
#define V4L2_H264_SLICE_TYPE_SI 4
1545
-
1546
-
#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED 0x01
1547
-
#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH 0x02
1548
-
1549
1540
#define V4L2_H264_TOP_FIELD_REF 0x1
1550
1541
#define V4L2_H264_BOTTOM_FIELD_REF 0x2
1551
1542
#define V4L2_H264_FRAME_REF 0x3
···
1557
1566
* Maximum DPB size, as specified by section 'A.3.1 Level limits
1558
1567
* common to the Baseline, Main, and Extended profiles'.
1559
1568
*/
1560
-
#define V4L2_H264_NUM_DPB_ENTRIES 16
1561
-
#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES)
1569
+
#define V4L2_H264_NUM_DPB_ENTRIES 16
1570
+
#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES)
1571
+
1572
+
#define V4L2_H264_SLICE_TYPE_P 0
1573
+
#define V4L2_H264_SLICE_TYPE_B 1
1574
+
#define V4L2_H264_SLICE_TYPE_I 2
1575
+
#define V4L2_H264_SLICE_TYPE_SP 3
1576
+
#define V4L2_H264_SLICE_TYPE_SI 4
1577
+
1578
+
#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED 0x01
1579
+
#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH 0x02
1562
1580
1563
1581
#define V4L2_CID_STATELESS_H264_SLICE_PARAMS (V4L2_CID_CODEC_STATELESS_BASE + 6)
1564
1582
/**
···
1706
1706
__u32 reserved;
1707
1707
__u32 flags;
1708
1708
};
1709
-
1710
1709
1711
1710
/* Stateless FWHT control, used by the vicodec driver */
1712
1711