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


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

Merged 9.3-dev0@831.

File:
1 edited

Legend:

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

    r773 r833  
    112112#endif
    113113#if H_3D_INTER_SDC
     114#if QC_SDC_UNIFY_G0130
     115  Void  parseDeltaDC         ( TComDataCU* pcCU, UInt absPartIdx, UInt depth );
     116  Void  parseSDCFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
     117#else
    114118  Void  parseInterSDCFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    115119  Void  parseInterSDCResidualData ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPart );
     120#endif
     121#endif
     122#if H_3D_DBBP
     123  Void parseDBBPFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    116124#endif
    117125private:
     
    211219  ContextModel3DBuffer m_cDdcFlagSCModel;
    212220  ContextModel3DBuffer m_cDdcDataSCModel;
     221#if QC_GENERIC_SDC_G0122
     222  ContextModel3DBuffer m_cAngleFlagSCModel;
     223#if !QC_SDC_UNIFY_G0130
     224  ContextModel3DBuffer m_cIntraSdcFlagSCModel;
     225#endif
     226#endif
    213227#if H_3D_DIM_DMM
    214228  ContextModel3DBuffer m_cDmm1DataSCModel;
     
    219233#endif
    220234#endif
    221 #if H_3D_INTER_SDC
     235#if H_3D_INTER_SDC && !QC_SDC_UNIFY_G0130
    222236  ContextModel3DBuffer m_cInterSDCFlagSCModel;
    223237  ContextModel3DBuffer m_cInterSDCResidualSCModel;
    224238  ContextModel3DBuffer m_cInterSDCResidualSignFlagSCModel;
    225239#endif
     240#if QC_SDC_UNIFY_G0130
     241  ContextModel3DBuffer m_cSDCFlagSCModel;
     242#endif
     243#if H_3D_DBBP
     244  ContextModel3DBuffer m_cDBBPFlagSCModel;
     245#endif
    226246};
    227247
Note: See TracChangeset for help on using the changeset viewer.