Changeset 186 in 3DVCSoftware for branches/HTM-4.1-dev0/source
- Timestamp:
- 15 Nov 2012, 16:51:33 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-4.1-dev0/source/Lib/TLibCommon/TypeDef.h
r185 r186 46 46 #define MTK_UNCONSTRAINED_MVI 1 //JCT3V-B0083 47 47 48 49 ///// ***** FIXES ********* 48 50 // A 49 51 #define FIXES 1 … … 60 62 #define FIX_DBL_CONTROL_DEFAULT 1 61 63 62 63 64 // B 64 65 #define FIX_LGE_IVMP_PARALLEL_MERGE_B0136 1 65 #define TMVP_DEPTH_SWITCH 1 // related to JCT3V-B009266 66 #define FIX_RDO_NEGDIST 1 67 67 #define FIX_DMM_NEG_DIST 1 68 69 #define DV_DERIVATION_PARALLEL_B0096 1 //JCT3V-B0096, enable parallel derivation of disparity vector 70 68 #define FIX_LGE_DVMCP_B0133 1 69 70 71 ///// ***** PATCHES ********* 72 #define TMVP_DEPTH_SWITCH 1 // JCT3V-B0092 additional encoder option only 73 74 ///// ***** DEPTH MODELING MODES ********* 75 #define HHI_DMM_WEDGE_INTRA 1 // depth model modes independent on texture (explicit and intra-predicted Wedgelet prediction) 76 #define HHI_DMM_PRED_TEX 1 // depth model modes dependent on texture (inter-component Wedgelet and Contour prediction ) 71 77 #define LGE_EDGE_INTRA 1 // JCT2-A0070 78 #define RWTH_SDC_DLT_B0036 1 // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table 79 #define HHIQC_DMMFASTSEARCH_B0039 1 // JCT3V-B0039: fast Wedgelet search for DMM modes 1 and 3 80 81 ///// ***** INTERVIEW MOTION VECTOR PREDICTION ********* 82 #define HHI_INTER_VIEW_MOTION_PRED 1 // inter-view motion parameter prediction 83 #define SHARP_INTERVIEW_DECOUPLE_B0111 1 // JCT3V-B0111 decoupling inter-view candidate 84 #define QC_MRG_CANS_B0048 1 // JCT2-B0048, B0086, B0069 85 #if QC_MRG_CANS_B0048 86 #define OL_DISMV_POS_B0069 1 // different pos for dispairty MV candidate, B0069 87 #endif 88 #define MTK_INTERVIEW_MERGE_A0049 1 // JCT2-A0049 second part 89 #if HHI_INTER_VIEW_MOTION_PRED 90 #define SAIT_IMPROV_MOTION_PRED_M24829 1 // improved inter-view motion vector prediction 91 #else 92 #define SAIT_IMPROV_MOTION_PRED_M24829 0 93 #endif 94 95 ///// ***** INTERVIEW RESIDUAL PREDICTION ********* 96 #define HHI_INTER_VIEW_RESIDUAL_PRED 1 // inter-view residual prediction 97 #if HHI_INTER_VIEW_RESIDUAL_PRED 98 #define LG_RESTRICTEDRESPRED_M24766 1 // restricted inter-view residual prediction 99 #define QC_SIMPLIFIEDIVRP_M24938 1 100 #else 101 #define LG_RESTRICTEDRESPRED_M24766 0 102 #define QC_SIMPLIFIEDIVRP_M24938 0 103 #endif 104 105 ///// ***** DISPARITY VECTOR DERIVATION ********* 106 #define QC_MULTI_DIS_CAN 1 // JCT2-A0097 107 #define LGE_DVMCP 1 // JCT2-A0126 108 #define LGE_DVMCP_MEM_REDUCTION_B0135 1 109 #define DV_DERIVATION_PARALLEL_B0096 1 // JCT3V-B0096, enable parallel derivation of disparity vector 110 #define QC_SIMPLE_NBDV_B0047 1 // JCT2-B0047 111 112 ///// ***** MOTION PARAMETER INHERITANCE ********* 113 #define HHI_MPI 1 // motion parameter inheritance from texture picture for depth map coding 114 #if HHI_MPI 115 #define FIX_MPI_B0065 1 // JCT3V-B0065, fix the MPI bug when RQT is off 116 #endif 117 118 ///// ***** VIEW SYNTHESIS OPTIMIZAION ********* 119 #define HHI_VSO 1 120 #define HHI_VSO_LS_TABLE 1 // m23714, enable table base Lagrange multiplier optimization 121 #define HHI_VSO_DIST_INT 1 // Allow negative synthesized view distortion change 122 #define HHI_VSO_SYNTH_DIST_OUT 0 // Output of synthesized view distortion instead of depth distortion in encoder output 123 #define HHI_VSO_COLOR_PLANES 1 // Compute VSO distortion on color planes 124 #define HHI_VSO_RM_ASSERTIONS 0 // output VSO assertions 125 #define HHI_VSO_SPEEDUP_A0033 1 // JCT2-A0033 modification 1 (changes in classes directly related the renderer model 126 // to are not covered by this define, since nearly the entire class has been changed) 127 #define HHI_VSO_SET_OPTIM 1 // remove unnecessary updates (works only with HHI_VSO_FIX 1 properly) 128 #define SAIT_VSO_EST_A0033 1 // JCT2-A0033 modification 3 129 #define LGE_VSO_EARLY_SKIP_A0093 1 // JCT2-A0093 modification 4 130 #define LGE_WVSO_A0119 1 // JCT2-A0119 & JCT3V-B0131 Depth Metric with a weighted depth fidelity term 131 132 133 ///// ***** ILLUMINATION COMPENSATON ********* 134 #define LGE_ILLUCOMP_B0045 1 // JCT2-B0045 Illumination compensation for Luma and Chroma 135 #if LGE_ILLUCOMP_B0045 136 #define LGE_ILLUCOMP_B0045_ENCSIMP 1 137 #endif 138 139 ///// ***** INTERVIEW SKIP ********* 140 #define HHI_INTERVIEW_SKIP 1 141 142 ///// ***** OTHERS ********* 143 #define LG_ZEROINTRADEPTHRESI_M26039 1 // JCT2-A0087 144 #define SONY_COLPIC_AVAILABILITY 1 145 #define HHI_FULL_PEL_DEPTH_MAP_MV_ACC 1 // full-pel mv accuracy for depth maps 146 #define VIDYO_VPS_INTEGRATION 1 147 148 149 150 ///// ***** DEFINED PARAMETERS ********* 151 #if QC_MULTI_DIS_CAN 152 #define DIS_CANS 1 153 #endif 154 155 #define HHI_INTERVIEW_SKIP_LAMBDA_SCALE 1 156 157 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX 158 #define DMM_WEDGEMODEL_MIN_SIZE 4 159 #define DMM_WEDGEMODEL_MAX_SIZE 32 160 #define DMM_WEDGE_PREDDIR_DELTAEND_MAX 4 161 #endif 162 72 163 #if LGE_EDGE_INTRA 73 164 #define LGE_EDGE_INTRA_MIN_SIZE 4 … … 79 170 #endif 80 171 81 #define LG_ZEROINTRADEPTHRESI_M26039 1 // JCT2-A0087 82 83 #define SONY_COLPIC_AVAILABILITY 1 84 85 #define HHI_INTER_VIEW_MOTION_PRED 1 // inter-view motion parameter prediction 86 #define HHI_INTER_VIEW_RESIDUAL_PRED 1 // inter-view residual prediction 87 #define QC_MULTI_DIS_CAN 1 // JCT2-A0097 88 #if QC_MULTI_DIS_CAN 89 #define DIS_CANS 1 90 #endif 91 #define QC_SIMPLE_NBDV_B0047 1 //JCT2-B0047 92 #define QC_MRG_CANS_B0048 1 //JCT2-B0048, B0086, B0069 93 #if QC_MRG_CANS_B0048 94 #define OL_DISMV_POS_B0069 1 //different pos for dispairty MV candidate, B0069 95 #endif 96 #define MTK_INTERVIEW_MERGE_A0049 1 // JCT2-A0049 second part 97 #define SHARP_INTERVIEW_DECOUPLE_B0111 1 // JCT3V-B0111 decoupling inter-view candidate 98 99 #define LGE_DVMCP 1 // JCT2-A0126 172 100 173 #if LGE_DVMCP 101 174 #define DVFROM_LEFTBELOW 1 … … 106 179 #define DVFROM_COL 6 107 180 #endif 108 #define FIX_LGE_DVMCP_B0133 1 109 #define LGE_DVMCP_MEM_REDUCTION_B0135 1 110 111 112 #define HHI_VSO 1 113 #define HHI_VSO_LS_TABLE 1 // m23714 114 #define HHI_VSO_DIST_INT 1 115 #define HHI_VSO_SYNTH_DIST_OUT 0 116 #define HHI_VSO_COLOR_PLANES 1 117 #define HHI_VSO_SPEEDUP_A0033 1 // JCT2-A0033 modification 1 (changes in classes directly related the renderer model 118 // to are not covered by this define, since nearly the entire class has been changed) 119 #define HHI_VSO_RM_ASSERTIONS 0 // output VSO assertions 120 #define HHI_VSO_SET_OPTIM 1 // remove unnecessary updates (works only with HHI_VSO_FIX 1 properly) 121 #define SAIT_VSO_EST_A0033 1 // JCT2-A0033 modification 3 122 #define LGE_VSO_EARLY_SKIP_A0093 1 // JCT2-A0093 modification 4 123 #define LGE_WVSO_A0119 1 // JCT2-A0119 & JCT3V-B0131 Depth Metric with a weighted depth fidelity term 124 #define LGE_ILLUCOMP_B0045 1 // JCT2-B0045 Illumination compensation for Luma and Chroma 125 #if LGE_ILLUCOMP_B0045 126 #define LGE_ILLUCOMP_B0045_ENCSIMP 1 127 #endif 128 129 #define HHI_INTERVIEW_SKIP 1 130 #define HHI_INTERVIEW_SKIP_LAMBDA_SCALE 1 131 132 #define HHI_DMM_WEDGE_INTRA 1 // depth model modes independent on texture (explicit and intra-predicted Wedgelet prediction) 133 #define HHI_DMM_PRED_TEX 1 // depth model modes dependent on texture (inter-component Wedgelet and Contour prediction ) 134 135 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX 136 #define DMM_WEDGEMODEL_MIN_SIZE 4 137 #define DMM_WEDGEMODEL_MAX_SIZE 32 138 #define DMM_WEDGE_PREDDIR_DELTAEND_MAX 4 139 #endif 140 141 #define HHIQC_DMMFASTSEARCH_B0039 1 // JCT3V-B0039: fast Wedgelet search for DMM modes 1 and 3 181 182 142 183 #if HHIQC_DMMFASTSEARCH_B0039 143 184 #define DMM3_SIMPLIFY_TR 1 144 185 #endif 145 186 146 #define RWTH_SDC_DLT_B0036 1 // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table 187 147 188 #if RWTH_SDC_DLT_B0036 148 189 #define Log2( n ) ( log((double)n) / log(2.0) ) 149 190 #endif 150 191 151 #define HHI_MPI 1 // motion parameter inheritance from texture picture for depth map coding152 #if HHI_MPI153 #define FIX_MPI_B0065 1 //JCT3V-B0065, fix the MPI bug when RQT is off154 #endif155 192 #define HHI_MPI_MERGE_POS 0 156 #define HHI_FULL_PEL_DEPTH_MAP_MV_ACC 1 // full-pel mv accuracy for depth maps 157 158 #if HHI_INTER_VIEW_MOTION_PRED 159 #define SAIT_IMPROV_MOTION_PRED_M24829 1 // improved inter-view motion vector prediction 160 #else 161 #define SAIT_IMPROV_MOTION_PRED_M24829 0 162 #endif 163 164 #if HHI_INTER_VIEW_RESIDUAL_PRED 165 #define LG_RESTRICTEDRESPRED_M24766 1 // restricted inter-view residual prediction 166 #define QC_SIMPLIFIEDIVRP_M24938 1 167 #else 168 #define LG_RESTRICTEDRESPRED_M24766 0 169 #define QC_SIMPLIFIEDIVRP_M24938 0 170 #endif 171 172 193 194 ///// ***** HM 6.1 ********* 173 195 #define SKIPFRAME_BUGFIX 1 ///< bug fix to enable skipFrame at decoder 174 196 #define START_DECODING_AT_CRA 1 ///< H0496, start decoding at clear random access point … … 183 205 #define LGE_IVMP_PARALLEL_MERGE_B0136 1 //< B0136 support of parallel merge/skip in disparity vector derivation 184 206 #define LOG2_PARALLEL_MERGE_LEVEL_MINUS2 0 //< H0082 parallel merge level 0-> 4x4, 1-> 8x8, 2->16x16, 3->32x32, 4->64x64 207 185 208 #if PARALLEL_MERGE && LOG2_PARALLEL_MERGE_LEVEL_MINUS2 186 209 #define CU_BASED_MRG_CAND_LIST 1 //< H0240: single merge candidate list for all PUs inside a 8x8 CU conditioned on LOG2_PARALLEL_MERGE_LEVEL_MINUS2 > 0 187 210 #define FIX_CU_BASED_MRG_CAND_LIST_B0136 1 //< B0136 bug fix for CU_BASED_MRG_CAND_LIST 188 211 #endif 212 189 213 #define MVP_AT_ENTROPYSLICE_BOUNDARY 1 //< H0362 enable motion prediction accross entropy slice boundary 190 214 191 215 #define FAST_DECISION_FOR_MRG_RD_COST 1 ////< H0178: Fast Decision for Merge 2Nx2N RDCost 192 216 193 #define PIC_CROPPING 1 ///< Picture cropping and size constraints194 #define NAL_REF_FLAG 1 ///< Change nal_ref_idc to nal_ref_flag (JCTVC-F463)195 #define REMOVE_DIV_OPERATION 1 ///< H0238: Simplified intra horizontal and vertical filtering217 #define PIC_CROPPING 1 ///< Picture cropping and size constraints 218 #define NAL_REF_FLAG 1 ///< Change nal_ref_idc to nal_ref_flag (JCTVC-F463) 219 #define REMOVE_DIV_OPERATION 1 ///< H0238: Simplified intra horizontal and vertical filtering 196 220 #define LOGI_INTRA_NAME_3MPM 1 ///< H0407: logical Intra mode naming (sequential angular mode numbering) and 3 MPM mode coding 197 221 … … 204 228 #define MULTIBITS_DATA_HIDING 1 ///< H0481: multiple sign bit hiding 205 229 206 #define DEQUANT_CLIPPING 230 #define DEQUANT_CLIPPING 1 ///< H0312/H0541: transformed coefficients clipping before de-quantization 207 231 208 232 #define REMOVE_NON_SCALED 1 ///< H0164/H0250: Removal of non-scaled merge candidate … … 467 491 // VPS INTEGRATION 468 492 // ==================================================================================================================== 469 #define VIDYO_VPS_INTEGRATION 1 493 470 494 #if VIDYO_VPS_INTEGRATION 471 495 #define MAX_NUM_VPS 10
Note: See TracChangeset for help on using the changeset viewer.
