Index: /branches/HTM-9.3-dev0/source/Lib/TLibCommon/TypeDef.h =================================================================== --- /branches/HTM-9.3-dev0/source/Lib/TLibCommon/TypeDef.h (revision 827) +++ /branches/HTM-9.3-dev0/source/Lib/TLibCommon/TypeDef.h (revision 828) @@ -78,7 +78,4 @@ // HHI_QTLPC_RAU_OFF_C0160 // JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units -#ifdef H_3D_QTLPC -#define MTK_TEX_DEP_PAR_G0055 1 // Texture-partition-dependent depth partition. JCT3V-G0055 -#endif #define H_3D_VSO 1 // VSO, View synthesis optimization, includes: // HHI_VSO @@ -105,6 +102,4 @@ // SHARP_ARP_REF_CHECK_F0105 ARP reference picture selection and DPB check // LGE_ARP_CTX_F0161 JCT3V-F0161 -#define MTK_ARP_REF_SELECTION_G0053 1 // ARP Reference picture selection in JCT3V-G0053 -#define MTK_ARP_FLAG_CABAC_SIMP_G0061 1 // Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061 #define H_3D_IC 1 // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060 // Unifying rounding offset, for IC part, JCT3V-D0135 @@ -114,5 +109,4 @@ // LGE_IC_CTX_F0160 //JCT3V-F0160 // SEC_ONLY_TEXTURE_IC_F0151 -#define MTK_IC_FLAG_CABAC_SIMP_G0061 1 // Use only 1 context for IC flag in JCT3V-G0061 #if H_3D_NBDV @@ -123,5 +117,4 @@ // NBDV_DEFAULT_VIEWIDX_BUGFIX Bug fix for invalid default view index for NBDV // NTT_DoNBDV_VECTOR_CLIP_E0141 disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209 -#define MTK_NBDV_IVREF_FIX_G0067 1 // Disable IvMC, VSP when IVREF is not available, JCT3V-G0067 #endif @@ -186,7 +179,4 @@ #define H_3D_FCO 0 // Flexible coding order for 3D -#define H_3D_DBBP 1 // DBBP: Depth-based Block Partitioning and Merging - - @@ -214,7 +204,4 @@ ///////////////////////////////////////////////////////////////////////////////////////// -#define SEC_SPIVMP_MCP_SIZE_G0077 1 // Apply SPIVMP only to 2Nx2N partition, JCT3V-G0077 -#define SEC_DEPTH_DV_DERIVAITON_G0074 1 // Simplification of DV derivation for depth, JCT3V-G0074 - ///// ***** VIEW SYNTHESIS OPTIMIZAION ********* #if H_3D_VSO @@ -227,5 +214,4 @@ #endif -#define SCU_HS_VSD_BUGFIX_IMPROV_G0163 1 //// ****** NEIGHBOURING BLOCK-BASED DISPARITY VECTOR ********* #if H_3D_NBDV @@ -239,12 +225,4 @@ #define H_3D_ARP_WFNR 3 #endif -#define KHU_SIMP_SPIVMP_G0147 1 // Simplification on Sub-PU level temporal interview motion prediction - -#if H_3D_SPIVMP -#define QC_SPIVMP_MPI_G0119 1 // Sub-PU level MPI merge candidate -#endif -#define QC_DEPTH_MERGE_SIMP_G0127 1 // Remove DV candidate and shifting candidate for depth coding - -#define SEC_IC_ARP_SIG_G0072 1 // Disabling IC when ARP is enabled, option 1 in JCT3V-G0072, part 2 in JCT3V-G0121 ///// ***** DEPTH INTRA MODES ********* @@ -254,21 +232,10 @@ #define H_3D_DIM_DLT 1 // Depth Lookup Table -#define SCU_HS_DEPTH_DC_PRED_G0143 1 #if H_3D_DIM_DLT #define H_3D_DELTA_DLT 1 #endif -#define QC_GENERIC_SDC_G0122 1 // Generalize SDC to all depth intra modes -#if H_3D_DIM_SDC && H_3D_INTER_SDC -#define QC_SDC_UNIFY_G0130 1 // Unify intra SDC and inter SDC -#define QC_SDC_UNIFY_G0130_FIX 1 // Fix bug of G0130 -#endif -#define SEC_INTER_SDC_G0101 1 // Improved inter SDC with multiple DC candidates #define H_3D_DIM_ENC 1 // Depth Intra encoder optimizations, includes: // HHI_DEPTH_INTRA_SEARCH_RAU_C0160 // LG_ZEROINTRADEPTHRESI_A0087 -#endif -#define QC_PKU_SDC_SPLIT_G0123 1 // Intra SDC Split -#if QC_PKU_SDC_SPLIT_G0123 -#define HS_TSINGHUA_SDC_SPLIT_G0111 1 #endif ///// ***** VIEW SYNTHESIS PREDICTION ********* @@ -280,9 +247,6 @@ #define H_3D_VSP_CONSTRAINED 0 #endif -#define MTK_RBIP_VSP_G0069 1 // Restricted bi-prediction for VSP -#define NTT_STORE_SPDV_VSP_G0148 1 // Storing Sub-PU based DV for VSP -#endif - -#define MTK_DDD_G0063 1 // Disparity derived depth coding +#endif + ///// ***** ILLUMATION COMPENSATION ********* @@ -293,5 +257,34 @@ #endif -///// ***** DEPTH-BASED BLOCK PARTITIONING ********* + +///// ***** FCO ********* +#if H_3D_FCO +#define H_3D_FCO_VSP_DONBDV_E0163 1 // Adaptive depth reference for flexible coding order +#else +#define H_3D_FCO_VSP_DONBDV_E0163 0 // Adaptive depth reference for flexible coding order +#endif + +#if H_3D +#define PPS_FIX_DEPTH 1 +#endif + + +///////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////// HTM-10.0 Integrations ////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////// +#if H_3D +#if H_3D_QTLPC +#define MTK_TEX_DEP_PAR_G0055 1 // Texture-partition-dependent depth partition. JCT3V-G0055 +#endif + +#define MTK_DDD_G0063 1 // Disparity derived depth coding + +#if H_3D_VSP +#define MTK_RBIP_VSP_G0069 1 // Restricted bi-prediction for VSP +#define NTT_STORE_SPDV_VSP_G0148 1 // Storing Sub-PU based DV for VSP +#endif + +#define H_3D_DBBP 1 // DBBP: Depth-based Block Partitioning and Merging + #if H_3D_DBBP #define DBBP_INVALID_SHORT (-4) @@ -299,31 +292,34 @@ #endif -///// ***** FCO ********* -#if H_3D_FCO -#define H_3D_FCO_VSP_DONBDV_E0163 1 // Adaptive depth reference for flexible coding order -#else -#define H_3D_FCO_VSP_DONBDV_E0163 0 // Adaptive depth reference for flexible coding order -#endif - -#if H_3D -#define PPS_FIX_DEPTH 1 -#endif - - -///////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////// HTM-10.0 Integrations ////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////// - -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! -// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!! - +#if H_3D_DIM +#define QC_PKU_SDC_SPLIT_G0123 1 // Intra SDC Split +#if QC_PKU_SDC_SPLIT_G0123 +#define HS_TSINGHUA_SDC_SPLIT_G0111 1 +#endif +#define SCU_HS_DEPTH_DC_PRED_G0143 1 +#define QC_GENERIC_SDC_G0122 1 // Generalize SDC to all depth intra modes +#if H_3D_DIM_SDC && H_3D_INTER_SDC +#define QC_SDC_UNIFY_G0130 1 // Unify intra SDC and inter SDC +#define QC_SDC_UNIFY_G0130_FIX 1 // Fix bug of G0130 +#endif +#define SEC_INTER_SDC_G0101 1 // Improved inter SDC with multiple DC candidates +#endif + +#define KHU_SIMP_SPIVMP_G0147 1 // Simplification on Sub-PU level temporal interview motion prediction + +#if H_3D_SPIVMP +#define QC_SPIVMP_MPI_G0119 1 // Sub-PU level MPI merge candidate +#endif + +#define QC_DEPTH_MERGE_SIMP_G0127 1 // Remove DV candidate and shifting candidate for depth coding +#define SEC_IC_ARP_SIG_G0072 1 // Disabling IC when ARP is enabled, option 1 in JCT3V-G0072, part 2 in JCT3V-G0121 +#define SCU_HS_VSD_BUGFIX_IMPROV_G0163 1 +#define SEC_SPIVMP_MCP_SIZE_G0077 1 // Apply SPIVMP only to 2Nx2N partition, JCT3V-G0077 +#define SEC_DEPTH_DV_DERIVAITON_G0074 1 // Simplification of DV derivation for depth, JCT3V-G0074 +#define MTK_ARP_REF_SELECTION_G0053 1 // ARP Reference picture selection in JCT3V-G0053 +#define MTK_ARP_FLAG_CABAC_SIMP_G0061 1 // Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061 +#define MTK_IC_FLAG_CABAC_SIMP_G0061 1 // Use only 1 context for IC flag in JCT3V-G0061 +#define MTK_NBDV_IVREF_FIX_G0067 1 // Disable IvMC, VSP when IVREF is not available, JCT3V-G0067 +#endif ///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////// HM RELATED DEFINES ////////////////////////////////