package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-06 01:26:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mpi]: Cleanup unused definition

Browse Source 
Change-Id: Ib8490abf7241f432164f647165b1c67c618c1168
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2020-09-10 14:58:30 +08:00
parent ccf97315fe
commit e8a428ea04
2 changed files with 0 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
inc/rk_venc_cmd.h
View File

@@ -465,67 +465,6 @@ typedef enum MppEncSeiMode_e {
/* /*
* H.264 configurable parameter * H.264 configurable parameter
*/ */
typedef struct MppEncH264VuiCfg_t {
RK_U32 change;
RK_U32 b_vui;
RK_S32 b_aspect_ratio_info_present;
RK_S32 i_sar_width;
RK_S32 i_sar_height;
RK_S32 b_overscan_info_present;
RK_S32 b_overscan_info;
RK_S32 b_signal_type_present;
RK_S32 i_vidformat;
RK_S32 b_fullrange;
RK_S32 b_color_description_present;
RK_S32 i_colorprim;
RK_S32 i_transfer;
RK_S32 i_colmatrix;
RK_S32 b_chroma_loc_info_present;
RK_S32 i_chroma_loc_top;
RK_S32 i_chroma_loc_bottom;
RK_S32 b_timing_info_present;
RK_U32 i_num_units_in_tick;
RK_U32 i_time_scale;
RK_S32 b_fixed_frame_rate;
RK_S32 b_nal_hrd_parameters_present;
RK_S32 b_vcl_hrd_parameters_present;
struct {
RK_S32 i_cpb_cnt;
RK_S32 i_bit_rate_scale;
RK_S32 i_cpb_size_scale;
RK_S32 i_bit_rate_value;
RK_S32 i_cpb_size_value;
RK_S32 i_bit_rate_unscaled;
RK_S32 i_cpb_size_unscaled;
RK_S32 b_cbr_hrd;
RK_S32 i_initial_cpb_removal_delay_length;
RK_S32 i_cpb_removal_delay_length;
RK_S32 i_dpb_output_delay_length;
RK_S32 i_time_offset_length;
} hrd;
RK_S32 b_pic_struct_present;
RK_S32 b_bitstream_restriction;
RK_S32 b_motion_vectors_over_pic_boundaries;
RK_S32 i_max_bytes_per_pic_denom;
RK_S32 i_max_bits_per_mb_denom;
RK_S32 i_log2_max_mv_length_horizontal;
RK_S32 i_log2_max_mv_length_vertical;
RK_S32 i_num_reorder_frames;
RK_S32 i_max_dec_frame_buffering;
/* FIXME to complete */
} MppEncH264VuiCfg;
typedef enum MppEncH264CfgChange_e { typedef enum MppEncH264CfgChange_e {
/* change on stream type */ /* change on stream type */
MPP_ENC_H264_CFG_STREAM_TYPE = (1 << 0), MPP_ENC_H264_CFG_STREAM_TYPE = (1 << 0),
@@ -708,9 +647,6 @@ typedef struct MppEncH264Cfg_t {
RK_S16 max_tid; RK_S16 max_tid;
RK_S16 prefix_mode; RK_S16 prefix_mode;
RK_S16 base_layer_pid; RK_S16 base_layer_pid;
/* extra info */
MppEncH264VuiCfg vui;
} MppEncH264Cfg; } MppEncH264Cfg;
#define H265E_MAX_ROI_NUMBER 64 #define H265E_MAX_ROI_NUMBER 64
@@ -796,11 +732,6 @@ typedef struct MppEncH265VuiCfg_t {
RK_S32 time_scale; RK_S32 time_scale;
} MppEncH265VuiCfg; } MppEncH265VuiCfg;
typedef struct MppEncH265SeiCfg_t {
RK_U32 change;
} MppEncH265SeiCfg;
typedef enum MppEncH265CfgChange_e { typedef enum MppEncH265CfgChange_e {
/* change on stream type */ /* change on stream type */
MPP_ENC_H265_CFG_PROFILE_LEVEL_TILER_CHANGE = (1 << 0), MPP_ENC_H265_CFG_PROFILE_LEVEL_TILER_CHANGE = (1 << 0),
@@ -944,7 +875,6 @@ typedef struct MppEncH265Cfg_t {
/* extra info */ /* extra info */
MppEncH265VuiCfg vui; MppEncH265VuiCfg vui;
MppEncH265SeiCfg sei;
MppEncH265CtuCfg ctu; MppEncH265CtuCfg ctu;
MppEncH265RoiCfg roi; MppEncH265RoiCfg roi;

3
mpp/codec/enc/h264/h264e_api_v2.c
View File

@@ -511,9 +511,6 @@ static MPP_RET h264e_proc_h264_cfg(MppEncH264Cfg *dst, MppEncH264Cfg *src)
dst->change |= MPP_ENC_H264_CFG_CHANGE_BASE_LAYER_PID; dst->change |= MPP_ENC_H264_CFG_CHANGE_BASE_LAYER_PID;
} }
if (change & MPP_ENC_H264_CFG_CHANGE_VUI)
dst->vui = src->vui;
return ret; return ret;
} }