70 lines
2.1 KiB
Diff
70 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Sat, 23 May 2020 15:03:46 +0000
|
|
Subject: [PATCH] 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 | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
|
|
index ffc701e268eb..632f7b4357be 100644
|
|
--- a/include/media/hevc-ctrls.h
|
|
+++ b/include/media/hevc-ctrls.h
|
|
@@ -56,6 +56,9 @@ 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;
|
|
+ __u8 chroma_format_idc;
|
|
__u16 pic_width_in_luma_samples;
|
|
__u16 pic_height_in_luma_samples;
|
|
__u8 bit_depth_luma_minus8;
|
|
@@ -76,9 +79,8 @@ struct v4l2_ctrl_hevc_sps {
|
|
__u8 log2_diff_max_min_pcm_luma_coding_block_size;
|
|
__u8 num_short_term_ref_pic_sets;
|
|
__u8 num_long_term_ref_pics_sps;
|
|
- __u8 chroma_format_idc;
|
|
|
|
- __u8 padding;
|
|
+ __u8 padding[7];
|
|
|
|
__u64 flags;
|
|
};
|
|
@@ -105,7 +107,10 @@ 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;
|
|
__s8 init_qp_minus26;
|
|
__u8 diff_cu_qp_delta_depth;
|
|
__s8 pps_cb_qp_offset;
|
|
@@ -118,7 +123,7 @@ struct v4l2_ctrl_hevc_pps {
|
|
__s8 pps_tc_offset_div2;
|
|
__u8 log2_parallel_merge_level_minus2;
|
|
|
|
- __u8 padding[4];
|
|
+ __u8 padding;
|
|
__u64 flags;
|
|
};
|
|
|
|
@@ -204,7 +209,10 @@ struct v4l2_ctrl_hevc_slice_params {
|
|
__u8 num_rps_poc_st_curr_after;
|
|
__u8 num_rps_poc_lt_curr;
|
|
|
|
- __u8 padding[5];
|
|
+ __u16 short_term_ref_pic_set_size;
|
|
+ __u16 long_term_ref_pic_set_size;
|
|
+
|
|
+ __u8 padding;
|
|
|
|
/* ISO/IEC 23008-2, ITU-T Rec. H.265: General slice segment header */
|
|
struct v4l2_hevc_dpb_entry dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
|