Changeset 602 in 3DVCSoftware for branches/HTM-DEV-2.0-dev0


Ignore:
Timestamp:
29 Aug 2013, 23:57:49 (11 years ago)
Author:
tech
Message:

Cleanup TypeDef.h.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-DEV-2.0-dev0/source/Lib/TLibCommon/TypeDef.h

    r601 r602  
    9696                                              // Unifying rounding offset, for IC part, JCT3V-D0135
    9797                                              // Full Pel Interpolation for Depth, HHI_FULL_PEL_DEPTH_MAP_MV_ACC
    98 #define H_3D_FIX                          1   // Bug Fix
    99 #define SHARP_ILLUCOMP_REFINE_E0046       1
    100 #define MTK_FAST_TEXTURE_ENCODING_E0173   1   // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173
    101 #if H_3D_FIX
    102 #if H_3D_IC
    103 #define MTK_CLIPPING_ALIGN_IC_E0168       1   // To support simplify bi-prediction PU with identical motion checking, JCT3V-E0168
    104 #endif
    105 #else
    106 #define MTK_CLIPPING_ALIGN_IC_E0168       1   // To support simplify bi-prediction PU with identical motion checking, JCT3V-E0168
    107 #endif
    108 #define MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170            1   // Progressive MV Compression, JCT3V-E0170
    109 #define LGE_INTER_SDC_E0156               1   // Enable inter SDC for depth coding
    11098
    11199#if H_3D_NBDV
    … …  
    114102                                              // MERL_D0166: Reference view selection in NBDV & Bi-VSP
    115103                                              // MERL_C0152: Basic VSP
    116 
    117 #define NBDV_DEFAULT_VIEWIDX_BUGFIX       1  // Bug fix for invalid default view index for NBDV
    118 #define MTK_RVS_BUGFIX_E0172              1  // Bug fix for issues caused by reference view selection, JCT3V-E0172
    119 #if MTK_RVS_BUGFIX_E0172
    120 #define MTK_DVMCP_FIX_E0172                  1 // fix the mismatch between software and WD for DV derivation from DVMCP blocks, issue 2 in JCT3V-E0172
    121 #define MTK_VSP_FIX_ALIGN_WD_E0172           1 // fix the issues related to VSP merge candidate, issue 3, 4 in JCT3V-E0172, using an implementation aligned with WD
    122 #if !MTK_VSP_FIX_ALIGN_WD_E0172
    123 #define MTK_VSP_FIX_E0172                    1 // fix the issues related to VSP merge candidate, issue 3, 4 in JCT3V-E0172
    124 #endif
    125 #define MTK_DIVMC_FIX_E0172                  1 // fix the issue of derivation of disparity inter-view merge candidate, issue 5 in JCT3V-E0172
    126 #define MTK_NBDV_TN_FIX_E0172                1 // fix the issue of DV derivation from the temporal neighboring blocks, issue 7 in JCT3V-E0172
    127 #endif
    128 #define MTK_TEXTURE_MRGCAND_BUGFIX_E0182  1   // Bugfix for TEXTURE MERGING CANDIDATE     , JCT3V-E0182
    129 #if H_3D_NBDV_REF
    130 #define NTT_DoNBDV_VECTOR_CLIP_E0141      1   // disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209
    131 #define SEC_SIMPLIFIED_NBDV_E0142         1   // Simplified NBDV, JCT3V-E0142 and JCT3V-E0190
    132 #endif
    133 #endif
     104#endif
     105
    134106#define H_3D_VSP                          1   // View synthesis prediction
    135107                                              // MERL_C0152: Basic VSP
    … …  
    166138                                              // MTK_SAMPLE_BASED_SDC_D0110
    167139
    168 #if H_3D_FIX
    169 #define H_3D_BVSP_FIX                        1  //DV from NBDV instead of DoNBDV should be used
    170 #define FIX036                               1  // fix for ticket #36
    171 #endif
    172 #endif
     140
     141
     142/////////////////////////////////////////////////////////////////////////////////////////
     143///////////////////////////////////   NEW ADOPTIONS       ///////////////////////////////
     144/////////////////////////////////////////////////////////////////////////////////////////
     145
     146#define SHARP_ILLUCOMP_REFINE_E0046       1
     147#define MTK_FAST_TEXTURE_ENCODING_E0173   1   // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173
     148#define MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170            1   // Progressive MV Compression, JCT3V-E0170
     149#define LGE_INTER_SDC_E0156               1   // Enable inter SDC for depth coding
     150
     151#if H_3D_IC
     152#define MTK_CLIPPING_ALIGN_IC_E0168       1   // To support simplify bi-prediction PU with identical motion checking, JCT3V-E0168
     153#endif
     154
     155#if H_3D_NBDV
     156#define NBDV_DEFAULT_VIEWIDX_BUGFIX       1  // Bug fix for invalid default view index for NBDV
     157#define MTK_RVS_BUGFIX_E0172              1  // Bug fix for issues caused by reference view selection, JCT3V-E0172
     158#define MTK_TEXTURE_MRGCAND_BUGFIX_E0182  1  // Bug fix for TEXTURE MERGING CANDIDATE     , JCT3V-E0182
     159
     160#if MTK_RVS_BUGFIX_E0172
     161#define MTK_DIVMC_FIX_E0172               1 // fix the issue of derivation of disparity inter-view merge candidate, issue 5 in JCT3V-E0172
     162#define MTK_NBDV_TN_FIX_E0172             1 // fix the issue of DV derivation from the temporal neighboring blocks, issue 7 in JCT3V-E0172
     163#define MTK_DVMCP_FIX_E0172               1 // fix the mismatch between software and WD for DV derivation from DVMCP blocks, issue 2 in JCT3V-E0172
     164#define MTK_VSP_FIX_ALIGN_WD_E0172        1 // fix the issues related to VSP merge candidate, issue 3, 4 in JCT3V-E0172, using an implementation aligned with WD
     165
     166#if !MTK_VSP_FIX_ALIGN_WD_E0172
     167#define MTK_VSP_FIX_E0172                 1 // fix the issues related to VSP merge candidate, issue 3, 4 in JCT3V-E0172
     168#endif
     169#endif // MTK_RVS_BUGFIX_E0172
     170
     171#if H_3D_NBDV_REF
     172#define NTT_DoNBDV_VECTOR_CLIP_E0141      1   // disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209
     173#define SEC_SIMPLIFIED_NBDV_E0142         1   // Simplified NBDV, JCT3V-E0142 and JCT3V-E0190
     174#endif
     175#endif // H_3D_NBDV
     176
     177#if H_3D_IV_MERGE
     178#define QC_INRIA_MTK_MRG_E0126            1   // additional merge candidates JCT3V-E0126
     179#endif
     180
     181#if H_3D_DIM
     182#define SEC_DMM2_E0146                    1   // Removal of DMM2 from DMMs
     183#define ZJU_DEPTH_INTRA_MODE_E0204        1   // Simplified Binarization for depth_intra_mode
     184#define KWU_SDC_SIMPLE_DC_E0117           1   // Simplified DC calculation for SDC
     185#define SCU_HS_DMM4_REMOVE_DIV_E0242      1   // DMM4 Division Removal
     186#define SCU_HS_FAST_DEPTH_INTRA_E0238     1   // Fast DMM and RBC Mode Selection
     187#endif
     188
     189#if H_3D_VSP
     190#define NTT_VSP_COMMON_E0207_E0208        1 // common part of JCT3V-E0207 and JCT3V-E0208
     191#if NTT_VSP_COMMON_E0207_E0208
     192#define NTT_VSP_DC_BUGFIX_E0208           1 // bugfix for sub-PU based DC in VSP, JCT3V-E0208
     193#define NTT_VSP_VECTOR_CLIP_E0208         1 // disparity vector clipping on fetching depth map in VSP, JCT3V-E0208
     194#define NTT_VSP_ADAPTIVE_SPLIT_E0207      1 // adaptive sub-PU partitioning in VSP, JCT3V-E0207
     195#endif
     196#endif
     197
     198/// FIXES
     199#define H_3D_BVSP_FIX                     1  //DV from NBDV instead of DoNBDV should be used
     200#define FIX036                            1  // fix for ticket #36
     201
     202#endif // H_3D
    173203
    174204/////////////////////////////////////////////////////////////////////////////////////////
    175205///////////////////////////////////   DERIVED DEFINES /////////////////////////////////// 
    176206/////////////////////////////////////////////////////////////////////////////////////////
    177 
    178207
    179208///// ***** VIEW SYNTHESIS OPTIMIZAION *********
    … …  
    203232#endif
    204233#endif
    205 ////   **** Inter-view motion prediction for merge        *********
    206 #if H_3D_IV_MERGE
    207 #define QC_INRIA_MTK_MRG_E0126            1   // additional merge candidates JCT3V-E0126
    208 #endif
     234
    209235///// ***** ADVANCED INTERVIEW RESIDUAL PREDICTION *********
    210236#if H_3D_ARP
    … …  
    214240#if H_3D_DIM
    215241#define H_3D_DIM_DMM                      1   // Depth Modeling Modes
    216 #if H_3D_DIM
    217 #define SEC_DMM2_E0146                    1   // Removal of DMM2 from DMMs
    218 #define ZJU_DEPTH_INTRA_MODE_E0204        1   // Simplified Binarization for depth_intra_mode
    219 #endif
    220242#define H_3D_DIM_RBC                      1   // Region Boundary Chain mode
    221243#define H_3D_DIM_SDC                      1   // Simplified Depth Coding method
    … …  
    224246                                              // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
    225247                                              // LG_ZEROINTRADEPTHRESI_A0087
    226 #define KWU_SDC_SIMPLE_DC_E0117           1   // Simplified DC calculation for SDC
    227 #define SCU_HS_DMM4_REMOVE_DIV_E0242      1   // DMM4 Division Removal
    228 #define SCU_HS_FAST_DEPTH_INTRA_E0238     1   // Fast DMM and RBC Mode Selection
    229248#if H_3D_DIM_SDC
    230249#define LGE_SDC_REMOVE_DC_E0158           1   // Removal of DC mode from SDC
    … …  
    243262#else
    244263#define H_3D_VSP_CONSTRAINED              0
    245 #endif
    246 
    247 #define NTT_VSP_COMMON_E0207_E0208        1 // common part of JCT3V-E0207 and JCT3V-E0208
    248 #if NTT_VSP_COMMON_E0207_E0208
    249 #define NTT_VSP_DC_BUGFIX_E0208           1 // bugfix for sub-PU based DC in VSP, JCT3V-E0208
    250 #define NTT_VSP_VECTOR_CLIP_E0208         1 // disparity vector clipping on fetching depth map in VSP, JCT3V-E0208
    251 #define NTT_VSP_ADAPTIVE_SPLIT_E0207      1 // adaptive sub-PU partitioning in VSP, JCT3V-E0207
    252264#endif
    253265
Note: See TracChangeset for help on using the changeset viewer.