Changeset 1279 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TypeDef.h
- Timestamp:
- 15 Jul 2015, 14:57:32 (9 years ago)
- Location:
- branches/HTM-14.1-update-dev1
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
source/Lib/TLibCommon/TypeDef.h (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev1
-
branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TypeDef.h
r1258 r1279 67 67 #if NH_MV 68 68 #define H_MV_ENC_DEC_TRAC 1 //< CU/PU level tracking 69 #define H_MV_ENC_DEC_TRAC_FIX 1 // by SHARP 69 70 70 71 #if NH_3D 71 72 #define NH_3D_VSO 1 73 #define NH_3D_NBDV 1 74 #define NH_3D_TMVP 1 // QC_TMVP_C0047 75 // Sony_M23639 76 // H_3D_TMVP_SCALING_FIX_K0053 1 // QC/CY for K0053 77 #define NH_3D_IC 1 // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060 78 // Unifying rounding offset, for IC part, JCT3V-D0135 79 // SHARP_ILLUCOMP_REFINE_E0046 80 // MTK_CLIPPING_ALIGN_IC_E0168 // To support simplify bi-prediction PU with identical motion checking, JCT3V-E0168 81 // LGE_IC_CTX_F0160 //JCT3V-F0160 82 // SEC_ONLY_TEXTURE_IC_F0151 83 // MTK_IC_FLAG_CABAC_SIMP_G0061 84 // SEC_IC_ARP_SIG_G0072, Disabling IC when ARP is enabled, option 1 in JCT3V-G0072, part 2 in JCT3V-G0121 85 // MTK_LOW_LATENCY_IC_ENCODING_H0086 Low-latency IC encoding in JCT3V-H0086 86 // MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX 1 // Remove the global variables used in JCT3V-H0086 87 // SEC_IC_NEIGHBOR_CLIP_I0080 // Clipping of neighboring sample position, JCT3V-I0080 88 // LGE_CHROMA_IC_J0050_J0034 89 90 #define NH_3D_IC_FIX 1 // Fix uninitialized value in cDtParam.bUseIC (it happened on intra block) 91 #define NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC 1 // Full Pel Interpolation for Depth, HHI_FULL_PEL_DEPTH_MAP_MV_ACC 92 93 #define NH_3D_QTLPC 1 // OL_QTLIMIT_PREDCODING_B0068 //JCT3V-B0068 94 // HHI_QTLPC_RAU_OFF_C0160 JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units 95 // MTK_TEX_DEP_PAR_G0055 Texture-partition-dependent depth partition. JCT3V-G0055 96 97 #define NH_3D_NBDV_REF 1 98 #define NH_3D_MLC 1 99 #define NH_3D_VSP 1 100 #define NH_3D_IV_MERGE 1 101 #define NH_3D_SPIVMP 1 102 #define NH_3D_INTEGER_MV_DEPTH 1 103 #define NH_3D_TEXT_MERGE 1 104 #define NH_3D_DBBP 1 105 #define BUF_FIX 1 106 #define NH_3D_ARP 1 // Advanced residual prediction (ARP), JCT3V-D0177 107 // QC_MTK_INTERVIEW_ARP_F0123_F0108 JCT3V-F0123; JCT3V-F0108 108 // SHARP_ARP_REF_CHECK_F0105 ARP reference picture selection and DPB check 109 // LGE_ARP_CTX_F0161 JCT3V-F0161 110 // MTK_ARP_FLAG_CABAC_SIMP_G0061 Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061 111 // MTK_ARP_REF_SELECTION_G0053 ARP Reference picture selection in JCT3V-G0053 112 // MTK_ALIGN_SW_WD_BI_PRED_ARP_H0085 Align the SW and WD for the bi-prediction ARP PUs by disallowing non-normative fast bi-prediction for ARP PUs, JCT3V-H0085 113 // QC_I0051_ARP_SIMP 114 // SHARP_ARP_CHROMA_I0104 115 // MTK_I0072_IVARP_SCALING_FIX 116 // SEC_ARP_VIEW_REF_CHECK_J0037 Signaling iv_res_pred_weight_idx when the current slice has both view and temporal reference picture(s), JCT3V-J0037 item1 117 // SEC_ARP_REM_ENC_RESTRICT_K0035 Removal of encoder restriction of ARP, JCT3V-K0035 118 72 119 #define NH_3D_DMM 1 // Depth modeling modes 73 120 #define NH_3D_DLT 1 // Depth Lookup Table … … 108 155 // MTK_TEXTURE_MRGCAND_BUGFIX_E0182 Bug fix for TEXTURE MERGING CANDIDATE , JCT3V-E0182 109 156 // LGE_SIMP_DISP_AVAIL_J0041 // Use 2 status for disparity availability - DISP_AVAILABLE and DISP_NONE 110 #define H_3D_ARP 1 // Advanced residual prediction (ARP), JCT3V-D0177111 // QC_MTK_INTERVIEW_ARP_F0123_F0108 JCT3V-F0123; JCT3V-F0108112 // SHARP_ARP_REF_CHECK_F0105 ARP reference picture selection and DPB check113 // LGE_ARP_CTX_F0161 JCT3V-F0161114 // MTK_ARP_FLAG_CABAC_SIMP_G0061 Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061115 // MTK_ARP_REF_SELECTION_G0053 ARP Reference picture selection in JCT3V-G0053116 // MTK_ALIGN_SW_WD_BI_PRED_ARP_H0085 Align the SW and WD for the bi-prediction ARP PUs by disallowing non-normative fast bi-prediction for ARP PUs, JCT3V-H0085117 // QC_I0051_ARP_SIMP118 // SHARP_ARP_CHROMA_I0104119 // MTK_I0072_IVARP_SCALING_FIX120 // SEC_ARP_VIEW_REF_CHECK_J0037 Signaling iv_res_pred_weight_idx when the current slice has both view and temporal reference picture(s), JCT3V-J0037 item1121 // SEC_ARP_REM_ENC_RESTRICT_K0035 Removal of encoder restriction of ARP, JCT3V-K0035122 157 #define H_3D_IC 1 // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060 123 158 // Unifying rounding offset, for IC part, JCT3V-D0135 … … 133 168 // SEC_IC_NEIGHBOR_CLIP_I0080 // Clipping of neighboring sample position, JCT3V-I0080 134 169 // LGE_CHROMA_IC_J0050_J0034 135 #if H_3D_NBDV170 #if NH_3D_NBDV 136 171 #define H_3D_NBDV_REF 1 // Depth oriented neighboring block disparity derivation 137 172 // MTK_D0156 … … 237 272 // LGE_INTER_SDC_E0156 Enable inter SDC for depth coding 238 273 // SEC_INTER_SDC_G0101 Improved inter SDC with multiple DC candidates 274 #define H_3D_INTER_SDC_FIX 1 239 275 #define H_3D_SPIVMP 1 // H_3D_SPIVMP JCT3V-F0110: Sub-PU level inter-view motion prediction 240 276 // SEC_SPIVMP_MCP_SIZE_G0077, Apply SPIVMP only to 2Nx2N partition, JCT3V-G0077 … … 298 334 #endif 299 335 //// ****** NEIGHBOURING BLOCK-BASED DISPARITY VECTOR ********* 300 #if H_3D_NBDV336 #if NH_3D_NBDV 301 337 #define DVFROM_LEFT 0 302 338 #define DVFROM_ABOVE 1 … … 304 340 #endif 305 341 ///// ***** ADVANCED INTERVIEW RESIDUAL PREDICTION ********* 306 #if H_3D_ARP342 #if NH_3D_ARP 307 343 #define H_3D_ARP_WFNR 3 308 344 #endif … … 320 356 /// GT: Move values which are not flags to CommonDef.h and convert to static int !! 321 357 /////////////////////////////////////////////////////////////////////////////////// 322 ///// ***** VIEW SYNTHESIS PREDICTION *********323 #if H_3D_VSP324 #define H_3D_VSP_BLOCKSIZE 4 // Supported values: 1, 2, and 4325 #if H_3D_VSP_BLOCKSIZE == 1326 #define H_3D_VSP_CONSTRAINED 1 // Constrained VSP @ 1x1327 #else328 #define H_3D_VSP_CONSTRAINED 0329 #endif330 #endif331 358 ///// ***** ILLUMATION COMPENSATION ********* 332 #if H_3D_IC359 #if NH_3D_IC 333 360 #define IC_REG_COST_SHIFT 7 334 361 #define IC_CONST_SHIFT 5 … … 337 364 #endif 338 365 ///// ***** DEPTH BASED BLOCK PARTITIONING ********* 339 #if H_3D_DBBP366 #if NH_3D_DBBP 340 367 #define DBBP_INVALID_SHORT (-4) 341 368 #define DBBP_PACK_MODE SIZE_2NxN … … 721 748 MD_ABOVE_LEFT ///< MVP of above left block 722 749 }; 723 #if H_3D750 #if NH_3D_MLC 724 751 enum DefaultMergCandOrder 725 752 { … … 734 761 MRG_A0, ///< Left bottom 735 762 MRG_B2, ///< Above left 736 MRG_IVSHIFT, ///< Shifted IVMC o fShifted IVDC. (These are mutually exclusive)763 MRG_IVSHIFT, ///< Shifted IVMC or Shifted IVDC. (These are mutually exclusive) 737 764 MRG_COL ///< Temporal co-located 738 765 };
Note: See TracChangeset for help on using the changeset viewer.
