Changeset 1274 in 3DVCSoftware for branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TypeDef.h
- Timestamp:
- 14 Jul 2015, 12:31:09 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TypeDef.h
r1256 r1274 70 70 #if NH_3D 71 71 #define NH_3D_VSO 1 72 #define NH_3D_NBDV 1 72 73 #define NH_3D_TMVP 1 // QC_TMVP_C0047 73 74 // Sony_M23639 … … 92 93 // HHI_QTLPC_RAU_OFF_C0160 JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units 93 94 // MTK_TEX_DEP_PAR_G0055 Texture-partition-dependent depth partition. JCT3V-G0055 95 96 #define NH_3D_NBDV_REF 1 97 #define NH_3D_MLC 1 98 #define NH_3D_VSP 1 99 #define NH_3D_IV_MERGE 1 100 #define NH_3D_SPIVMP 1 101 #define NH_3D_INTEGER_MV_DEPTH 1 102 #define NH_3D_TEXT_MERGE 1 103 #define NH_3D_DBBP 1 104 #define BUF_FIX 1 105 #define NH_3D_ARP 1 // Advanced residual prediction (ARP), JCT3V-D0177 106 // QC_MTK_INTERVIEW_ARP_F0123_F0108 JCT3V-F0123; JCT3V-F0108 107 // SHARP_ARP_REF_CHECK_F0105 ARP reference picture selection and DPB check 108 // LGE_ARP_CTX_F0161 JCT3V-F0161 109 // MTK_ARP_FLAG_CABAC_SIMP_G0061 Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061 110 // MTK_ARP_REF_SELECTION_G0053 ARP Reference picture selection in JCT3V-G0053 111 // 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 112 // QC_I0051_ARP_SIMP 113 // SHARP_ARP_CHROMA_I0104 114 // MTK_I0072_IVARP_SCALING_FIX 115 // 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 116 // SEC_ARP_REM_ENC_RESTRICT_K0035 Removal of encoder restriction of ARP, JCT3V-K0035 94 117 95 118 #endif … … 121 144 // MTK_TEXTURE_MRGCAND_BUGFIX_E0182 Bug fix for TEXTURE MERGING CANDIDATE , JCT3V-E0182 122 145 // LGE_SIMP_DISP_AVAIL_J0041 // Use 2 status for disparity availability - DISP_AVAILABLE and DISP_NONE 123 #define H_3D_ARP 1 // Advanced residual prediction (ARP), JCT3V-D0177124 // QC_MTK_INTERVIEW_ARP_F0123_F0108 JCT3V-F0123; JCT3V-F0108125 // SHARP_ARP_REF_CHECK_F0105 ARP reference picture selection and DPB check126 // LGE_ARP_CTX_F0161 JCT3V-F0161127 // MTK_ARP_FLAG_CABAC_SIMP_G0061 Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061128 // MTK_ARP_REF_SELECTION_G0053 ARP Reference picture selection in JCT3V-G0053129 // 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-H0085130 // QC_I0051_ARP_SIMP131 // SHARP_ARP_CHROMA_I0104132 // MTK_I0072_IVARP_SCALING_FIX133 // 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 item1134 // SEC_ARP_REM_ENC_RESTRICT_K0035 Removal of encoder restriction of ARP, JCT3V-K0035135 146 #define H_3D_IC 1 // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060 136 147 // Unifying rounding offset, for IC part, JCT3V-D0135 … … 146 157 // SEC_IC_NEIGHBOR_CLIP_I0080 // Clipping of neighboring sample position, JCT3V-I0080 147 158 // LGE_CHROMA_IC_J0050_J0034 148 #if H_3D_NBDV159 #if NH_3D_NBDV 149 160 #define H_3D_NBDV_REF 1 // Depth oriented neighboring block disparity derivation 150 161 // MTK_D0156 … … 312 323 #endif 313 324 //// ****** NEIGHBOURING BLOCK-BASED DISPARITY VECTOR ********* 314 #if H_3D_NBDV325 #if NH_3D_NBDV 315 326 #define DVFROM_LEFT 0 316 327 #define DVFROM_ABOVE 1 … … 318 329 #endif 319 330 ///// ***** ADVANCED INTERVIEW RESIDUAL PREDICTION ********* 320 #if H_3D_ARP331 #if NH_3D_ARP 321 332 #define H_3D_ARP_WFNR 3 322 333 #endif … … 334 345 /// GT: Move values which are not flags to CommonDef.h and convert to static int !! 335 346 /////////////////////////////////////////////////////////////////////////////////// 336 ///// ***** VIEW SYNTHESIS PREDICTION *********337 #if H_3D_VSP338 #define H_3D_VSP_BLOCKSIZE 4 // Supported values: 1, 2, and 4339 #if H_3D_VSP_BLOCKSIZE == 1340 #define H_3D_VSP_CONSTRAINED 1 // Constrained VSP @ 1x1341 #else342 #define H_3D_VSP_CONSTRAINED 0343 #endif344 #endif345 347 ///// ***** ILLUMATION COMPENSATION ********* 346 348 #if NH_3D_IC … … 351 353 #endif 352 354 ///// ***** DEPTH BASED BLOCK PARTITIONING ********* 353 #if H_3D_DBBP355 #if NH_3D_DBBP 354 356 #define DBBP_INVALID_SHORT (-4) 355 357 #define DBBP_PACK_MODE SIZE_2NxN … … 735 737 MD_ABOVE_LEFT ///< MVP of above left block 736 738 }; 737 #if H_3D739 #if NH_3D_MLC 738 740 enum DefaultMergCandOrder 739 741 { … … 748 750 MRG_A0, ///< Left bottom 749 751 MRG_B2, ///< Above left 750 MRG_IVSHIFT, ///< Shifted IVMC o fShifted IVDC. (These are mutually exclusive)752 MRG_IVSHIFT, ///< Shifted IVMC or Shifted IVDC. (These are mutually exclusive) 751 753 MRG_COL ///< Temporal co-located 752 754 };
Note: See TracChangeset for help on using the changeset viewer.
