Changeset 293 in 3DVCSoftware for branches/HTM-5.1-dev0/source


Ignore:
Timestamp:
19 Feb 2013, 19:59:43 (11 years ago)
Author:
tech
Message:

Renamed macros related to IVMP and created list of 6.1 macros to be removed.

Location:
branches/HTM-5.1-dev0/source/Lib/TLibCommon
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r292 r293  
    40944094    }   
    40954095  }
    4096 #endif // HHI_INTER_VIEW_MOTION_PRED
     4096#endif //  H3D_IVMP
    40974097
    40984098#if MERL_VSP_COMPENSATION_C0152
     
    41674167        bLeftAvai = true;
    41684168        iPosLeftAbove[0] = iCount;
    4169 #endif  //HHI_INTER_VIEW_MOTION_PRED
     4169#endif  // H3D_IVMP
    41704170#if H3D_NBDV
    41714171        pcMvFieldNeighbours[iCount<<1    ].getMv().m_bDvMcp = false;
     
    42214221    iCount ++;
    42224222  }
    4223 #endif // HHI_INTER_VIEW_MOTION_PRED
     4223#endif //  H3D_IVMP
    42244224
    42254225#if MERL_VSP_COMPENSATION_C0152
     
    42994299    {
    43004300      iPosLeftAbove[1] = iCount;
    4301 #endif // HHI_INTER_VIEW_MOTION_PRED
     4301#endif //  H3D_IVMP
    43024302#if H3D_NBDV
    43034303    pcMvFieldNeighbours[iCount<<1    ].getMv().m_bDvMcp = false;
     
    43554355    iCount ++;
    43564356  }
    4357 #endif // HHI_INTER_VIEW_MOTION_PRED
     4357#endif //  H3D_IVMP
    43584358
    43594359#if MERL_VSP_COMPENSATION_C0152
     
    45034503    }   
    45044504  }
    4505 #endif //HHI_INTER_VIEW_MOTION_PRED
     4505#endif // H3D_IVMP
    45064506
    45074507#if MERL_VSP_COMPENSATION_C0152
     
    46194619    iCount ++;
    46204620  }
    4621 #endif // HHI_INTER_VIEW_MOTION_PRED
     4621#endif //  H3D_IVMP
    46224622
    46234623#if MERL_VSP_COMPENSATION_C0152
     
    67166716
    67176717Void TComDataCU::fillMvpCandBase( UInt uiPartIdx, UInt uiPartAddr, RefPicList eRefPicList, Int iRefIdx, AMVPInfo* pInfo )
    6718 #else // HHI_INTER_VIEW_MOTION_PRED
     6718#else //  H3D_IVMP
    67196719Void TComDataCU::fillMvpCand ( UInt uiPartIdx, UInt uiPartAddr, RefPicList eRefPicList, Int iRefIdx, AMVPInfo* pInfo )
    6720 #endif // HHI_INTER_VIEW_MOTION_PRED
     6720#endif //  H3D_IVMP
    67216721{
    67226722  PartSize eCUMode = getPartitionSize( 0 );
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComDataCU.h

    r292 r293  
    594594#endif
    595595  Bool          getIViewOrgDepthMvPred( UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, TComMv& rcMv );
    596 #endif // HHI_INTER_VIEW_MOTION_PRED
     596#endif //  H3D_IVMP
    597597#if HHI_INTER_VIEW_RESIDUAL_PRED
    598598  Bool*         getResPredAvail         ()                        { return m_pbResPredAvailable;        }
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComDepthMapGenerator.cpp

    r292 r293  
    11521152  return        true;
    11531153}
    1154 #endif // HHI_INTER_VIEW_MOTION_PRED
     1154#endif //  H3D_IVMP
    11551155
    11561156
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPic.h

    r292 r293  
    8080  TComPicYuv*           m_pcOrgDepthMap;          //  original depth map
    8181#if H3D_NBDV
    82   Bool          m_checked;
     82  Bool        m_checked;
    8383  UInt        m_uiRapRefIdx;
    8484  RefPicList  m_eRapRefList;
  • branches/HTM-5.1-dev0/source/Lib/TLibCommon/TypeDef.h

    r292 r293  
    6464#define LGE_DMM3_SIMP_C0044               1
    6565#endif
    66 #define FIX_DMM_CTX_INIT_C0034            1    // JCT3V-C0034 fix for wrong init type of DMM contexts (UChar instead of Short)
     66#define FIX_DMM_CTX_INIT_C0034            1   // JCT3V-C0034 fix for wrong init type of DMM contexts (UChar instead of Short)
    6767
    6868///// ***** SDC *********
     
    7171#define SAIT_SDC_C0096                    1   // JCT3V-C0096: Improved Simple Depth Coding(removal of DMM2 among four SDC modes(DC, Planar, DMM1 and DMM2))
    7272#endif
    73 #define FIX_SDC_ENC_C0143                 1    // JCT3V-C0143 fix for unnecessary encoder checks in case of SDC
     73#define FIX_SDC_ENC_C0143                 1   // JCT3V-C0143 fix for unnecessary encoder checks in case of SDC
    7474
    7575///// ***** TMVP/AMVP *********
    76 #define TMVP_DEPTH_SWITCH                 1 // JCT3V-B0092 additional encoder option only
    77 #define QC_TMVP_MRG_REFIDX_C0047          1 // only enabled when QC_TMVP_IDX_MOD_B0046 is enabled.
    78 #define INTER_VIEW_VECTOR_SCALING_C0115   1 // JCT3V-C0115 Inter-view vector scaling for TMVP & flag
    79 #define INTER_VIEW_VECTOR_SCALING_C0116   1 // JCT3V-C0116 Inter-view vector scaling for AMVP
     76#define TMVP_DEPTH_SWITCH                 1   // JCT3V-B0092 additional encoder option only
     77#define QC_TMVP_MRG_REFIDX_C0047          1   // only enabled when QC_TMVP_IDX_MOD_B0046 is enabled.
     78#define INTER_VIEW_VECTOR_SCALING_C0115   1   // JCT3V-C0115 Inter-view vector scaling for TMVP & flag
     79#define INTER_VIEW_VECTOR_SCALING_C0116   1   // JCT3V-C0116 Inter-view vector scaling for AMVP
    8080
    8181///// ***** INTERVIEW MOTION PARAMETER PREDICTION *********
    82 #define H3D_IVMP                          1   // inter-view motion parameter prediction
    83                                               // HHI_INTER_VIEW_MOTION_PRED
     82#define H3D_IVMP                          1   // Inter-view motion parameter prediction
     83                                              // HHI_INTER_VIEW_MOTION_PRED 
    8484                                              // SAIT_IMPROV_MOTION_PRED_M24829, improved inter-view motion vector prediction
    8585                                              // SHARP_INTERVIEW_DECOUPLE_B0111, decoupling inter-view candidate
     
    256256
    257257///// ***** HM 6.1 *********
     258
     259// REMOVED HM 6.1 Macros
    258260#define SKIPFRAME_BUGFIX                  1 ///< bug fix to enable skipFrame at decoder
    259261#define START_DECODING_AT_CRA             1 ///< H0496, start decoding at clear random access point
    260262#define NO_COMBINED_PARALLEL              1 ///< Disallow any combined usage of parallel tools among Tile, EntropySlice and Wavefont
     263#define PARALLEL_MERGE                    1 ///< H0082 parallel merge/skip
     264#define MVP_AT_ENTROPYSLICE_BOUNDARY      1  //< H0362 enable motion prediction accross entropy slice boundary
     265#define FAST_DECISION_FOR_MRG_RD_COST     1  ////< H0178: Fast Decision for Merge 2Nx2N RDCost
     266#define PIC_CROPPING                      1  ///< Picture cropping and size constraints
     267#define NAL_REF_FLAG                      1  ///< Change nal_ref_idc to nal_ref_flag (JCTVC-F463)
     268#define REMOVE_DIV_OPERATION      1  ///< H0238: Simplified intra horizontal and vertical filtering
     269#define LOGI_INTRA_NAME_3MPM      1  ///< H0407: logical Intra mode naming (sequential angular mode numbering) and 3 MPM mode coding
     270#define LEVEL_CTX_LUMA_RED        1  ///<H0130: Luma level context reduction
     271#define REMOVE_INFER_SIGGRP       1  ///<H0131: Remove inferred significant_coeff_group_flag
     272#define SET_MERGE_TMVP_REFIDX     1  ///< H0278/H0199: Setting the merge TMVP refidx to 0 for the non-first partition
     273#define MULTILEVEL_SIGMAP_EXT     1  ///< H0526: multi-level significance map extended to smaller TUs
     274#define MULTIBITS_DATA_HIDING     1  ///< H0481: multiple sign bit hiding
     275#define DEQUANT_CLIPPING          1  ///< H0312/H0541: transformed coefficients clipping before de-quantization
     276#define REMOVE_NON_SCALED         1 ///< H0164/H0250: Removal of non-scaled merge candidate
     277#define MRG_IDX_CTX_RED           1 ///< H0251: Merge index context reduction
     278#define SIMP_MRG_PRUN             1 ///< H0252: simplification of merge pruning process
     279#define AMVP_PRUNING_SIMPLIFICATION         1     ///H0316: simplify the pruning process of AMVP by exempting the temporal candidate
     280#define AMVP_ZERO_CHECKING_REMOVAL          1     ///H0239/H0316: remove zero motion vector checking of AMVP
     281#define H0111_MVD_L1_ZERO         1  ///< H0111: modification of bi-prediction
     282#define CLIPSCALEDMVP               1  ///< H0216: Clipping scaled MV to 16 bit
     283#define UNIFIED_TRANSFORM_TREE      1   ///< H0123: unified tree structure for TU
     284#define SIGMAP_CTX_SUBBLOCK       1 ///< H0290: 4x4 sub-block based region for significant_flag context selection
     285#define LAST_CTX_REDUCTION        1  ///< H0537/H514: contexts reduction for last position coding
     286#define AMP_CTX                   1 ///<H0545: context reduction for asymmetric partition
     287#define RESTRICT_GR1GR2FLAG_NUMBER    1 ///< H0554: Throughput improvement of CABAC coefficients level coding
     288#define EIGHT_BITS_RICE_CODE        1 ///< H0498 : 8 bits rice codes
     289#define SAO_UNIT_INTERLEAVING      1   ///< H0273
     290#define ALF_SINGLE_FILTER_SHAPE    1     //< !!! H0068: Single filter type : 9x7 cross + 3x3 square
     291#define ALF_16_BA_GROUPS        1     ///< H0409 16 BA groups
     292#define LCU_SYNTAX_ALF          1     ///< H0274 LCU-syntax ALF
     293#define ALF_CHROMA_COEF_PRED_HARMONIZATION 1 ///< H0483: ALF chroma coeff pred harmonization
     294#define CABAC_LINEAR_INIT       1     ///< H0535 : linear CABAC initialization
     295#define UNIFIED_TRANSFORM       1     ///< H0492: unify square and non-square transform
     296#define G519_TU_AMP_NSQT_HARMONIZATION  1   ///< G519: Harmonization of implicit TU, AMP and NSQT
     297#define CHROMA_MODE_CODING                   1     //H0326/H0475 : 2-length fixed, bypass coding for chroma intra prediction mode
     298#define NSQT_LFFIX                           1     ///< Bug fix related to NSQT and deblocking filter
     299#define H0736_AVC_STYLE_QP_RANGE             1    ///< H0736: AVC style qp range and wrapping.
     300#define H0204_QP_PREDICTION                  1    ///< H0204: improved QP prediction
     301#define BURST_IPCM                        1           ///< H0051: Burst IPCM
     302#define H0137_0138_LIST_MODIFICATION      1           // Enabled reference picture lists combination (H0137) and reference picture list modification (H0138) updates
     303#define LTRP_MULT                       1           ///< enable/disable multiple long term reference pictures with same POC LSB
     304#define OL_FLUSH 1          // Set to 1 to enable Wavefront Flush.
     305#define FIXED_NUMBER_OF_TILES_SLICE_MODE                1
     306#define SCALING_LIST                  1 //JCTVC-H0230/H0461/H0237
     307#define DEFAULT_DC                    1 // JCTVC-H0242
     308#define RPS_IN_SPS                    1 // Adopted during discussion of JCTVC-H0423
     309#define H0412_REF_PIC_LIST_RESTRICTION 1
     310#define H0566_TLA                     1
     311#define H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER 1
     312#define DBL_H0473_PART_1          1   //Deblocking filtering simplification
     313#define DBL_CONTROL               1   //PPS deblocking_filter_control_present_flag (JCTVC-H0398); condition for inherit params flag in SH (JCTVC-H0424)
     314#define DBL_STRONG_FILTER_CLIP    1   //Introduction of strong filter clipping in deblocking filter (JCTVC-H0275)
     315#define H0388                       1 // JCTVC-H0388
     316#define TILES_WPP_ENTRY_POINT_SIGNALLING        1 // JCTVC-H0556. Assumes either Tiles is ON or WPP is ON (not both simultaneously).
     317#define REMOVE_TILE_DEPENDENCE                  1 // remove tile_boundary_independence_flag and dependent tiles
     318#define TILES_OR_ENTROPY_SYNC_IDC               1 // tiles_or_entropy_coding_sync_idc flag
     319#define COMPLETE_SLICES_IN_TILE     1 // Among the constraints between slices and tiles, all slices within a tile shall be complete (JCTVC-H0348/JCTVC-H0463) for SliceMode 1&2
     320#define WPP_SIMPLIFICATION          1 // JCTVC-H0349/JCTVC-0517
     321
     322
    261323
    262324#define LOSSLESS_CODING                   1 ///< H0530: lossless and lossy (mixed) coding
     
    265327#endif
    266328
    267 #define PARALLEL_MERGE  1                   //< H0082 parallel merge/skip
    268329#define LOG2_PARALLEL_MERGE_LEVEL_MINUS2  0 //< H0082 parallel merge level 0-> 4x4, 1-> 8x8, 2->16x16, 3->32x32, 4->64x64
    269330
     
    273334#endif
    274335
    275 #define MVP_AT_ENTROPYSLICE_BOUNDARY      1  //< H0362 enable motion prediction accross entropy slice boundary
    276 
    277 #define FAST_DECISION_FOR_MRG_RD_COST     1  ////< H0178: Fast Decision for Merge 2Nx2N RDCost
    278 
    279 #define PIC_CROPPING              1  ///< Picture cropping and size constraints
    280 #define NAL_REF_FLAG              1  ///< Change nal_ref_idc to nal_ref_flag (JCTVC-F463)
    281 #define REMOVE_DIV_OPERATION      1  ///< H0238: Simplified intra horizontal and vertical filtering
    282 #define LOGI_INTRA_NAME_3MPM      1  ///< H0407: logical Intra mode naming (sequential angular mode numbering) and 3 MPM mode coding
    283 
    284 #define LEVEL_CTX_LUMA_RED        1  ///<H0130: Luma level context reduction
    285 #define REMOVE_INFER_SIGGRP       1  ///<H0131: Remove inferred significant_coeff_group_flag
    286 
    287 #define SET_MERGE_TMVP_REFIDX     1  ///< H0278/H0199: Setting the merge TMVP refidx to 0 for the non-first partition
    288 
    289 #define MULTILEVEL_SIGMAP_EXT     1  ///< H0526: multi-level significance map extended to smaller TUs
    290 #define MULTIBITS_DATA_HIDING     1  ///< H0481: multiple sign bit hiding
    291 
    292 #define DEQUANT_CLIPPING          1  ///< H0312/H0541: transformed coefficients clipping before de-quantization
    293 
    294 #define REMOVE_NON_SCALED         1 ///< H0164/H0250: Removal of non-scaled merge candidate
    295 #define MRG_IDX_CTX_RED           1 ///< H0251: Merge index context reduction
    296 #define SIMP_MRG_PRUN             1 ///< H0252: simplification of merge pruning process
    297 
    298 #define AMVP_PRUNING_SIMPLIFICATION         1     ///H0316: simplify the pruning process of AMVP by exempting the temporal candidate
    299 #define AMVP_ZERO_CHECKING_REMOVAL          1     ///H0239/H0316: remove zero motion vector checking of AMVP
    300 
    301 #define H0111_MVD_L1_ZERO         1  ///< H0111: modification of bi-prediction
    302336#define DISABLING_CLIP_FOR_BIPREDME         1  ///< Ticket #175
    303 
    304 #define CLIPSCALEDMVP               1  ///< H0216: Clipping scaled MV to 16 bit
    305 
    306 #define UNIFIED_TRANSFORM_TREE      1   ///< H0123: unified tree structure for TU
    307 
    308 #define SIGMAP_CTX_SUBBLOCK       1 ///< H0290: 4x4 sub-block based region for significant_flag context selection
    309 
    310337#define SIGMAP_CONST_AT_HIGH_FREQUENCY      1      ///< H0095 method2.1: const significance map at high freaquency
    311338
    312 #define LAST_CTX_REDUCTION        1  ///< H0537/H514: contexts reduction for last position coding
    313 
    314 #define AMP_CTX                   1 ///<H0545: context reduction for asymmetric partition
    315 
    316 #define RESTRICT_GR1GR2FLAG_NUMBER    1 ///< H0554: Throughput improvement of CABAC coefficients level coding
    317339#if RESTRICT_GR1GR2FLAG_NUMBER    //
    318340#define C1FLAG_NUMBER               8 // maximum number of largerThan1 flag coded in one chunk :  16 in HM5
     
    320342#endif
    321343
    322 #define EIGHT_BITS_RICE_CODE        1 ///< H0498 : 8 bits rice codes
    323 
    324 #define SAO_UNIT_INTERLEAVING      1   ///< H0273
    325344#define REMOVE_SAO_LCU_ENC_CONSTRAINTS_1 0  ///< disable the encoder constraint that does not test SAO/BO mode for chroma in interleaved mode
    326345#define REMOVE_SAO_LCU_ENC_CONSTRAINTS_2 0  ///< disable the encoder constraint that reduce the range of SAO/EO for chroma in interleaved mode
    327346#define REMOVE_SAO_LCU_ENC_CONSTRAINTS_3 0  ///< disable the encoder constraint that conditionally disable SAO for chroma for entire slice in interleaved mode
    328 
    329 #define ALF_SINGLE_FILTER_SHAPE    1     //< !!! H0068: Single filter type : 9x7 cross + 3x3 square
    330 
    331 #define ALF_16_BA_GROUPS        1     ///< H0409 16 BA groups
    332 #define LCU_SYNTAX_ALF          1     ///< H0274 LCU-syntax ALF
    333 #define ALF_CHROMA_COEF_PRED_HARMONIZATION 1 ///< H0483: ALF chroma coeff pred harmonization
    334 
    335 #define CABAC_LINEAR_INIT       1     ///< H0535 : linear CABAC initialization
    336 
    337 #define COLLOCATED_REF_IDX      1     ///< H0442: signal collocated reference index
    338 
    339 #define UNIFIED_TRANSFORM       1     ///< H0492: unify square and non-square transform
     347#define COLLOCATED_REF_IDX      1           ///< H0442: signal collocated reference index
     348
    340349
    341350#define MAX_NUM_SPS                32
     
    354363#define FAST_BIT_EST                1   ///< G763: Table-based bit estimation for CABAC
    355364
    356 #define G519_TU_AMP_NSQT_HARMONIZATION  1   ///< G519: Harmonization of implicit TU, AMP and NSQT
    357365
    358366#define MLS_GRP_NUM                         64     ///< G644 : Max number of coefficient groups, max(16, 64)
     
    366374
    367375
    368 #define CHROMA_MODE_CODING                   1     //H0326/H0475 : 2-length fixed, bypass coding for chroma intra prediction mode
    369 
    370 #define NSQT_LFFIX                           1     ///< Bug fix related to NSQT and deblocking filter
    371376#define NS_HAD                               1
    372377
     
    374379#define APS_BITS_FOR_ALF_BYTE_LENGTH 8
    375380
    376 #define H0736_AVC_STYLE_QP_RANGE             1    ///< H0736: AVC style qp range and wrapping.
    377 #define H0204_QP_PREDICTION                  1    ///< H0204: improved QP prediction
     381
    378382
    379383#define HHI_RQT_INTRA_SPEEDUP             1           ///< tests one best mode with full rqt
    380384#define HHI_RQT_INTRA_SPEEDUP_MOD         0           ///< tests two best modes with full rqt
    381385
    382 #define BURST_IPCM                        1           ///< H0051: Burst IPCM
     386
    383387
    384388#if HHI_RQT_INTRA_SPEEDUP_MOD && !HHI_RQT_INTRA_SPEEDUP
     
    386390#endif
    387391
    388 #define H0137_0138_LIST_MODIFICATION      1           // Enabled reference picture lists combination (H0137) and reference picture list modification (H0138) updates
     392
    389393#if !H0137_0138_LIST_MODIFICATION
    390394#error "H0137_0138_LIST_MODIFICATION must be enabled for multi-view coding."
     
    463467                                                    // this should be done with encoder only decision
    464468                                                    // but because of the absence of reference frame management, the related code was hard coded currently
    465 #define LTRP_MULT                       1           ///< enable/disable multiple long term reference pictures with same POC LSB
    466 
    467 #define OL_FLUSH 1          // Set to 1 to enable Wavefront Flush.
    468469#define OL_FLUSH_ALIGN 0    // Align flush to byte boundary.  This preserves byte operations in CABAC (faster) but at the expense of an average
    469470                            // of 4 bits per flush.
     
    491492#define FULL_NBIT 0 ///< When enabled, does not use g_uiBitIncrement anymore to support > 8 bit data
    492493
    493 #define FIXED_NUMBER_OF_TILES_SLICE_MODE                1
     494
    494495#define AD_HOC_SLICES_FIXED_NUMBER_OF_LCU_IN_SLICE      1          ///< OPTION IDENTIFIER. mode==1 -> Limit maximum number of largest coding tree blocks in a slice
    495496#define AD_HOC_SLICES_FIXED_NUMBER_OF_BYTES_IN_SLICE    2          ///< OPTION IDENTIFIER. mode==2 -> Limit maximum number of bins/bits in a slice
     
    520521
    521522#define SCALING_LIST_OUTPUT_RESULT    0 //JCTVC-G880/JCTVC-G1016 quantization matrices
    522 #define SCALING_LIST                  1 //JCTVC-H0230/H0461/H0237
    523 
    524 #define DEFAULT_DC                    1 // JCTVC-H0242
    525 
    526 #define RPS_IN_SPS                    1 // Adopted during discussion of JCTVC-H0423
    527 
    528 #define H0412_REF_PIC_LIST_RESTRICTION 1
    529 
    530 #define H0566_TLA                     1
    531523#if H0566_TLA
    532524#define H0566_TLA_SET_FOR_SWITCHING_POINTS 1
    533525#endif
    534526
    535 #define H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER 1
    536 
    537 #define DBL_H0473_PART_1          1   //Deblocking filtering simplification
    538 #define DBL_CONTROL               1   //PPS deblocking_filter_control_present_flag (JCTVC-H0398); condition for inherit params flag in SH (JCTVC-H0424)
    539 #define DBL_STRONG_FILTER_CLIP    1   //Introduction of strong filter clipping in deblocking filter (JCTVC-H0275)
    540527
    541528#define CABAC_INIT_FLAG             1 // JCTVC-H0540
    542529#define CABAC_INIT_PRESENT_FLAG     1
    543530
    544 #define H0388                       1 // JCTVC-H0388
    545 
    546 #define TILES_WPP_ENTRY_POINT_SIGNALLING        1 // JCTVC-H0556. Assumes either Tiles is ON or WPP is ON (not both simultaneously).
    547 #define REMOVE_TILE_DEPENDENCE                  1 // remove tile_boundary_independence_flag and dependent tiles
    548 #define TILES_OR_ENTROPY_SYNC_IDC               1 // tiles_or_entropy_coding_sync_idc flag
    549 #define COMPLETE_SLICES_IN_TILE     1 // Among the constraints between slices and tiles, all slices within a tile shall be complete (JCTVC-H0348/JCTVC-H0463) for SliceMode 1&2
    550 #define WPP_SIMPLIFICATION          1 // JCTVC-H0349/JCTVC-0517
    551531
    552532// ====================================================================================================================
Note: See TracChangeset for help on using the changeset viewer.