Changeset 189 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TypeDef.h


Ignore:
Timestamp:
18 Nov 2012, 22:11:37 (12 years ago)
Author:
tech
Message:

Reintegrated branch 4.1-dev0 Rev. 188.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TypeDef.h

    r128 r189  
    4242//! \{
    4343
    44 #define FIXES                             1
    45 #define POZNAN_CABAC_INIT_FLAG_FIX        1
    46 #define FIX_DECODING_WO_WRITING           1
    47 #define FIX_INIT_ROM                      1
    48 #define FIX_VIRT_DESTRUCTOR               1
    49 #define FIX_MEM_LEAKS                     1
    50 #define FIX_VSO_SETUP                     1
    51 #define FIX_COMP_WARNING_INIT             1
    52 #define FIX_RDO_MACRO                     1
     44///// ***** FIXES *********
     45// A
     46#define FIX_POZNAN_CABAC_INIT_FLAG        1
    5347#define FIX_LG_RESTRICTEDRESPRED_M24766   1
    54 #define FIX_REMOVE_TILE_DEPENDENCE        1
    55 #define FIX_DBL_CONTROL_DEFAULT           1
    56 
    57 
    58 #define LGE_EDGE_INTRA                    1   // JCT2-A0070
    59 #if LGE_EDGE_INTRA
     48
     49// B
     50#define FIX_LGE_IVMP_PARALLEL_MERGE_B0136 1
     51#define FIX_RDO_NEGDIST                   1
     52#define FIX_DMM_NEG_DIST                  1
     53#define FIX_LGE_DVMCP_B0133               1
     54
     55
     56///// ***** PATCHES *********
     57#define TMVP_DEPTH_SWITCH                 1   // JCT3V-B0092 additional encoder option only
     58
     59///// ***** DEPTH MODELING MODES *********
     60#define HHI_DMM_WEDGE_INTRA               1   // depth model modes independent on texture (explicit and intra-predicted Wedgelet prediction)
     61#define HHI_DMM_PRED_TEX                  1   // depth model modes dependent on texture (inter-component Wedgelet and Contour prediction )
     62#define LGE_EDGE_INTRA_A0070              1   // JCT3V-A0070
     63#define RWTH_SDC_DLT_B0036                1   // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table
     64#define HHIQC_DMMFASTSEARCH_B0039         1   // JCT3V-B0039: fast Wedgelet search for DMM modes 1 and 3
     65
     66///// ***** INTERVIEW MOTION VECTOR PREDICTION *********
     67#define HHI_INTER_VIEW_MOTION_PRED        1   // inter-view motion parameter prediction
     68#define SHARP_INTERVIEW_DECOUPLE_B0111    1   // JCT3V-B0111 decoupling inter-view candidate
     69#define QC_MRG_CANS_B0048                 1   // JCT3V-B0048, B0086, B0069
     70#if     QC_MRG_CANS_B0048
     71#define OL_DISMV_POS_B0069                1   // different pos for disparity MV candidate, B0069
     72#endif
     73#define MTK_INTERVIEW_MERGE_A0049         1   // JCT3V-A0049 second part
     74#if HHI_INTER_VIEW_MOTION_PRED         
     75#define SAIT_IMPROV_MOTION_PRED_M24829    1   // improved inter-view motion vector prediction
     76#else                                 
     77#define SAIT_IMPROV_MOTION_PRED_M24829    0   
     78#endif                                 
     79
     80///// ***** INTERVIEW RESIDUAL PREDICTION *********
     81#define HHI_INTER_VIEW_RESIDUAL_PRED      1   // inter-view residual prediction
     82#if HHI_INTER_VIEW_RESIDUAL_PRED       
     83#define LG_RESTRICTEDRESPRED_M24766       1   // restricted inter-view residual prediction
     84#define QC_SIMPLIFIEDIVRP_M24938          1
     85#else                                 
     86#define LG_RESTRICTEDRESPRED_M24766       0
     87#define QC_SIMPLIFIEDIVRP_M24938          0
     88#endif
     89
     90///// ***** DISPARITY VECTOR DERIVATION *********
     91#define QC_MULTI_DIS_CAN_A0097            1   // JCT3V-A0097
     92#define LGE_DVMCP_A0126                   1   // JCT3V-A0126     
     93#define LGE_DVMCP_MEM_REDUCTION_B0135     1   // JCT3V-B0135     
     94#define DV_DERIVATION_PARALLEL_B0096      1   // JCT3V-B0096, enable parallel derivation of disparity vector
     95#define QC_SIMPLE_NBDV_B0047              1   // JCT3V-B0047
     96
     97///// ***** MOTION PARAMETER INHERITANCE  *********
     98#define HHI_MPI                           1   // motion parameter inheritance from texture picture for depth map coding
     99#if HHI_MPI
     100#define FIX_MPI_B0065                     1   // JCT3V-B0065, fix the MPI bug when RQT is off
     101#endif
     102#define MTK_UNCONSTRAINED_MVI_B0083       1    //JCT3V-B0083
     103
     104///// ***** VIEW SYNTHESIS OPTIMIZAION *********
     105#define HHI_VSO                           1
     106#define HHI_VSO_LS_TABLE_M23714           1   // m23714, enable table base Lagrange multiplier optimization
     107#define HHI_VSO_DIST_INT                  1   // Allow negative synthesized view distortion change
     108#define HHI_VSO_COLOR_PLANES              1   // Compute VSO distortion on color planes
     109#define HHI_VSO_RM_ASSERTIONS             0   // Output VSO assertions
     110#define HHI_VSO_SYNTH_DIST_OUT            0   // Output of synthesized view distortion instead of depth distortion in encoder output
     111#define SAIT_VSO_EST_A0033                1   // JCT3V-A0033 modification 3
     112#define LGE_VSO_EARLY_SKIP_A0093          1   // JCT3V-A0093 modification 4
     113#define LGE_WVSO_A0119                    1   // JCT3V-A0119 & JCT3V-B0131 Depth Metric with a weighted depth fidelity term
     114
     115
     116///// ***** ILLUMINATION COMPENSATON *********
     117#define LGE_ILLUCOMP_B0045                1   // JCT2-B0045 Illumination compensation for Luma and Chroma
     118#if LGE_ILLUCOMP_B0045
     119#define LGE_ILLUCOMP_B0045_ENCSIMP        1
     120#endif
     121
     122///// ***** INTERVIEW SKIP *********
     123#define HHI_INTERVIEW_SKIP                1
     124
     125///// ***** QUADTREE LIMITATION *********
     126#define OL_QTLIMIT_PREDCODING_B0068       1    //JCT3V-B0068
     127
     128///// ***** OTHERS *********
     129#define LG_ZEROINTRADEPTHRESI_A0087       1   // JCT2-A0087
     130#define SONY_COLPIC_AVAILABILITY          1
     131#define HHI_FULL_PEL_DEPTH_MAP_MV_ACC     1   // full-pel mv accuracy for depth maps
     132#define VIDYO_VPS_INTEGRATION             1
     133
     134
     135
     136///// ***** DEFINED PARAMETERS *********
     137#if QC_MULTI_DIS_CAN_A0097                   
     138#define DIS_CANS                          1
     139#endif                                 
     140
     141#define HHI_INTERVIEW_SKIP_LAMBDA_SCALE   1
     142
     143#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     144#define DMM_WEDGEMODEL_MIN_SIZE           4
     145#define DMM_WEDGEMODEL_MAX_SIZE          32
     146#define DMM_WEDGE_PREDDIR_DELTAEND_MAX    4
     147#endif
     148
     149#if LGE_EDGE_INTRA_A0070
    60150#define LGE_EDGE_INTRA_MIN_SIZE           4
    61151#define LGE_EDGE_INTRA_MAX_SIZE           32
     
    66156#endif
    67157
    68 #define LG_ZEROINTRADEPTHRESI_M26039      1   // JCT2-A0087
    69                                        
    70 #define SONY_COLPIC_AVAILABILITY          1
    71                                        
    72 #define HHI_INTER_VIEW_MOTION_PRED        1   // inter-view motion parameter prediction
    73 #define HHI_INTER_VIEW_RESIDUAL_PRED      1   // inter-view residual prediction
    74 #define QC_MULTI_DIS_CAN                  1   // JCT2-A0097
    75 #if QC_MULTI_DIS_CAN                   
    76     #define DIS_CANS                      1
    77 #endif                                 
    78                                        
    79 #define MTK_INTERVIEW_MERGE_A0049         1   //  JCT2-A0049 second part
    80                                        
    81 #define LGE_DVMCP                         1   //  JCT2-A0126     
    82 #if LGE_DVMCP                           
     158
     159#if LGE_DVMCP_A0126                           
    83160#define DVFROM_LEFTBELOW                  1
    84161#define DVFROM_LEFT                       2
     
    90167
    91168
    92 #define HHI_VSO                           1
    93 #define HHI_VSO_LS_TABLE                  1 // m23714
    94 #define HHI_VSO_DIST_INT                  1
    95 #define HHI_VSO_SYNTH_DIST_OUT            0
    96 #define HHI_VSO_COLOR_PLANES              1
    97 #define HHI_VSO_SPEEDUP_A0033             1 // JCT2-A0033 modification 1 (changes in classes directly related the renderer model
    98                                             // to are not covered by this define, since nearly the entire class has been changed)
    99 #define HHI_VSO_RM_ASSERTIONS             0 // output VSO assertions
    100 #define HHI_VSO_SET_OPTIM                 1 // remove unnecessary updates (works only with HHI_VSO_FIX 1 properly)
    101 #define SAIT_VSO_EST_A0033                1 // JCT2-A0033 modification 3
    102 #define LGE_VSO_EARLY_SKIP_A0093          1 // JCT2-A0093 modification 4
    103 #define LGE_WVSO_A0119                    1 // JCT2-A0119 Depth Metric with a weighted depth fidelity term
    104 
    105 #define OL_DEPTHLIMIT_A0044               1 //JCT2-A0044
    106 #if OL_DEPTHLIMIT_A0044
    107 #define OL_DO_NOT_LIMIT_INTRA_SLICES_PART 1 //Turn this on to not perform depth limiting for I-SLICES.
    108 #define OL_END_CU                         MAX_INT //Default for initializing the partition information buffer
    109 #define OL_PART_BUF_SIZE                  86 //maximum number of possible partition bits in a CU
    110 #endif
    111 
    112 #define HHI_INTERVIEW_SKIP                1
    113 #define HHI_INTERVIEW_SKIP_LAMBDA_SCALE   1
    114 
    115 #define HHI_DMM_WEDGE_INTRA               1   // depth model modes independent on texture (explicit and intra-predicted Wedgelet prediction)
    116 #define HHI_DMM_PRED_TEX                  1   // depth model modes dependent on texture (inter-component Wedgelet and Contour prediction )
    117 
    118 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    119 #define DMM_WEDGEMODEL_MIN_SIZE           4
    120 #define DMM_WEDGEMODEL_MAX_SIZE          32
    121 #define DMM_WEDGE_PREDDIR_DELTAEND_MAX    4
    122 #endif
    123 
    124 #define HHI_MPI                           1   // motion parameter inheritance from texture picture for depth map coding
     169#if HHIQC_DMMFASTSEARCH_B0039
     170#define DMM3_SIMPLIFY_TR                  1
     171#endif
     172
     173
     174#if RWTH_SDC_DLT_B0036
     175#define Log2( n ) ( log((double)n) / log(2.0) )
     176#endif
     177
    125178#define HHI_MPI_MERGE_POS                 0
    126 #define HHI_FULL_PEL_DEPTH_MAP_MV_ACC     1   // full-pel mv accuracy for depth maps
    127                                        
    128 #if HHI_INTER_VIEW_MOTION_PRED         
    129 #define SAIT_IMPROV_MOTION_PRED_M24829    1   // improved inter-view motion vector prediction
    130 #else                                 
    131 #define SAIT_IMPROV_MOTION_PRED_M24829    0   
    132 #endif                                 
    133                                        
    134 #if HHI_INTER_VIEW_RESIDUAL_PRED       
    135 #define LG_RESTRICTEDRESPRED_M24766       1   // restricted inter-view residual prediction
    136 #define QC_SIMPLIFIEDIVRP_M24938          1
    137 #else                                 
    138 #define LG_RESTRICTEDRESPRED_M24766       0
    139 #define QC_SIMPLIFIEDIVRP_M24938          0
    140 #endif
    141 
    142 
     179
     180///// ***** HM 6.1 *********
    143181#define SKIPFRAME_BUGFIX                  1 ///< bug fix to enable skipFrame at decoder
    144182#define START_DECODING_AT_CRA             1 ///< H0496, start decoding at clear random access point
     
    151189
    152190#define PARALLEL_MERGE  1                   //< H0082 parallel merge/skip
     191#define LGE_IVMP_PARALLEL_MERGE_B0136     1 //< B0136 support of parallel merge/skip in disparity vector derivation
    153192#define LOG2_PARALLEL_MERGE_LEVEL_MINUS2  0 //< H0082 parallel merge level 0-> 4x4, 1-> 8x8, 2->16x16, 3->32x32, 4->64x64
     193
    154194#if PARALLEL_MERGE && LOG2_PARALLEL_MERGE_LEVEL_MINUS2
    155195#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
    156 #endif
     196#define FIX_CU_BASED_MRG_CAND_LIST_B0136  1  //< B0136 bug fix for CU_BASED_MRG_CAND_LIST
     197#endif
     198
    157199#define MVP_AT_ENTROPYSLICE_BOUNDARY      1  //< H0362 enable motion prediction accross entropy slice boundary
    158200
    159201#define FAST_DECISION_FOR_MRG_RD_COST     1  ////< H0178: Fast Decision for Merge 2Nx2N RDCost
    160202
    161 #define PIC_CROPPING              1 ///< Picture cropping and size constraints
    162 #define NAL_REF_FLAG              1 ///< Change nal_ref_idc to nal_ref_flag (JCTVC-F463)
    163 #define REMOVE_DIV_OPERATION      1 ///< H0238: Simplified intra horizontal and vertical filtering
     203#define PIC_CROPPING              1  ///< Picture cropping and size constraints
     204#define NAL_REF_FLAG              1  ///< Change nal_ref_idc to nal_ref_flag (JCTVC-F463)
     205#define REMOVE_DIV_OPERATION      1  ///< H0238: Simplified intra horizontal and vertical filtering
    164206#define LOGI_INTRA_NAME_3MPM      1  ///< H0407: logical Intra mode naming (sequential angular mode numbering) and 3 MPM mode coding
    165207
     
    172214#define MULTIBITS_DATA_HIDING     1  ///< H0481: multiple sign bit hiding
    173215
    174 #define DEQUANT_CLIPPING           1  ///< H0312/H0541: transformed coefficients clipping before de-quantization
     216#define DEQUANT_CLIPPING          1  ///< H0312/H0541: transformed coefficients clipping before de-quantization
    175217
    176218#define REMOVE_NON_SCALED         1 ///< H0164/H0250: Removal of non-scaled merge candidate
     
    280322#define LOG2_SCAN_SET_SIZE                4
    281323
    282 #if LGE_EDGE_INTRA
     324#if LGE_EDGE_INTRA_A0070
    283325#if LGE_EDGE_INTRA_DELTA_DC
    284326#define FAST_UDI_MAX_RDMODE_NUM               37          ///< maximum number of RD comparison in fast-UDI estimation loop
     
    328370#endif
    329371
    330 #if LGE_EDGE_INTRA
     372#if LGE_EDGE_INTRA_A0070
    331373#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
    332374#define EDGE_INTRA_IDX  (NUM_INTRA_MODE+NUM_DMM_MODE)
     
    353395                            // This is here just to perform timing tests -- OL_FLUSH_ALIGN should be 0 for WPP.
    354396
    355 #define RVM_VCEGAM10_M 4
     397#define RVM_VCEGAM10_M         4
    356398
    357399#define PLANAR_IDX             0
     
    435477// VPS INTEGRATION
    436478// ====================================================================================================================
    437 #define VIDYO_VPS_INTEGRATION       1
     479
    438480#if VIDYO_VPS_INTEGRATION
    439481#define MAX_NUM_VPS 10
     
    720762};
    721763
    722 #if HHI_VSO_SPEEDUP_A0033
    723764
    724765enum BlenMod
     
    730771    BLEND_GEN   =  3
    731772};
    732 #endif
    733773
    734774/// supported prediction type
Note: See TracChangeset for help on using the changeset viewer.