67 lines
2.0 KiB
Diff
67 lines
2.0 KiB
Diff
From b47ff0ab5ea204f3db72e8ab1c1b4a69679e6441 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Sat, 23 May 2020 15:03:46 +0000
|
|
Subject: [PATCH 054/101] WIP: media: uapi: hevc: add fields needed for rkvdec
|
|
|
|
NOTE: these fields are used by rkvdec hevc backend
|
|
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
---
|
|
include/media/hevc-ctrls.h | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
|
|
index ef63bc205..a808894e8 100644
|
|
--- a/include/media/hevc-ctrls.h
|
|
+++ b/include/media/hevc-ctrls.h
|
|
@@ -58,6 +58,8 @@ enum v4l2_mpeg_video_hevc_start_code {
|
|
/* The controls are not stable at the moment and will likely be reworked. */
|
|
struct v4l2_ctrl_hevc_sps {
|
|
/* ISO/IEC 23008-2, ITU-T Rec. H.265: Sequence parameter set */
|
|
+ __u8 video_parameter_set_id;
|
|
+ __u8 seq_parameter_set_id;
|
|
__u16 pic_width_in_luma_samples;
|
|
__u16 pic_height_in_luma_samples;
|
|
__u8 bit_depth_luma_minus8;
|
|
@@ -81,6 +83,8 @@ struct v4l2_ctrl_hevc_sps {
|
|
__u8 chroma_format_idc;
|
|
__u8 sps_max_sub_layers_minus1;
|
|
|
|
+ __u8 padding[6];
|
|
+
|
|
__u64 flags;
|
|
};
|
|
|
|
@@ -108,6 +112,7 @@ struct v4l2_ctrl_hevc_sps {
|
|
|
|
struct v4l2_ctrl_hevc_pps {
|
|
/* ISO/IEC 23008-2, ITU-T Rec. H.265: Picture parameter set */
|
|
+ __u8 pic_parameter_set_id;
|
|
__u8 num_extra_slice_header_bits;
|
|
__u8 num_ref_idx_l0_default_active_minus1;
|
|
__u8 num_ref_idx_l1_default_active_minus1;
|
|
@@ -123,7 +128,7 @@ struct v4l2_ctrl_hevc_pps {
|
|
__s8 pps_tc_offset_div2;
|
|
__u8 log2_parallel_merge_level_minus2;
|
|
|
|
- __u8 padding[4];
|
|
+ __u8 padding;
|
|
__u64 flags;
|
|
};
|
|
|
|
@@ -202,7 +207,10 @@ struct v4l2_ctrl_hevc_slice_params {
|
|
__u8 ref_idx_l0[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
|
|
__u8 ref_idx_l1[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
|
|
|
|
- __u8 padding;
|
|
+ __u16 short_term_ref_pic_set_size;
|
|
+ __u16 long_term_ref_pic_set_size;
|
|
+
|
|
+ __u8 padding[4];
|
|
|
|
/* ISO/IEC 23008-2, ITU-T Rec. H.265: Weighted prediction parameter */
|
|
struct v4l2_hevc_pred_weight_table pred_weight_table;
|
|
--
|
|
2.31.1
|
|
|