Changeset 828 in 3DVCSoftware


Ignore:
Timestamp:
5 Feb 2014, 20:31:56 (10 years ago)
Author:
tech
Message:

Sorted macros in TypeDef.h.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r827 r828  
    7878                                              // HHI_QTLPC_RAU_OFF_C0160     // JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units
    7979
    80 #ifdef H_3D_QTLPC
    81 #define MTK_TEX_DEP_PAR_G0055             1   // Texture-partition-dependent depth partition. JCT3V-G0055
    82 #endif
    8380#define H_3D_VSO                          1   // VSO, View synthesis optimization, includes:
    8481                                              // HHI_VSO
    … …  
    105102                                              // SHARP_ARP_REF_CHECK_F0105        ARP reference picture selection and DPB check
    106103                                              // LGE_ARP_CTX_F0161                JCT3V-F0161
    107 #define MTK_ARP_REF_SELECTION_G0053       1   // ARP Reference picture selection in JCT3V-G0053
    108 #define MTK_ARP_FLAG_CABAC_SIMP_G0061     1   // Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061
    109104#define H_3D_IC                           1   // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060
    110105                                              // Unifying rounding offset, for IC part, JCT3V-D0135
    … …  
    114109                                              // LGE_IC_CTX_F0160 //JCT3V-F0160
    115110                                              // SEC_ONLY_TEXTURE_IC_F0151
    116 #define MTK_IC_FLAG_CABAC_SIMP_G0061      1   // Use only 1 context for IC flag in JCT3V-G0061
    117111
    118112#if H_3D_NBDV
    … …  
    123117                                              // NBDV_DEFAULT_VIEWIDX_BUGFIX Bug fix for invalid default view index for NBDV
    124118                                              // NTT_DoNBDV_VECTOR_CLIP_E0141 disparity vector clipping in DoNBDV, JCT3V-E0141 and JCT3V-E0209
    125 #define MTK_NBDV_IVREF_FIX_G0067          1   // Disable IvMC, VSP when IVREF is not available, JCT3V-G0067
    126119#endif
    127120
    … …  
    186179#define H_3D_FCO                          0   // Flexible coding order for 3D
    187180
    188 #define H_3D_DBBP                         1   // DBBP: Depth-based Block Partitioning and Merging
    189 
    190 
    191181
    192182
    … …  
    214204/////////////////////////////////////////////////////////////////////////////////////////
    215205
    216 #define SEC_SPIVMP_MCP_SIZE_G0077         1  // Apply SPIVMP only to 2Nx2N partition, JCT3V-G0077
    217 #define SEC_DEPTH_DV_DERIVAITON_G0074     1  // Simplification of DV derivation for depth, JCT3V-G0074
    218 
    219206///// ***** VIEW SYNTHESIS OPTIMIZAION *********
    220207#if H_3D_VSO                                 
    … …  
    227214#endif
    228215
    229 #define SCU_HS_VSD_BUGFIX_IMPROV_G0163    1
    230216////   ****** NEIGHBOURING BLOCK-BASED DISPARITY VECTOR  *********
    231217#if H_3D_NBDV
    … …  
    239225#define H_3D_ARP_WFNR                     3
    240226#endif
    241 #define KHU_SIMP_SPIVMP_G0147             1  // Simplification on Sub-PU level temporal interview motion prediction
    242 
    243 #if H_3D_SPIVMP
    244 #define QC_SPIVMP_MPI_G0119               1 // Sub-PU level MPI merge candidate
    245 #endif
    246 #define QC_DEPTH_MERGE_SIMP_G0127         1 // Remove DV candidate and shifting candidate for depth coding
    247 
    248 #define SEC_IC_ARP_SIG_G0072              1   // Disabling IC when ARP is enabled, option 1 in JCT3V-G0072, part 2 in JCT3V-G0121
    249227
    250228///// ***** DEPTH INTRA MODES *********
    … …  
    254232#define H_3D_DIM_DLT                      1   // Depth Lookup Table
    255233
    256 #define SCU_HS_DEPTH_DC_PRED_G0143        1
    257234#if H_3D_DIM_DLT
    258235#define H_3D_DELTA_DLT                    1
    259236#endif
    260 #define QC_GENERIC_SDC_G0122              1  // Generalize SDC to all depth intra modes
    261 #if H_3D_DIM_SDC && H_3D_INTER_SDC
    262 #define QC_SDC_UNIFY_G0130                1  // Unify intra SDC and inter SDC
    263 #define QC_SDC_UNIFY_G0130_FIX            1  // Fix bug of G0130
    264 #endif
    265 #define SEC_INTER_SDC_G0101               1  // Improved inter SDC with multiple DC candidates
    266237#define H_3D_DIM_ENC                      1   // Depth Intra encoder optimizations, includes:
    267238                                              // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
    268239                                              // LG_ZEROINTRADEPTHRESI_A0087
    269 #endif
    270 #define QC_PKU_SDC_SPLIT_G0123            1   // Intra SDC Split
    271 #if QC_PKU_SDC_SPLIT_G0123
    272 #define HS_TSINGHUA_SDC_SPLIT_G0111       1
    273240#endif
    274241///// ***** VIEW SYNTHESIS PREDICTION *********
    … …  
    280247#define H_3D_VSP_CONSTRAINED              0
    281248#endif
    282 #define MTK_RBIP_VSP_G0069                1   // Restricted bi-prediction for VSP
    283 #define NTT_STORE_SPDV_VSP_G0148          1   // Storing Sub-PU based DV for VSP
    284 #endif
    285 
    286 #define MTK_DDD_G0063                     1   // Disparity derived depth coding
     249#endif
     250
    287251
    288252///// ***** ILLUMATION COMPENSATION *********
    … …  
    293257#endif
    294258
    295 ///// ***** DEPTH-BASED BLOCK PARTITIONING *********
     259
     260///// ***** FCO *********
     261#if H_3D_FCO
     262#define H_3D_FCO_VSP_DONBDV_E0163               1   // Adaptive depth reference for flexible coding order
     263#else
     264#define H_3D_FCO_VSP_DONBDV_E0163               0   // Adaptive depth reference for flexible coding order
     265#endif
     266
     267#if H_3D
     268#define PPS_FIX_DEPTH                           1
     269#endif
     270
     271
     272/////////////////////////////////////////////////////////////////////////////////////////
     273///////////////////////////////////   HTM-10.0 Integrations //////////////////////////////
     274/////////////////////////////////////////////////////////////////////////////////////////
     275#if H_3D
     276#if  H_3D_QTLPC
     277#define MTK_TEX_DEP_PAR_G0055             1   // Texture-partition-dependent depth partition. JCT3V-G0055
     278#endif
     279
     280#define MTK_DDD_G0063                     1   // Disparity derived depth coding
     281
     282#if H_3D_VSP
     283#define MTK_RBIP_VSP_G0069                1   // Restricted bi-prediction for VSP
     284#define NTT_STORE_SPDV_VSP_G0148          1   // Storing Sub-PU based DV for VSP
     285#endif
     286
     287#define H_3D_DBBP                         1   // DBBP: Depth-based Block Partitioning and Merging
     288
    296289#if H_3D_DBBP
    297290#define DBBP_INVALID_SHORT                (-4)
    … …  
    299292#endif
    300293
    301 ///// ***** FCO *********
    302 #if H_3D_FCO
    303 #define H_3D_FCO_VSP_DONBDV_E0163               1   // Adaptive depth reference for flexible coding order
    304 #else
    305 #define H_3D_FCO_VSP_DONBDV_E0163               0   // Adaptive depth reference for flexible coding order
    306 #endif
    307 
    308 #if H_3D
    309 #define PPS_FIX_DEPTH                           1
    310 #endif
    311 
    312 
    313 /////////////////////////////////////////////////////////////////////////////////////////
    314 ///////////////////////////////////   HTM-10.0 Integrations //////////////////////////////
    315 /////////////////////////////////////////////////////////////////////////////////////////
    316 
    317 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    318 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    319 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    320 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    321 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    322 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    323 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    324 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    325 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    326 // !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    327 
     294#if H_3D_DIM
     295#define QC_PKU_SDC_SPLIT_G0123            1   // Intra SDC Split
     296#if QC_PKU_SDC_SPLIT_G0123
     297#define HS_TSINGHUA_SDC_SPLIT_G0111       1
     298#endif
     299#define SCU_HS_DEPTH_DC_PRED_G0143        1
     300#define QC_GENERIC_SDC_G0122              1  // Generalize SDC to all depth intra modes
     301#if H_3D_DIM_SDC && H_3D_INTER_SDC
     302#define QC_SDC_UNIFY_G0130                1  // Unify intra SDC and inter SDC
     303#define QC_SDC_UNIFY_G0130_FIX            1  // Fix bug of G0130
     304#endif
     305#define SEC_INTER_SDC_G0101               1  // Improved inter SDC with multiple DC candidates
     306#endif
     307
     308#define KHU_SIMP_SPIVMP_G0147             1  // Simplification on Sub-PU level temporal interview motion prediction
     309
     310#if H_3D_SPIVMP
     311#define QC_SPIVMP_MPI_G0119               1 // Sub-PU level MPI merge candidate
     312#endif
     313
     314#define QC_DEPTH_MERGE_SIMP_G0127         1 // Remove DV candidate and shifting candidate for depth coding
     315#define SEC_IC_ARP_SIG_G0072              1   // Disabling IC when ARP is enabled, option 1 in JCT3V-G0072, part 2 in JCT3V-G0121
     316#define SCU_HS_VSD_BUGFIX_IMPROV_G0163    1
     317#define SEC_SPIVMP_MCP_SIZE_G0077         1  // Apply SPIVMP only to 2Nx2N partition, JCT3V-G0077
     318#define SEC_DEPTH_DV_DERIVAITON_G0074     1  // Simplification of DV derivation for depth, JCT3V-G0074
     319#define MTK_ARP_REF_SELECTION_G0053       1   // ARP Reference picture selection in JCT3V-G0053
     320#define MTK_ARP_FLAG_CABAC_SIMP_G0061     1   // Use 2 context for ARP flag referring to only left neighbor block in JCT3V-G0061
     321#define MTK_IC_FLAG_CABAC_SIMP_G0061      1   // Use only 1 context for IC flag in JCT3V-G0061
     322#define MTK_NBDV_IVREF_FIX_G0067          1   // Disable IvMC, VSP when IVREF is not available, JCT3V-G0067
     323#endif
    328324/////////////////////////////////////////////////////////////////////////////////////////
    329325///////////////////////////////////   HM RELATED DEFINES ////////////////////////////////
Note: See TracChangeset for help on using the changeset viewer.