Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: uapi: Move colorimetry controls at the end of the file
The colorimetry controls class is defined after the stateless codec
class at the top of the controls header. It is currently defined in
the middle of stateless codec controls.
Move the colorimetry controls after the stateless codec controls,
at the end of the file.
Signed-off-by: Paul Kocialkowski <paulk@sys-base.io>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
authored by
Paul Kocialkowski
and committed by
Hans Verkuil
4247053a
32d40a57
+34
-34
+34
-34
include/uapi/linux/v4l2-controls.h
+34
-34
include/uapi/linux/v4l2-controls.h
···
2549
2549
__u8 scaling_list_dc_coef_32x32[2];
2550
2550
};
2551
2551
2552
-
#define V4L2_CID_COLORIMETRY_CLASS_BASE (V4L2_CTRL_CLASS_COLORIMETRY | 0x900)
2553
-
#define V4L2_CID_COLORIMETRY_CLASS (V4L2_CTRL_CLASS_COLORIMETRY | 1)
2554
-
2555
-
#define V4L2_CID_COLORIMETRY_HDR10_CLL_INFO (V4L2_CID_COLORIMETRY_CLASS_BASE + 0)
2556
-
2557
-
struct v4l2_ctrl_hdr10_cll_info {
2558
-
__u16 max_content_light_level;
2559
-
__u16 max_pic_average_light_level;
2560
-
};
2561
-
2562
-
#define V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY (V4L2_CID_COLORIMETRY_CLASS_BASE + 1)
2563
-
2564
-
#define V4L2_HDR10_MASTERING_PRIMARIES_X_LOW 5
2565
-
#define V4L2_HDR10_MASTERING_PRIMARIES_X_HIGH 37000
2566
-
#define V4L2_HDR10_MASTERING_PRIMARIES_Y_LOW 5
2567
-
#define V4L2_HDR10_MASTERING_PRIMARIES_Y_HIGH 42000
2568
-
#define V4L2_HDR10_MASTERING_WHITE_POINT_X_LOW 5
2569
-
#define V4L2_HDR10_MASTERING_WHITE_POINT_X_HIGH 37000
2570
-
#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_LOW 5
2571
-
#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_HIGH 42000
2572
-
#define V4L2_HDR10_MASTERING_MAX_LUMA_LOW 50000
2573
-
#define V4L2_HDR10_MASTERING_MAX_LUMA_HIGH 100000000
2574
-
#define V4L2_HDR10_MASTERING_MIN_LUMA_LOW 1
2575
-
#define V4L2_HDR10_MASTERING_MIN_LUMA_HIGH 50000
2576
-
2577
-
struct v4l2_ctrl_hdr10_mastering_display {
2578
-
__u16 display_primaries_x[3];
2579
-
__u16 display_primaries_y[3];
2580
-
__u16 white_point_x;
2581
-
__u16 white_point_y;
2582
-
__u32 max_display_mastering_luminance;
2583
-
__u32 min_display_mastering_luminance;
2584
-
};
2585
-
2586
2552
/* Stateless VP9 controls */
2587
2553
2588
2554
#define V4L2_VP9_LOOP_FILTER_FLAG_DELTA_ENABLED 0x1
···
3480
3514
#define V4L2_CID_MPEG_CX2341X_BASE V4L2_CID_CODEC_CX2341X_BASE
3481
3515
#define V4L2_CID_MPEG_MFC51_BASE V4L2_CID_CODEC_MFC51_BASE
3482
3516
#endif
3517
+
3518
+
#define V4L2_CID_COLORIMETRY_CLASS_BASE (V4L2_CTRL_CLASS_COLORIMETRY | 0x900)
3519
+
#define V4L2_CID_COLORIMETRY_CLASS (V4L2_CTRL_CLASS_COLORIMETRY | 1)
3520
+
3521
+
#define V4L2_CID_COLORIMETRY_HDR10_CLL_INFO (V4L2_CID_COLORIMETRY_CLASS_BASE + 0)
3522
+
3523
+
struct v4l2_ctrl_hdr10_cll_info {
3524
+
__u16 max_content_light_level;
3525
+
__u16 max_pic_average_light_level;
3526
+
};
3527
+
3528
+
#define V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY (V4L2_CID_COLORIMETRY_CLASS_BASE + 1)
3529
+
3530
+
#define V4L2_HDR10_MASTERING_PRIMARIES_X_LOW 5
3531
+
#define V4L2_HDR10_MASTERING_PRIMARIES_X_HIGH 37000
3532
+
#define V4L2_HDR10_MASTERING_PRIMARIES_Y_LOW 5
3533
+
#define V4L2_HDR10_MASTERING_PRIMARIES_Y_HIGH 42000
3534
+
#define V4L2_HDR10_MASTERING_WHITE_POINT_X_LOW 5
3535
+
#define V4L2_HDR10_MASTERING_WHITE_POINT_X_HIGH 37000
3536
+
#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_LOW 5
3537
+
#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_HIGH 42000
3538
+
#define V4L2_HDR10_MASTERING_MAX_LUMA_LOW 50000
3539
+
#define V4L2_HDR10_MASTERING_MAX_LUMA_HIGH 100000000
3540
+
#define V4L2_HDR10_MASTERING_MIN_LUMA_LOW 1
3541
+
#define V4L2_HDR10_MASTERING_MIN_LUMA_HIGH 50000
3542
+
3543
+
struct v4l2_ctrl_hdr10_mastering_display {
3544
+
__u16 display_primaries_x[3];
3545
+
__u16 display_primaries_y[3];
3546
+
__u16 white_point_x;
3547
+
__u16 white_point_y;
3548
+
__u32 max_display_mastering_luminance;
3549
+
__u32 min_display_mastering_luminance;
3550
+
};
3483
3551
3484
3552
#endif