Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecSbac.h


Ignore:
Timestamp:
20 Feb 2013, 22:07:43 (11 years ago)
Author:
tech
Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecSbac.h

    r210 r296  
    7474  Void xCopyFrom           ( TDecSbac* pSrc );
    7575  Void xCopyContextsFrom       ( TDecSbac* pSrc );
    76 #if OL_FLUSH
    7776  Void decodeFlush();
    78 #endif
    7977
    8078#if CABAC_INIT_FLAG
     
    9088  Void  parseVPS                  ( TComVPS* pcVPS )  {}
    9189#endif
    92 #if HHI_MPI
     90#if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068
    9391  Void  parseSPS                  ( TComSPS* pcSPS, Bool bIsDepth ) {}
    9492#else
    9593  Void  parseSPS                  ( TComSPS* pcSPS         ) {}
    9694#endif
    97 #if TILES_OR_ENTROPY_SYNC_IDC 
    9895  Void  parsePPS                  ( TComPPS* pcPPS, ParameterSetManagerDecoder *parameterSet         ) {}
    99 #else
    100   Void  parsePPS                  ( TComPPS* pcPPS         ) {}
    101 #endif
    10296  Void  parseAPS                  ( TComAPS* pAPS          ) {}
    10397  void parseSEI(SEImessages&) {}
    10498
    105 #if LCU_SYNTAX_ALF
     99#if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
     100  Void  parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet, bool isDepth) {}
     101#else
    106102  Void  parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet) {}
    107 #else
    108   Void  parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl ) {}
    109103#endif
    110104
    111105  Void  parseTerminatingBit       ( UInt& ruiBit );
    112 #if HHI_INTER_VIEW_MOTION_PRED
     106#if H3D_IVMP
    113107  Void  parseMVPIdx               ( Int& riMVPIdx, Int iNumAMVPCands );
    114108#else
     
    116110#endif
    117111 
    118 #if SAO_UNIT_INTERLEAVING
    119112  Void  parseSaoUvlc              ( UInt& ruiVal           );
    120113  Void  parseSaoSvlc              ( Int&  riVal            );
     
    125118  Void  parseSaoOneLcuInterleaving(Int rx, Int ry, SAOParam* pSaoParam, TComDataCU* pcCU, Int iCUAddrInSlice, Int iCUAddrUpInSlice, Bool bLFCrossSliceBoundaryFlag);
    126119  Void  parseSaoOffset            (SaoLcuParam* psSaoLcuParam);
    127 #endif
    128120 
    129121#if RWTH_SDC_DLT_B0036
     
    148140#endif
    149141#if HHI_DMM_PRED_TEX
     142#if LGE_DMM3_SIMP_C0044
     143  Void xParseWedgePredTexInfo       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
     144#endif
    150145  Void xParseWedgePredTexDeltaInfo  ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    151146  Void xParseContourPredTexDeltaInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
     
    178173  Void parseMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    179174  Void parseMergeIndex    ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth );
    180 #if HHI_INTER_VIEW_RESIDUAL_PRED
     175#if H3D_IVRP
    181176  Void parseResPredFlag   ( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth );
    182177#endif
     
    221216  ContextModel3DBuffer m_cCUMergeFlagExtSCModel;
    222217  ContextModel3DBuffer m_cCUMergeIdxExtSCModel;
    223 #if HHI_INTER_VIEW_RESIDUAL_PRED
     218#if H3D_IVRP
    224219  ContextModel3DBuffer m_cResPredFlagSCModel;
    225220#endif
     
    249244  ContextModel3DBuffer m_cALFUvlcSCModel;
    250245  ContextModel3DBuffer m_cALFSvlcSCModel;
    251 #if AMP_CTX
    252246  ContextModel3DBuffer m_cCUAMPSCModel;
    253 #else
    254   ContextModel3DBuffer m_cCUXPosiSCModel;
    255   ContextModel3DBuffer m_cCUYPosiSCModel;
    256 #endif
    257247  ContextModel3DBuffer m_cSaoFlagSCModel;
    258248  ContextModel3DBuffer m_cSaoUvlcSCModel;
    259249  ContextModel3DBuffer m_cSaoSvlcSCModel;
    260 #if SAO_UNIT_INTERLEAVING
    261250  ContextModel3DBuffer m_cSaoMergeLeftSCModel;
    262251  ContextModel3DBuffer m_cSaoMergeUpSCModel;
    263252  ContextModel3DBuffer m_cSaoTypeIdxSCModel;
    264 #endif
    265253
    266254#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
Note: See TracChangeset for help on using the changeset viewer.