Changeset 647 in 3DVCSoftware for branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TypeDef.h
- Timestamp:
- 19 Oct 2013, 17:30:33 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TypeDef.h
r646 r647 92 92 // QC_CU_NBDV_D0181 93 93 // SEC_DEFAULT_DV_D0112 94 // MTK_DVMCP_FIX_E0172 1 // fix the mismatch between software and WD for DV derivation from DVMCP blocks, issue 2 in JCT3V-E0172 94 // MTK_DVMCP_FIX_E0172 fix the mismatch between software and WD for DV derivation from DVMCP blocks, issue 2 in JCT3V-E0172 95 // SEC_SIMPLIFIED_NBDV_E0142 Simplified NBDV, JCT3V-E0142 and JCT3V-E0190 96 // MTK_NBDV_TN_FIX_E0172 fix the issue of DV derivation from the temporal neighboring blocks, issue 7 in JCT3V-E0172 97 // MTK_TEXTURE_MRGCAND_BUGFIX_E0182 Bug fix for TEXTURE MERGING CANDIDATE , JCT3V-E0182 95 98 #define H_3D_ARP 1 // Advanced residual prediction (ARP), JCT3V-D0177 96 99 #define H_3D_IC 1 // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060 … … 106 109 // MERL_C0152: Basic VSP 107 110 // NBDV_DEFAULT_VIEWIDX_BUGFIX Bug fix for invalid default view index for NBDV 111 // NTT_DoNBDV_VECTOR_CLIP_E0141 disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209 112 108 113 #endif 109 114 … … 149 154 // KWU_SDC_SIMPLE_DC_E0117 Simplified DC calculation for SDC 150 155 // SCU_HS_DMM4_REMOVE_DIV_E0242 DMM4 Division Removal 156 // LGE_SDC_REMOVE_DC_E0158 Removal of DC mode from SDC 157 // LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX 1 Removal of overlap between DMM3 and DMM1 158 151 159 #define H_3D_INTER_SDC 1 // INTER SDC, Inter simplified depth coding 152 160 // LGE_INTER_SDC_E0156 Enable inter SDC for depth coding 153 #define H_3D_FCO _E01630 // Flexible coding order for 3D161 #define H_3D_FCO 0 // Flexible coding order for 3D 154 162 155 163 … … 157 165 // OTHERS 158 166 // MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170 // Progressive MV Compression, JCT3V-E0170 159 160 #define H_3D_REN_MAX_DEV_OUT 0 // Output maximal possible shift deviation 161 162 ///////////////////////////////////////////////////////////////////////////////////////// 163 /////////////////////////////////// HTM-8.0 INTEGRATIONS ////////////////////////////// 164 ///////////////////////////////////////////////////////////////////////////////////////// 165 166 #define MTK_FAST_TEXTURE_ENCODING_E0173 1 // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173 167 168 169 #if H_3D_NBDV 170 #define MTK_RVS_BUGFIX_E0172 1 // Bug fix for issues caused by reference view selection, JCT3V-E0172 171 #define MTK_TEXTURE_MRGCAND_BUGFIX_E0182 1 // Bug fix for TEXTURE MERGING CANDIDATE , JCT3V-E0182 172 173 #if MTK_RVS_BUGFIX_E0172 174 #define MTK_DIVMC_FIX_E0172 1 // fix the issue of derivation of disparity inter-view merge candidate, issue 5 in JCT3V-E0172 175 #define MTK_NBDV_TN_FIX_E0172 1 // fix the issue of DV derivation from the temporal neighboring blocks, issue 7 in JCT3V-E0172 176 #endif // MTK_RVS_BUGFIX_E0172 177 178 #if H_3D_NBDV_REF 179 #define NTT_DoNBDV_VECTOR_CLIP_E0141 1 // disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209 180 #define SEC_SIMPLIFIED_NBDV_E0142 1 // Simplified NBDV, JCT3V-E0142 and JCT3V-E0190 181 #endif 182 #endif // H_3D_NBDV 183 167 #define H_3D_REN_MAX_DEV_OUT 0 // Output maximal possible shift deviation 168 #define H_3D_FAST_TEXTURE_ENCODING 1 // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173 169 // MTK_FAST_TEXTURE_ENCODING_E0173 184 170 #if H_3D_DIM 185 #define SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX 1 // Fast DMM and RBC Mode Selection 186 #endif 187 188 #if H_3D_FCO_E0163 189 #define H_3D_FCO_VSP_DONBDV_E0163 1 // Adaptive depth reference for flexible coding order 190 #else 191 #define H_3D_FCO_VSP_DONBDV_E0163 0 // Adaptive depth reference for flexible coding order 192 #endif 171 #define H_3D_FAST_DEPTH_INTRA 1 // Fast DMM and RBC Mode Selection 172 // SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX 173 #endif 174 193 175 #endif // H_3D 194 176 195 177 196 ///////////////////////////////////////////////////////////////////////////////////////// 197 /////////////////////////////////// HTM-8.1 INTEGRATIONS ////////////////////////////// 198 ///////////////////////////////////////////////////////////////////////////////////////// 199 200 // Please put HTM-8.1 Integration defines here, when possible 178 // Rate Control 179 #define KWU_FIX_URQ 1 180 #define KWU_RC_VIEWRC_E0227 0 ///< JCT3V-E0227, view-wise target bitrate allocation 181 #define KWU_RC_MADPRED_E0227 0 ///< JCT3V-E0227, inter-view MAD prediction 201 182 202 183 203 184 /// FIXES 204 185 #if H_MV 205 #define H_MV_FIX_LID_PIC_HASH_SEI_T40 1 // Fix wrong layer_id in decoded picture hash SEI 206 #define H_MV5 1 // Update to MV-HEVC 5 HLS 186 #define H_MV5 1 // Update to MV-HEVC 5 HLS 207 187 #endif 208 188 ///////////////////////////////////////////////////////////////////////////////////////// … … 217 197 #define H_3D_VSO_RM_ASSERTIONS 0 // Output VSO assertions 218 198 #define H_3D_VSO_SYNTH_DIST_OUT 0 // Output of synthesized view distortion instead of depth distortion in encoder output 219 220 199 #define H_3D_VSO_FIX 0 // This fix should be enabled after verification 221 222 #endif 223 //// ****** Neighbouring block-based Disparity Vector *********200 #endif 201 202 //// ****** neighbouring block-based disparity vector ********* 224 203 #if H_3D_NBDV 225 #if SEC_SIMPLIFIED_NBDV_E0142226 204 #define DVFROM_LEFT 0 227 205 #define DVFROM_ABOVE 1 228 206 #define IDV_CANDS 2 229 #else230 #define DVFROM_LEFTBELOW 0231 #define DVFROM_LEFT 1232 #define DVFROM_ABOVERIGHT 2233 #define DVFROM_ABOVE 3234 #define DVFROM_ABOVELEFT 4235 #define IDV_CANDS 5236 #endif237 207 #endif 238 208 … … 241 211 #define H_3D_ARP_WFNR 3 242 212 #endif 213 243 214 ///// ***** DEPTH INTRA MODES ********* 244 215 #if H_3D_DIM … … 250 221 // HHI_DEPTH_INTRA_SEARCH_RAU_C0160 251 222 // LG_ZEROINTRADEPTHRESI_A0087 252 #if H_3D_DIM_SDC 253 #define LGE_SDC_REMOVE_DC_E0158 1 // Removal of DC mode from SDC 254 #endif 255 #if H_3D_DIM_DMM 256 #define LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX 1 // Removal of overlap between DMM3 and DMM1 257 #endif 258 #endif 259 223 #endif 260 224 ///// ***** VIEW SYNTHESIS PREDICTION ********* 261 225 #if H_3D_VSP … … 270 234 271 235 ///// ***** ILLUMATION COMPENSATION ********* 272 273 274 236 #if H_3D_IC 275 #define IC_REG_COST_SHIFT 7 276 #define IC_CONST_SHIFT 5 277 #define IC_SHIFT_DIFF 12 237 #define IC_REG_COST_SHIFT 7 238 #define IC_CONST_SHIFT 5 239 #define IC_SHIFT_DIFF 12 240 #endif 241 242 ///// ***** FCO ********* 243 #if H_3D_FCO 244 #define H_3D_FCO_VSP_DONBDV_E0163 1 // Adaptive depth reference for flexible coding order 245 #else 246 #define H_3D_FCO_VSP_DONBDV_E0163 0 // Adaptive depth reference for flexible coding order 278 247 #endif 279 248 … … 302 271 #define M0036_RC_IMPROVEMENT 1 ///< JCTVC-M0036, improvement for R-lambda model based rate control 303 272 #define TICKET_1090_FIX 1 304 #define KWU_FIX_URQ 1305 273 306 274 #if KWU_FIX_URQ 307 308 275 #if RATE_CONTROL_LAMBDA_DOMAIN 309 276 #define RC_FIX 1 /// suggested fix for M0036 310 277 #define RATE_CONTROL_INTRA 1 ///< JCTVC-M0257, rate control for intra 311 278 #endif 312 313 #else 314 279 #else 315 280 #define RC_FIX 1 /// suggested fix for M0036 316 281 #define RATE_CONTROL_INTRA 1 ///< JCTVC-M0257, rate control for intra 317 318 #endif 319 320 #define KWU_RC_VIEWRC_E0227 0 ///< JCT3V-E0227, view-wise target bitrate allocation 321 #define KWU_RC_MADPRED_E0227 0 ///< JCT3V-E0227, inter-view MAD prediction 282 #endif 283 322 284 323 285 #define MAX_CPB_CNT 32 ///< Upper bound of (cpb_cnt_minus1 + 1)
Note: See TracChangeset for help on using the changeset viewer.
