Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComWedgelet.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/TComWedgelet.h

    r622 r655  
    5050enum DIM_IDX
    5151{
    52 #if SEC_DMM2_E0146_HHIFIX
    5352  DMM1_IDX = 0,
    5453  DMM3_IDX = 1,
    5554  DMM4_IDX = 2,
    5655  RBC_IDX  = 3
    57 #else
    58   DMM1_IDX = 0,
    59   DMM2_IDX = 3,
    60   DMM3_IDX = 1,
    61   DMM4_IDX = 2,
    62   RBC_IDX  = 4
    63 #endif
    6456};
    65 #if SEC_DMM2_E0146_HHIFIX
     57
    6658#define DMM_NUM_TYPE   3
    67 #else
    68 #define DMM_NUM_TYPE   4
    69 #endif
    7059#define RBC_NUM_TYPE   1
    7160#define DIM_NUM_TYPE   (DMM_NUM_TYPE+RBC_NUM_TYPE)
     
    8675#define DMM_NO_WEDGEINDEX       MAX_UINT
    8776#define DMM_NUM_WEDGE_REFINES   8
    88 #if !SEC_DMM2_E0146_HHIFIX
    89 #define DMM2_DELTAEND_MAX       4
    90 #endif
    9177#define DMM3_SIMPLIFY_TR        1
    9278
     
    151137  Bool  checkInvIdentical( Bool* pbRefPattern );
    152138
    153 #if !SEC_DMM2_E0146_HHIFIX
    154   // functions for DMM2 prediction
    155   Bool  checkPredDirAbovePossible( UInt uiPredDirBlockSize, UInt uiPredDirBlockOffsett );
    156   Bool  checkPredDirLeftPossible ( UInt uiPredDirBlockSize, UInt uiPredDirBlockOffsett );
    157   Void  getPredDirStartEndAbove( UChar& ruhXs, UChar& ruhYs, UChar& ruhXe, UChar& ruhYe, UInt uiPredDirBlockSize, UInt uiPredDirBlockOffset, Int iDeltaEnd );
    158   Void  getPredDirStartEndLeft ( UChar& ruhXs, UChar& ruhYs, UChar& ruhXe, UChar& ruhYe, UInt uiPredDirBlockSize, UInt uiPredDirBlockOffset, Int iDeltaEnd );
    159 #endif
    160139};  // END CLASS DEFINITION TComWedgelet
    161140
Note: See TracChangeset for help on using the changeset viewer.