Changeset 276 in 3DVCSoftware for branches/HTM-5.1-dev3-CleanUp


Ignore:
Timestamp:
14 Feb 2013, 12:04:23 (12 years ago)
Author:
tech
Message:

Change macro order in TypeDef.h

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-5.1-dev3-CleanUp/source/Lib/TLibCommon/TypeDef.h

    r273 r276  
    5252#if !QC_MVHEVC_B0046
    5353
    54 ///// ***** VSP MODES *********
    55 #define MERL_VSP_C0152                       1 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
     54
     55// C TRACK 3
     56#define MERL_VSP_C0152                                1 // JCT3V-C0152: 1: enable VSP-related tools; 0: disable VSP-related tools
     57#define MTK_SAIT_TEMPORAL_FIRST_ORDER_C0141_C0097     1   // JCT3V-C0141/C0097
     58#define MTK_SIMPLIFY_DVTC_C0135                       1   // JCT3V-C0135
     59#define MTK_RELEASE_DV_CONSTRAINT_C0129               1   // JCT3V-C0129
     60#define QC_NBDV_LDB_FIX_C0055                         1   // JCT3V-C0055
     61
     62///// ***** FIXES *********
     63// A
     64#define FIX_POZNAN_CABAC_INIT_FLAG        1
     65#define FIX_LG_RESTRICTEDRESPRED_M24766   1
     66
     67// B
     68#define FIX_LGE_IVMP_PARALLEL_MERGE_B0136 1
     69#define FIX_RDO_NEGDIST                   1
     70#define FIX_DMM_NEG_DIST                  1
     71#define FIX_LGE_DVMCP_B0133               1
     72
     73
     74// FCO
     75#define FLEX_CODING_ORDER_M23723          1
     76#if FLEX_CODING_ORDER_M23723
     77  #define DISABLE_FCO_FOR_VSO             0 // Optional compile settings to disable VSO with FCO.
     78#endif
     79
     80///// ***** PATCHES *********
     81#define TMVP_DEPTH_SWITCH                 1   // JCT3V-B0092 additional encoder option only
     82
     83///// ***** DEPTH MODELING MODES *********
     84#define HHI_DMM_WEDGE_INTRA               1   // depth model modes independent on texture (explicit and intra-predicted Wedgelet prediction)
     85#define HHI_DMM_PRED_TEX                  1   // depth model modes dependent on texture (inter-component Wedgelet and Contour prediction )
     86#define LGE_EDGE_INTRA_A0070              1   // JCT3V-A0070
     87#define RWTH_SDC_DLT_B0036                1   // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table
     88#define HHIQC_DMMFASTSEARCH_B0039         1   // JCT3V-B0039: fast Wedgelet search for DMM modes 1 and 3
     89
     90///// ***** INTERVIEW MOTION VECTOR PREDICTION *********
     91#define HHI_INTER_VIEW_MOTION_PRED        1   // inter-view motion parameter prediction
     92#define SHARP_INTERVIEW_DECOUPLE_B0111    1   // JCT3V-B0111 decoupling inter-view candidate
     93#define QC_MRG_CANS_B0048                 1   // JCT3V-B0048, B0086, B0069
     94#if     QC_MRG_CANS_B0048
     95#define OL_DISMV_POS_B0069                1   // different pos for disparity MV candidate, B0069
     96#endif
     97#define MTK_INTERVIEW_MERGE_A0049         1   // JCT3V-A0049 second part
     98#if HHI_INTER_VIEW_MOTION_PRED         
     99#define SAIT_IMPROV_MOTION_PRED_M24829    1   // improved inter-view motion vector prediction
     100#else                                 
     101#define SAIT_IMPROV_MOTION_PRED_M24829    0   
     102#endif                                 
     103
     104///// ***** INTERVIEW RESIDUAL PREDICTION *********
     105#define HHI_INTER_VIEW_RESIDUAL_PRED      1   // inter-view residual prediction
     106#if HHI_INTER_VIEW_RESIDUAL_PRED       
     107#define LG_RESTRICTEDRESPRED_M24766       1   // restricted inter-view residual prediction
     108#define QC_SIMPLIFIEDIVRP_M24938          1
     109#else                                 
     110#define LG_RESTRICTEDRESPRED_M24766       0
     111#define QC_SIMPLIFIEDIVRP_M24938          0
     112#endif
     113
     114///// ***** DISPARITY VECTOR DERIVATION *********
     115#define QC_MULTI_DIS_CAN_A0097            1   // JCT3V-A0097
     116#define LGE_DVMCP_A0126                   1   // JCT3V-A0126     
     117#define LGE_DVMCP_MEM_REDUCTION_B0135     1   // JCT3V-B0135     
     118#define DV_DERIVATION_PARALLEL_B0096      1   // JCT3V-B0096, enable parallel derivation of disparity vector
     119#define QC_SIMPLE_NBDV_B0047              1   // JCT3V-B0047
     120///// ***** MOTION PARAMETER INHERITANCE  *********
     121#define HHI_MPI                           1   // motion parameter inheritance from texture picture for depth map coding
     122#if HHI_MPI
     123#define FIX_MPI_B0065                     1   // JCT3V-B0065, fix the MPI bug when RQT is off
     124#endif
     125#define MTK_UNCONSTRAINED_MVI_B0083       1    //JCT3V-B0083
     126
     127///// ***** VIEW SYNTHESIS OPTIMIZAION *********
     128#define HHI_VSO                           1
     129#define HHI_VSO_LS_TABLE_M23714           1   // m23714, enable table base Lagrange multiplier optimization
     130#define HHI_VSO_DIST_INT                  1   // Allow negative synthesized view distortion change
     131#define HHI_VSO_COLOR_PLANES              1   // Compute VSO distortion on color planes
     132#define HHI_VSO_RM_ASSERTIONS             0   // Output VSO assertions
     133#define HHI_VSO_SYNTH_DIST_OUT            0   // Output of synthesized view distortion instead of depth distortion in encoder output
     134#define SAIT_VSO_EST_A0033                1   // JCT3V-A0033 modification 3
     135#define LGE_VSO_EARLY_SKIP_A0093          1   // JCT3V-A0093 modification 4
     136#define LGE_WVSO_A0119                    1   // JCT3V-A0119 & JCT3V-B0131 Depth Metric with a weighted depth fidelity term
     137
     138
     139///// ***** ILLUMINATION COMPENSATON *********
     140#define LGE_ILLUCOMP_B0045                1   // JCT2-B0045 Illumination compensation for Luma and Chroma
     141#if LGE_ILLUCOMP_B0045
     142#define LGE_ILLUCOMP_B0045_ENCSIMP        1
     143#endif
     144
     145///// ***** INTERVIEW SKIP *********
     146#define HHI_INTERVIEW_SKIP                1
     147
     148///// ***** QUADTREE LIMITATION *********
     149#define OL_QTLIMIT_PREDCODING_B0068       1    //JCT3V-B0068
     150
     151///// ***** OTHERS *********
     152#define LG_ZEROINTRADEPTHRESI_A0087       1   // JCT2-A0087
     153#define SONY_COLPIC_AVAILABILITY          1
     154#define HHI_FULL_PEL_DEPTH_MAP_MV_ACC     1   // full-pel mv accuracy for depth maps
     155#define VIDYO_VPS_INTEGRATION             1
     156
     157///// ***** VSP *********
    56158
    57159#if MERL_VSP_C0152
    … …  
    87189#endif
    88190
    89 ///// ***** FIXES *********
    90 // A
    91 #define FIX_POZNAN_CABAC_INIT_FLAG        1
    92 #define FIX_LG_RESTRICTEDRESPRED_M24766   1
    93 
    94 // B
    95 #define FIX_LGE_IVMP_PARALLEL_MERGE_B0136 1
    96 #define FIX_RDO_NEGDIST                   1
    97 #define FIX_DMM_NEG_DIST                  1
    98 #define FIX_LGE_DVMCP_B0133               1
    99 
    100 
    101 // FCO
    102 #define FLEX_CODING_ORDER_M23723          1
    103 #if FLEX_CODING_ORDER_M23723
    104   #define DISABLE_FCO_FOR_VSO             0 // Optional compile settings to disable VSO with FCO.
    105 #endif
    106 
    107 ///// ***** PATCHES *********
    108 #define TMVP_DEPTH_SWITCH                 1   // JCT3V-B0092 additional encoder option only
    109 
    110 ///// ***** DEPTH MODELING MODES *********
    111 #define HHI_DMM_WEDGE_INTRA               1   // depth model modes independent on texture (explicit and intra-predicted Wedgelet prediction)
    112 #define HHI_DMM_PRED_TEX                  1   // depth model modes dependent on texture (inter-component Wedgelet and Contour prediction )
    113 #define LGE_EDGE_INTRA_A0070              1   // JCT3V-A0070
    114 #define RWTH_SDC_DLT_B0036                1   // JCT3V-B0036: Simplified Depth Coding + Depth Lookup Table
    115 #define HHIQC_DMMFASTSEARCH_B0039         1   // JCT3V-B0039: fast Wedgelet search for DMM modes 1 and 3
    116 
    117 ///// ***** INTERVIEW MOTION VECTOR PREDICTION *********
    118 #define HHI_INTER_VIEW_MOTION_PRED        1   // inter-view motion parameter prediction
    119 #define SHARP_INTERVIEW_DECOUPLE_B0111    1   // JCT3V-B0111 decoupling inter-view candidate
    120 #define QC_MRG_CANS_B0048                 1   // JCT3V-B0048, B0086, B0069
    121 #if     QC_MRG_CANS_B0048
    122 #define OL_DISMV_POS_B0069                1   // different pos for disparity MV candidate, B0069
    123 #endif
    124 #define MTK_INTERVIEW_MERGE_A0049         1   // JCT3V-A0049 second part
    125 #if HHI_INTER_VIEW_MOTION_PRED         
    126 #define SAIT_IMPROV_MOTION_PRED_M24829    1   // improved inter-view motion vector prediction
    127 #else                                 
    128 #define SAIT_IMPROV_MOTION_PRED_M24829    0   
    129 #endif                                 
    130 
    131 ///// ***** INTERVIEW RESIDUAL PREDICTION *********
    132 #define HHI_INTER_VIEW_RESIDUAL_PRED      1   // inter-view residual prediction
    133 #if HHI_INTER_VIEW_RESIDUAL_PRED       
    134 #define LG_RESTRICTEDRESPRED_M24766       1   // restricted inter-view residual prediction
    135 #define QC_SIMPLIFIEDIVRP_M24938          1
    136 #else                                 
    137 #define LG_RESTRICTEDRESPRED_M24766       0
    138 #define QC_SIMPLIFIEDIVRP_M24938          0
    139 #endif
    140 
    141 ///// ***** DISPARITY VECTOR DERIVATION *********
    142 #define QC_MULTI_DIS_CAN_A0097            1   // JCT3V-A0097
    143 #define LGE_DVMCP_A0126                   1   // JCT3V-A0126     
    144 #define LGE_DVMCP_MEM_REDUCTION_B0135     1   // JCT3V-B0135     
    145 #define DV_DERIVATION_PARALLEL_B0096      1   // JCT3V-B0096, enable parallel derivation of disparity vector
    146 #define QC_SIMPLE_NBDV_B0047              1   // JCT3V-B0047
    147 #define MTK_SAIT_TEMPORAL_FIRST_ORDER_C0141_C0097     1   // JCT3V-C0141/C0097
    148 #define MTK_SIMPLIFY_DVTC_C0135                       1   // JCT3V-C0135
    149 #define MTK_RELEASE_DV_CONSTRAINT_C0129               1   // JCT3V-C0129
    150 #define QC_NBDV_LDB_FIX_C0055                         1   // JCT3V-C0055
    151 ///// ***** MOTION PARAMETER INHERITANCE  *********
    152 #define HHI_MPI                           1   // motion parameter inheritance from texture picture for depth map coding
    153 #if HHI_MPI
    154 #define FIX_MPI_B0065                     1   // JCT3V-B0065, fix the MPI bug when RQT is off
    155 #endif
    156 #define MTK_UNCONSTRAINED_MVI_B0083       1    //JCT3V-B0083
    157 
    158 ///// ***** VIEW SYNTHESIS OPTIMIZAION *********
    159 #define HHI_VSO                           1
    160 #define HHI_VSO_LS_TABLE_M23714           1   // m23714, enable table base Lagrange multiplier optimization
    161 #define HHI_VSO_DIST_INT                  1   // Allow negative synthesized view distortion change
    162 #define HHI_VSO_COLOR_PLANES              1   // Compute VSO distortion on color planes
    163 #define HHI_VSO_RM_ASSERTIONS             0   // Output VSO assertions
    164 #define HHI_VSO_SYNTH_DIST_OUT            0   // Output of synthesized view distortion instead of depth distortion in encoder output
    165 #define SAIT_VSO_EST_A0033                1   // JCT3V-A0033 modification 3
    166 #define LGE_VSO_EARLY_SKIP_A0093          1   // JCT3V-A0093 modification 4
    167 #define LGE_WVSO_A0119                    1   // JCT3V-A0119 & JCT3V-B0131 Depth Metric with a weighted depth fidelity term
    168 
    169 
    170 ///// ***** ILLUMINATION COMPENSATON *********
    171 #define LGE_ILLUCOMP_B0045                1   // JCT2-B0045 Illumination compensation for Luma and Chroma
    172 #if LGE_ILLUCOMP_B0045
    173 #define LGE_ILLUCOMP_B0045_ENCSIMP        1
    174 #endif
    175 
    176 ///// ***** INTERVIEW SKIP *********
    177 #define HHI_INTERVIEW_SKIP                1
    178 
    179 ///// ***** QUADTREE LIMITATION *********
    180 #define OL_QTLIMIT_PREDCODING_B0068       1    //JCT3V-B0068
    181 
    182 ///// ***** OTHERS *********
    183 #define LG_ZEROINTRADEPTHRESI_A0087       1   // JCT2-A0087
    184 #define SONY_COLPIC_AVAILABILITY          1
    185 #define HHI_FULL_PEL_DEPTH_MAP_MV_ACC     1   // full-pel mv accuracy for depth maps
    186 #define VIDYO_VPS_INTEGRATION             1
    187 
    188 
    189191
    190192///// ***** DEFINED PARAMETERS *********
Note: See TracChangeset for help on using the changeset viewer.