msm: vidc: Driver cleanup
Remove unused legacy properties.
CRs-Fixed: 2008588
Change-Id: I90c87fecb7a7e2d55635d9f24eca1d3512679ef1
Signed-off-by: Chinmay Sawarkar <chinmays@codeaurora.org>
diff --git a/drivers/media/platform/msm/vidc/vidc_hfi_helper.h b/drivers/media/platform/msm/vidc/vidc_hfi_helper.h
index 9ab1a81..a552992 100644
--- a/drivers/media/platform/msm/vidc/vidc_hfi_helper.h
+++ b/drivers/media/platform/msm/vidc/vidc_hfi_helper.h
@@ -76,14 +76,8 @@
#define HFI_EVENT_SESSION_ERROR (HFI_COMMON_BASE + 0x2)
#define HFI_VIDEO_CODEC_H264 0x00000002
-#define HFI_VIDEO_CODEC_H263 0x00000004
#define HFI_VIDEO_CODEC_MPEG1 0x00000008
#define HFI_VIDEO_CODEC_MPEG2 0x00000010
-#define HFI_VIDEO_CODEC_MPEG4 0x00000020
-#define HFI_VIDEO_CODEC_DIVX_311 0x00000040
-#define HFI_VIDEO_CODEC_DIVX 0x00000080
-#define HFI_VIDEO_CODEC_VC1 0x00000100
-#define HFI_VIDEO_CODEC_SPARK 0x00000200
#define HFI_VIDEO_CODEC_VP8 0x00001000
#define HFI_VIDEO_CODEC_HEVC 0x00002000
#define HFI_VIDEO_CODEC_VP9 0x00004000
@@ -113,18 +107,7 @@
#define HFI_H264_LEVEL_42 0x00002000
#define HFI_H264_LEVEL_5 0x00004000
#define HFI_H264_LEVEL_51 0x00008000
-#define HFI_H264_LEVEL_52 0x00010000
-
-#define HFI_H263_PROFILE_BASELINE 0x00000001
-
-#define HFI_H263_LEVEL_10 0x00000001
-#define HFI_H263_LEVEL_20 0x00000002
-#define HFI_H263_LEVEL_30 0x00000004
-#define HFI_H263_LEVEL_40 0x00000008
-#define HFI_H263_LEVEL_45 0x00000010
-#define HFI_H263_LEVEL_50 0x00000020
-#define HFI_H263_LEVEL_60 0x00000040
-#define HFI_H263_LEVEL_70 0x00000080
+#define HFI_H264_LEVEL_52 0x00010000
#define HFI_MPEG2_PROFILE_SIMPLE 0x00000001
#define HFI_MPEG2_PROFILE_MAIN 0x00000002
@@ -138,36 +121,6 @@
#define HFI_MPEG2_LEVEL_H14 0x00000004
#define HFI_MPEG2_LEVEL_HL 0x00000008
-#define HFI_MPEG4_PROFILE_SIMPLE 0x00000001
-#define HFI_MPEG4_PROFILE_ADVANCEDSIMPLE 0x00000002
-
-#define HFI_MPEG4_LEVEL_0 0x00000001
-#define HFI_MPEG4_LEVEL_0b 0x00000002
-#define HFI_MPEG4_LEVEL_1 0x00000004
-#define HFI_MPEG4_LEVEL_2 0x00000008
-#define HFI_MPEG4_LEVEL_3 0x00000010
-#define HFI_MPEG4_LEVEL_4 0x00000020
-#define HFI_MPEG4_LEVEL_4a 0x00000040
-#define HFI_MPEG4_LEVEL_5 0x00000080
-#define HFI_MPEG4_LEVEL_6 0x00000100
-#define HFI_MPEG4_LEVEL_7 0x00000200
-#define HFI_MPEG4_LEVEL_8 0x00000400
-#define HFI_MPEG4_LEVEL_9 0x00000800
-#define HFI_MPEG4_LEVEL_3b 0x00001000
-
-#define HFI_VC1_PROFILE_SIMPLE 0x00000001
-#define HFI_VC1_PROFILE_MAIN 0x00000002
-#define HFI_VC1_PROFILE_ADVANCED 0x00000004
-
-#define HFI_VC1_LEVEL_LOW 0x00000001
-#define HFI_VC1_LEVEL_MEDIUM 0x00000002
-#define HFI_VC1_LEVEL_HIGH 0x00000004
-#define HFI_VC1_LEVEL_0 0x00000008
-#define HFI_VC1_LEVEL_1 0x00000010
-#define HFI_VC1_LEVEL_2 0x00000020
-#define HFI_VC1_LEVEL_3 0x00000040
-#define HFI_VC1_LEVEL_4 0x00000080
-
#define HFI_VPX_PROFILE_SIMPLE 0x00000001
#define HFI_VPX_PROFILE_ADVANCED 0x00000002
#define HFI_VPX_PROFILE_VERSION_0 0x00000004
@@ -175,16 +128,6 @@
#define HFI_VPX_PROFILE_VERSION_2 0x00000010
#define HFI_VPX_PROFILE_VERSION_3 0x00000020
-#define HFI_DIVX_FORMAT_4 (HFI_COMMON_BASE + 0x1)
-#define HFI_DIVX_FORMAT_5 (HFI_COMMON_BASE + 0x2)
-#define HFI_DIVX_FORMAT_6 (HFI_COMMON_BASE + 0x3)
-
-#define HFI_DIVX_PROFILE_QMOBILE 0x00000001
-#define HFI_DIVX_PROFILE_MOBILE 0x00000002
-#define HFI_DIVX_PROFILE_MT 0x00000004
-#define HFI_DIVX_PROFILE_HT 0x00000008
-#define HFI_DIVX_PROFILE_HD 0x00000010
-
#define HFI_HEVC_PROFILE_MAIN 0x00000001
#define HFI_HEVC_PROFILE_MAIN10 0x00000002
#define HFI_HEVC_PROFILE_MAIN_STILL_PIC 0x00000004
@@ -267,8 +210,6 @@
(HFI_PROPERTY_PARAM_COMMON_START + 0x00B)
#define HFI_PROPERTY_PARAM_MULTI_VIEW_FORMAT \
(HFI_PROPERTY_PARAM_COMMON_START + 0x00C)
-#define HFI_PROPERTY_PARAM_MAX_SEQUENCE_HEADER_SIZE \
- (HFI_PROPERTY_PARAM_COMMON_START + 0x00D)
#define HFI_PROPERTY_PARAM_CODEC_MASK_SUPPORTED \
(HFI_PROPERTY_PARAM_COMMON_START + 0x00E)
#define HFI_PROPERTY_PARAM_MVC_BUFFER_LAYOUT \
@@ -287,8 +228,6 @@
(HFI_PROPERTY_PARAM_VDEC_COMMON_START + 0x001)
#define HFI_PROPERTY_PARAM_VDEC_CONCEAL_COLOR \
(HFI_PROPERTY_PARAM_VDEC_COMMON_START + 0x002)
-#define HFI_PROPERTY_PARAM_VDEC_NONCP_OUTPUT2 \
- (HFI_PROPERTY_PARAM_VDEC_COMMON_START + 0x003)
#define HFI_PROPERTY_PARAM_VDEC_PIXEL_BITDEPTH \
(HFI_PROPERTY_PARAM_VDEC_COMMON_START + 0x007)
#define HFI_PROPERTY_PARAM_VDEC_PIC_STRUCT \
@@ -310,20 +249,8 @@
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x003)
#define HFI_PROPERTY_PARAM_VENC_RATE_CONTROL \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x004)
-#define HFI_PROPERTY_PARAM_VENC_H264_PICORDER_CNT_TYPE \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x005)
-#define HFI_PROPERTY_PARAM_VENC_SESSION_QP \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x006)
-#define HFI_PROPERTY_PARAM_VENC_MPEG4_AC_PREDICTION \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x007)
#define HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x008)
-#define HFI_PROPERTY_PARAM_VENC_MPEG4_TIME_RESOLUTION \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x009)
-#define HFI_PROPERTY_PARAM_VENC_MPEG4_SHORT_HEADER \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x00A)
-#define HFI_PROPERTY_PARAM_VENC_MPEG4_HEADER_EXTENSION \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x00B)
#define HFI_PROPERTY_PARAM_VENC_OPEN_GOP \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x00C)
#define HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH \
@@ -334,8 +261,6 @@
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x00F)
#define HFI_PROPERTY_PARAM_VENC_QUALITY_VS_SPEED \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x010)
-#define HFI_PROPERTY_PARAM_VENC_ADVANCED \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x012)
#define HFI_PROPERTY_PARAM_VENC_H264_SPS_ID \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x014)
#define HFI_PROPERTY_PARAM_VENC_H264_PPS_ID \
@@ -346,8 +271,6 @@
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x017)
#define HFI_PROPERTY_PARAM_VENC_NUMREF \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x018)
-#define HFI_PROPERTY_PARAM_VENC_MULTIREF_P \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x019)
#define HFI_PROPERTY_PARAM_VENC_H264_NAL_SVC_EXT \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x01B)
#define HFI_PROPERTY_PARAM_VENC_LTRMODE \
@@ -356,8 +279,6 @@
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x01D)
#define HFI_PROPERTY_PARAM_VENC_H264_VUI_TIMING_INFO \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x01E)
-#define HFI_PROPERTY_PARAM_VENC_VC1_PERF_CFG \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x01F)
#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x020)
#define HFI_PROPERTY_PARAM_VENC_H264_VUI_BITSTREAM_RESTRC \
@@ -372,12 +293,8 @@
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x026)
#define HFI_PROPERTY_PARAM_VENC_DISABLE_RC_TIMESTAMP \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x027)
-#define HFI_PROPERTY_PARAM_VENC_INITIAL_QP \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x028)
#define HFI_PROPERTY_PARAM_VENC_VPX_ERROR_RESILIENCE_MODE \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x029)
-#define HFI_PROPERTY_PARAM_VENC_CONSTRAINED_INTRA_PRED \
- (HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x02B)
#define HFI_PROPERTY_PARAM_VENC_HIER_B_MAX_NUM_ENH_LAYER \
(HFI_PROPERTY_PARAM_VENC_COMMON_START + 0x02C)
#define HFI_PROPERTY_PARAM_VENC_HIER_P_HYBRID_MODE \
@@ -401,9 +318,6 @@
(HFI_PROPERTY_CONFIG_VENC_COMMON_START + 0x004)
#define HFI_PROPERTY_CONFIG_VENC_SLICE_SIZE \
(HFI_PROPERTY_CONFIG_VENC_COMMON_START + 0x005)
-#define HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE \
- (HFI_PROPERTY_CONFIG_VENC_COMMON_START + 0x007)
-
#define HFI_PROPERTY_PARAM_VPE_COMMON_START \
(HFI_DOMAIN_BASE_VPE + HFI_ARCH_COMMON_OFFSET + 0x7000)
#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER \
@@ -414,8 +328,6 @@
(HFI_PROPERTY_CONFIG_VENC_COMMON_START + 0x00A)
#define HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER \
(HFI_PROPERTY_CONFIG_VENC_COMMON_START + 0x00B)
-#define HFI_PROPERTY_CONFIG_VENC_LTRPERIOD \
- (HFI_PROPERTY_CONFIG_VENC_COMMON_START + 0x00C)
#define HFI_PROPERTY_CONFIG_VENC_PERF_MODE \
(HFI_PROPERTY_CONFIG_VENC_COMMON_START + 0x00E)
#define HFI_PROPERTY_CONFIG_VENC_BASELAYER_PRIORITYID \
@@ -528,13 +440,6 @@
struct hfi_intra_refresh {
u32 mode;
- u32 air_mbs;
- u32 air_ref;
- u32 cir_mbs;
-};
-
-struct hfi_3x_intra_refresh {
- u32 mode;
u32 mbs;
};
@@ -551,11 +456,6 @@
u32 max_num_b_frames;
};
-struct hfi_vc1e_perf_cfg_type {
- u32 search_range_x_subsampled[3];
- u32 search_range_y_subsampled[3];
-};
-
struct hfi_conceal_color {
u32 conceal_color;
};
@@ -565,24 +465,9 @@
u32 bframes;
};
-struct hfi_mpeg4_header_extension {
- u32 header_extension;
-};
-
-struct hfi_mpeg4_time_resolution {
- u32 time_increment_resolution;
-};
-
struct hfi_multi_stream {
u32 buffer_type;
u32 enable;
- u32 width;
- u32 height;
-};
-
-struct hfi_3x_multi_stream {
- u32 buffer_type;
- u32 enable;
};
struct hfi_multi_view_format {
@@ -593,7 +478,6 @@
#define HFI_MULTI_SLICE_OFF (HFI_COMMON_BASE + 0x1)
#define HFI_MULTI_SLICE_BY_MB_COUNT (HFI_COMMON_BASE + 0x2)
#define HFI_MULTI_SLICE_BY_BYTE_COUNT (HFI_COMMON_BASE + 0x3)
-#define HFI_MULTI_SLICE_GOB (HFI_COMMON_BASE + 0x4)
struct hfi_multi_slice_control {
u32 multi_slice;
@@ -634,23 +518,13 @@
};
struct hfi_quantization {
- u32 qp_i;
- u32 qp_p;
- u32 qp_b;
+ u32 qp_packed;
u32 layer_id;
};
-struct hfi_initial_quantization {
- u32 qp_i;
- u32 qp_p;
- u32 qp_b;
- u32 init_qp_enable;
-};
-
struct hfi_quantization_range {
- u32 min_qp;
- u32 max_qp;
- u32 layer_id;
+ struct hfi_quantization min_qp;
+ struct hfi_quantization max_qp;
};
#define HFI_LTR_MODE_DISABLE 0x0
@@ -726,8 +600,10 @@
#define HFI_COLOR_FORMAT_YUV444 (HFI_COMMON_BASE + 0xE)
#define HFI_COLOR_FORMAT_RGBA8888 (HFI_COMMON_BASE + 0x10)
-#define HFI_COLOR_FORMAT_YUV420_TP10 \
+#define HFI_COLOR_FORMAT_P010 \
(HFI_COLOR_FORMAT_10_BIT_BASE + HFI_COLOR_FORMAT_NV12)
+#define HFI_COLOR_FORMAT_YUV420_TP10 \
+ (HFI_COLOR_FORMAT_10_BIT_BASE + HFI_COLOR_FORMAT_NV12_4x4TILE)
#define HFI_COLOR_FORMAT_NV12_UBWC \
(HFI_COLOR_FORMAT_UBWC_BASE + HFI_COLOR_FORMAT_NV12)
@@ -802,10 +678,6 @@
u32 csc_limit[HFI_MAX_LIMIT_COEFFS];
};
-struct hfi_scs_threshold {
- u32 threshold_value;
-};
-
#define HFI_ROTATE_NONE (HFI_COMMON_BASE + 0x1)
#define HFI_ROTATE_90 (HFI_COMMON_BASE + 0x2)
#define HFI_ROTATE_180 (HFI_COMMON_BASE + 0x3)
@@ -881,10 +753,6 @@
u32 video_domains;
};
-struct hfi_seq_header_info {
- u32 max_hader_len;
-};
-
struct hfi_aspect_ratio {
u32 aspect_width;
u32 aspect_height;
@@ -1057,14 +925,6 @@
u32 rg_buffer_info[1];
};
-struct hfi_cmd_session_get_sequence_header_packet {
- u32 size;
- u32 packet_type;
- u32 session_id;
- u32 buffer_len;
- u32 packet_buffer;
-};
-
struct hfi_cmd_session_sync_process_packet {
u32 size;
u32 packet_type;