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


Ignore:
Timestamp:
11 Sep 2013, 14:40:25 (11 years ago)
Author:
tech
Message:

Merged 8.0-dev0@621 (MV-HEVC 5 HLS).

File:
1 edited

Legend:

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

    r608 r622  
    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
    9495#define H_3D_ARP                          1   // Advanced residual prediction (ARP), JCT3V-D0177
    9596#define H_3D_IC                           1   // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060
     
    110111                                              // QC_D0191: Clean up
    111112                                              // LG_D0092: Multiple VSP candidate allowed
    112 
     113                                              // MTK_VSP_FIX_ALIGN_WD_E0172
    113114#define H_3D_IV_MERGE                     1   // Inter-view motion merge candidate
    114115                                              // HHI_INTER_VIEW_MOTION_PRED
     
    119120                                              // QC_AMVP_MRG_UNIFY_IVCAN_C0051     
    120121                                              // TEXTURE MERGING CANDIDATE     , JCT3V-C0137
     122                                              // QC_INRIA_MTK_MRG_E0126           
    121123#define H_3D_TMVP                         1   // QC_TMVP_C0047
    122124                                              // Sony_M23639
     
    161163#define MTK_DIVMC_FIX_E0172               1 // fix the issue of derivation of disparity inter-view merge candidate, issue 5 in JCT3V-E0172
    162164#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
    169165#endif // MTK_RVS_BUGFIX_E0172
    170166
     
    175171#endif // H_3D_NBDV
    176172
    177 #if H_3D_IV_MERGE
    178 #define QC_INRIA_MTK_MRG_E0126            1   // additional merge candidates JCT3V-E0126
    179 #endif
    180 
    181173#if H_3D_DIM
    182 #define SEC_DMM2_E0146                    1   // Removal of DMM2 from DMMs
     174#define SEC_DMM2_E0146_HHIFIX             1   // Removal of DMM2 from DMMs
    183175#define ZJU_DEPTH_INTRA_MODE_E0204        1   // Simplified Binarization for depth_intra_mode
    184176#define KWU_SDC_SIMPLE_DC_E0117           1   // Simplified DC calculation for SDC
    185177#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
     178#define SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX     1   // Fast DMM and RBC Mode Selection
    187179#endif
    188180
     
    215207
    216208
    217 
    218 
     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
    219214/////////////////////////////////////////////////////////////////////////////////////////
    220215///////////////////////////////////   DERIVED DEFINES /////////////////////////////////// 
     
    265260#endif
    266261#if H_3D_DIM_DMM
    267 #define LGE_PKU_DMM3_OVERLAP_E0159        1   // Removal of overlap between DMM3 and DMM1
     262#define LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX 1   // Removal of overlap between DMM3 and DMM1
    268263#endif
    269264#endif
     
    271266///// ***** VIEW SYNTHESIS PREDICTION *********
    272267#if H_3D_VSP
    273 #define H_3D_VSP_POSITION                 3   // The only supported position
    274268#define H_3D_VSP_BLOCKSIZE                4   // Supported values: 1, 2, and 4
    275269#if H_3D_VSP_BLOCKSIZE == 1
     
    799793  enum ScalabilityType
    800794  {
     795#if H_MV5
     796#if H_3D
     797    DEPTH_ID = 0,   
     798#endif   
     799    VIEW_ORDER_INDEX  = 1,
     800#else
    801801    VIEW_ID  = 0,
    802802#if H_3D
    803803    DEPTH_ID = 1,   
    804804#endif   
     805#endif
    805806  };
    806807#endif
Note: See TracChangeset for help on using the changeset viewer.