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


Ignore:
Timestamp:
23 Oct 2013, 23:01:30 (10 years ago)
Author:
tech
Message:

Merged 8.1-Cleanup@654

File:
1 edited

Legend:

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

    r622 r655  
    9292                                              // QC_CU_NBDV_D0181
    9393                                              // SEC_DEFAULT_DV_D0112
    94                                               // MTK_DVMCP_FIX_E0172               1 // fix the mismatch between software and WD for DV derivation from DVMCP blocks, issue 2 in JCT3V-E0172
     94                                              // MTK_DVMCP_FIX_E0172       fix the mismatch between software and WD for DV derivation from DVMCP blocks, issue 2 in JCT3V-E0172
     95                                              // SEC_SIMPLIFIED_NBDV_E0142 Simplified NBDV, JCT3V-E0142 and JCT3V-E0190
     96                                              // MTK_NBDV_TN_FIX_E0172     fix the issue of DV derivation from the temporal neighboring blocks, issue 7 in JCT3V-E0172
     97                                              // MTK_TEXTURE_MRGCAND_BUGFIX_E0182  Bug fix for TEXTURE MERGING CANDIDATE     , JCT3V-E0182
    9598#define H_3D_ARP                          1   // Advanced residual prediction (ARP), JCT3V-D0177
    9699#define H_3D_IC                           1   // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060
    97100                                              // Unifying rounding offset, for IC part, JCT3V-D0135
    98101                                              // Full Pel Interpolation for Depth, HHI_FULL_PEL_DEPTH_MAP_MV_ACC
     102                                              // SHARP_ILLUCOMP_REFINE_E0046
     103                                              // MTK_CLIPPING_ALIGN_IC_E0168       // To support simplify bi-prediction PU with identical motion checking, JCT3V-E0168
    99104
    100105#if H_3D_NBDV
     
    103108                                              // MERL_D0166: Reference view selection in NBDV & Bi-VSP
    104109                                              // MERL_C0152: Basic VSP
     110                                              // NBDV_DEFAULT_VIEWIDX_BUGFIX Bug fix for invalid default view index for NBDV
     111                                              // NTT_DoNBDV_VECTOR_CLIP_E0141 disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209
     112
    105113#endif
    106114
     
    112120                                              // LG_D0092: Multiple VSP candidate allowed
    113121                                              // MTK_VSP_FIX_ALIGN_WD_E0172
     122                                              // NTT_VSP_ADAPTIVE_SPLIT_E0207 adaptive sub-PU partitioning in VSP, JCT3V-E0207
     123                                              // NTT_VSP_DC_BUGFIX_E0208 bugfix for sub-PU based DC in VSP, JCT3V-E0208
     124                                              // NTT_VSP_COMMON_E0207_E0208 common part of JCT3V-E0207 and JCT3V-E0208
    114125#define H_3D_IV_MERGE                     1   // Inter-view motion merge candidate
    115126                                              // HHI_INTER_VIEW_MOTION_PRED
     
    139150                                              // FIX_SDC_ENC_RD_WVSO_D0163
    140151                                              // MTK_SAMPLE_BASED_SDC_D0110
    141 
    142 
    143 
    144 /////////////////////////////////////////////////////////////////////////////////////////
    145 ///////////////////////////////////   HTM-8.0 INTEGRATIONS //////////////////////////////
    146 /////////////////////////////////////////////////////////////////////////////////////////
    147 
    148 #define SHARP_ILLUCOMP_REFINE_E0046       1
    149 #define MTK_FAST_TEXTURE_ENCODING_E0173   1   // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173
    150 #define MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170            1   // Progressive MV Compression, JCT3V-E0170
    151 #define LGE_INTER_SDC_E0156               1   // Enable inter SDC for depth coding
    152 
    153 #if H_3D_IC
    154 #define MTK_CLIPPING_ALIGN_IC_E0168       1   // To support simplify bi-prediction PU with identical motion checking, JCT3V-E0168
    155 #endif
    156 
    157 #if H_3D_NBDV
    158 #define NBDV_DEFAULT_VIEWIDX_BUGFIX       1  // Bug fix for invalid default view index for NBDV
    159 #define MTK_RVS_BUGFIX_E0172              1  // Bug fix for issues caused by reference view selection, JCT3V-E0172
    160 #define MTK_TEXTURE_MRGCAND_BUGFIX_E0182  1  // Bug fix for TEXTURE MERGING CANDIDATE     , JCT3V-E0182
    161 
    162 #if MTK_RVS_BUGFIX_E0172
    163 #define MTK_DIVMC_FIX_E0172               1 // fix the issue of derivation of disparity inter-view merge candidate, issue 5 in JCT3V-E0172
    164 #define MTK_NBDV_TN_FIX_E0172             1 // fix the issue of DV derivation from the temporal neighboring blocks, issue 7 in JCT3V-E0172
    165 #endif // MTK_RVS_BUGFIX_E0172
    166 
    167 #if H_3D_NBDV_REF
    168 #define NTT_DoNBDV_VECTOR_CLIP_E0141      1   // disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209
    169 #define SEC_SIMPLIFIED_NBDV_E0142         1   // Simplified NBDV, JCT3V-E0142 and JCT3V-E0190
    170 #endif
    171 #endif // H_3D_NBDV
    172 
     152                                              // SEC_DMM2_E0146_HHIFIX Removal of DMM2 from DMMs
     153                                              // ZJU_DEPTH_INTRA_MODE_E0204 Simplified Binarization for depth_intra_mode
     154                                              // KWU_SDC_SIMPLE_DC_E0117 Simplified DC calculation for SDC
     155                                              // SCU_HS_DMM4_REMOVE_DIV_E0242 DMM4 Division Removal
     156                                              // LGE_SDC_REMOVE_DC_E0158 Removal of DC mode from SDC
     157                                              // LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX 1   Removal of overlap between DMM3 and DMM1
     158
     159#define H_3D_INTER_SDC                    1   // INTER SDC, Inter simplified depth coding
     160                                              // LGE_INTER_SDC_E0156  Enable inter SDC for depth coding
     161#define H_3D_FCO                          0   // Flexible coding order for 3D
     162
     163
     164
     165// OTHERS
     166                                              // MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170 // Progressive MV Compression, JCT3V-E0170
     167#define H_3D_REN_MAX_DEV_OUT              0   // Output maximal possible shift deviation
     168#define H_3D_FAST_TEXTURE_ENCODING        1   // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173
     169                                              // MTK_FAST_TEXTURE_ENCODING_E0173
    173170#if H_3D_DIM
    174 #define SEC_DMM2_E0146_HHIFIX             1   // Removal of DMM2 from DMMs
    175 #define ZJU_DEPTH_INTRA_MODE_E0204        1   // Simplified Binarization for depth_intra_mode
    176 #define KWU_SDC_SIMPLE_DC_E0117           1   // Simplified DC calculation for SDC
    177 #define SCU_HS_DMM4_REMOVE_DIV_E0242      1   // DMM4 Division Removal
    178 #define SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX     1   // Fast DMM and RBC Mode Selection
    179 #endif
    180 
    181 #if H_3D_VSP
    182 #define NTT_VSP_COMMON_E0207_E0208        1 // common part of JCT3V-E0207 and JCT3V-E0208
    183 #if NTT_VSP_COMMON_E0207_E0208
    184 #define NTT_VSP_DC_BUGFIX_E0208           1 // bugfix for sub-PU based DC in VSP, JCT3V-E0208
    185 #define NTT_VSP_VECTOR_CLIP_E0208         1 // disparity vector clipping on fetching depth map in VSP, JCT3V-E0208
    186 #define NTT_VSP_ADAPTIVE_SPLIT_E0207      1 // adaptive sub-PU partitioning in VSP, JCT3V-E0207
    187 #endif
    188 #endif
    189 
    190 #define H_3D_REN_MAX_DEV_OUT              0  // Output maximal possible shift deviation
    191 
    192 /// FIXES
    193 #define H_3D_FIX_BVSP                     1  // DV from NBDV instead of DoNBDV should be used
    194 #define H_3D_FIX_TICKET_036               1  // fix for ticket #36
    195 #define H_3D_FIX_REN                      1  // fix of erroneous inpainting for renderer
    196 #define H_3D_FIX_REN_WARNING              1  // fix of warning related to camera parameter precision
    197 
    198 #define H_3D_FIX_UINT_WARNING             1  // explicit in VSD
     171#define H_3D_FAST_DEPTH_INTRA             1   // Fast DMM and RBC Mode Selection
     172                                              // SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
     173#endif
     174
     175
     176// Rate Control
     177#define KWU_FIX_URQ                       1
     178#define KWU_RC_VIEWRC_E0227               0  ///< JCT3V-E0227, view-wise target bitrate allocation
     179#define KWU_RC_MADPRED_E0227              0  ///< JCT3V-E0227, inter-view MAD prediction
     180
    199181#endif // H_3D
    200182
    201183
    202 /////////////////////////////////////////////////////////////////////////////////////////
    203 ///////////////////////////////////   HTM-8.1 INTEGRATIONS //////////////////////////////
    204 /////////////////////////////////////////////////////////////////////////////////////////
    205 
    206 // Please put HTM-8.1 Integration defines here, when possible
    207 
    208 
    209 /// FIXES
    210 #if H_MV
    211 #define H_MV_FIX_LID_PIC_HASH_SEI_T40                      1   // Fix wrong layer_id in decoded picture hash SEI
    212 #define H_MV5                                              1   // Update to MV-HEVC 5 HLS
    213 #endif
     184
    214185/////////////////////////////////////////////////////////////////////////////////////////
    215186///////////////////////////////////   DERIVED DEFINES /////////////////////////////////// 
     
    223194#define H_3D_VSO_RM_ASSERTIONS            0   // Output VSO assertions
    224195#define H_3D_VSO_SYNTH_DIST_OUT           0   // Output of synthesized view distortion instead of depth distortion in encoder output
    225 
    226196#define H_3D_VSO_FIX                      0   // This fix should be enabled after verification
    227 
    228 #endif
    229 ////   ****** Neighbouring block-based Disparity Vector  *********
     197#endif
     198
     199////   ****** neighbouring block-based disparity vector  *********
    230200#if H_3D_NBDV
    231 #if SEC_SIMPLIFIED_NBDV_E0142
    232201#define DVFROM_LEFT                       0
    233202#define DVFROM_ABOVE                      1
    234203#define IDV_CANDS                         2
    235 #else
    236 #define DVFROM_LEFTBELOW                  0
    237 #define DVFROM_LEFT                       1
    238 #define DVFROM_ABOVERIGHT                 2
    239 #define DVFROM_ABOVE                      3
    240 #define DVFROM_ABOVELEFT                  4
    241 #define IDV_CANDS                         5
    242 #endif
    243204#endif
    244205
     
    247208#define H_3D_ARP_WFNR                     3
    248209#endif
     210
    249211///// ***** DEPTH INTRA MODES *********
    250212#if H_3D_DIM
     
    256218                                              // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
    257219                                              // LG_ZEROINTRADEPTHRESI_A0087
    258 #if H_3D_DIM_SDC
    259 #define LGE_SDC_REMOVE_DC_E0158           1   // Removal of DC mode from SDC
    260 #endif
    261 #if H_3D_DIM_DMM
    262 #define LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX 1   // Removal of overlap between DMM3 and DMM1
    263 #endif
    264 #endif
    265 
     220#endif
    266221///// ***** VIEW SYNTHESIS PREDICTION *********
    267222#if H_3D_VSP
     
    273228#endif
    274229
     230#endif
     231
     232///// ***** ILLUMATION COMPENSATION *********
     233#if H_3D_IC
     234#define IC_REG_COST_SHIFT                 7
     235#define IC_CONST_SHIFT                    5
     236#define IC_SHIFT_DIFF                     12
     237#endif
     238
     239///// ***** FCO *********
     240#if H_3D_FCO
     241#define H_3D_FCO_VSP_DONBDV_E0163               1   // Adaptive depth reference for flexible coding order
     242#else
     243#define H_3D_FCO_VSP_DONBDV_E0163               0   // Adaptive depth reference for flexible coding order
    275244#endif
    276245
     
    300269#define TICKET_1090_FIX                             1
    301270
     271#if KWU_FIX_URQ
     272#if RATE_CONTROL_LAMBDA_DOMAIN
    302273#define RC_FIX                                      1  /// suggested fix for M0036
    303274#define RATE_CONTROL_INTRA                          1  ///< JCTVC-M0257, rate control for intra
     275#endif
     276#else
     277#define RC_FIX                                      1  /// suggested fix for M0036
     278#define RATE_CONTROL_INTRA                          1  ///< JCTVC-M0257, rate control for intra
     279#endif
     280
    304281
    305282#define MAX_CPB_CNT                     32  ///< Upper bound of (cpb_cnt_minus1 + 1)
     
    484461
    485462#if H_3D_VSO_DIST_INT
    486 #if H_3D_FIX_TICKET_036
    487463typedef       Int64            Dist;       ///< RDO distortion
    488 #else
    489 typedef       Int              Dist;       ///< RDO distortion
    490 #endif
    491464typedef       Int64            Dist64;
    492465#define       RDO_DIST_MIN     MIN_INT
     
    793766  enum ScalabilityType
    794767  {
    795 #if H_MV5
    796768#if H_3D
    797769    DEPTH_ID = 0,   
    798770#endif   
    799771    VIEW_ORDER_INDEX  = 1,
    800 #else
    801     VIEW_ID  = 0,
    802 #if H_3D
    803     DEPTH_ID = 1,   
    804 #endif   
    805 #endif
    806772  };
    807773#endif
Note: See TracChangeset for help on using the changeset viewer.