Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecCAVLC.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/TDecCAVLC.h

    r210 r296  
    8282  UInt  xGetBit             ();
    8383 
    84 #if RPS_IN_SPS
    8584  void  parseShortTermRefPicSet            (TComSPS* pcSPS, TComReferencePictureSet* pcRPS, Int idx);
    86 #else
    87   void  parseShortTermRefPicSet            (TComPPS* pcPPS, TComReferencePictureSet* pcRPS, Int idx);
    88 #endif
    8985private:
    9086  TComInputBitstream*   m_pcBitstream;
     
    118114  Void  parseVPS            ( TComVPS* pcVPS );
    119115#endif
    120 #if HHI_MPI
     116#if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068
    121117  Void  parseSPS            ( TComSPS* pcSPS, Bool bIsDepth );
    122118#else
    123119  Void  parseSPS            ( TComSPS* pcSPS );
    124120#endif
    125 #if TILES_OR_ENTROPY_SYNC_IDC
    126121  Void  parsePPS            ( TComPPS* pcPPS, ParameterSetManagerDecoder *parameterSet);
    127 #else
    128   Void  parsePPS            ( TComPPS* pcPPS);
    129 #endif
    130122  Void  parseSEI(SEImessages&);
    131123  Void  parseAPS            ( TComAPS* pAPS );
    132 #if LCU_SYNTAX_ALF
     124#if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
     125  Void  parseSliceHeader    ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet, bool isDepth);
     126#else
    133127  Void  parseSliceHeader    ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet);
    134 #else
    135   Void  parseSliceHeader    ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl );
    136128#endif
    137129  Void  parseTerminatingBit ( UInt& ruiBit );
    138130 
    139 #if HHI_INTER_VIEW_MOTION_PRED
     131#if H3D_IVMP
    140132  Void  parseMVPIdx         ( Int& riMVPIdx, Int iAMVPCands );
    141133#else
     
    149141  Void parseMergeFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    150142  Void parseMergeIndex      ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth );
    151 #if HHI_INTER_VIEW_RESIDUAL_PRED
     143#if H3D_IVRP
    152144  Void parseResPredFlag     ( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth );
    153145#endif
     
    171163  Void readTileMarker     ( UInt& uiTileIdx, UInt uiBitsUsed );
    172164  Void updateContextTables  ( SliceType eSliceType, Int iQp ) { return; }
    173 #if OL_FLUSH
    174165  Void decodeFlush() {};
    175 #endif
    176166
    177167  Void xParsePredWeightTable ( TComSlice* pcSlice );
     
    186176#endif
    187177protected:
    188 #if DBL_CONTROL
    189178  Void  xParseDblParam       ( TComAPS* aps );
    190 #endif
    191179  Void  xParseSaoParam       ( SAOParam* pSaoParam );
    192 #if SAO_UNIT_INTERLEAVING
    193180  Void  xParseSaoOffset      (SaoLcuParam* saoLcuParam);
    194181  Void  xParseSaoUnit        (Int rx, Int ry, Int compIdx, SAOParam* saoParam, Bool& repeatedRow );
    195 #else
    196   Void  xParseSaoSplitParam  ( SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr );
    197   Void  xParseSaoOffsetParam ( SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr );
    198 #endif
    199 #if LCU_SYNTAX_ALF
    200182  Void  xParseAlfParam(AlfParamSet* pAlfParamSet, Bool bSentInAPS = true, Int firstLCUAddr = 0, Bool acrossSlice = true, Int numLCUInWidth= -1, Int numLCUInHeight= -1);
    201183  Void  parseAlfParamSet(AlfParamSet* pAlfParamSet, Int firstLCUAddr, Bool alfAcrossSlice);
    202184  Void  parseAlfFixedLengthRun(UInt& idx, UInt rx, UInt numLCUInWidth);
    203185  Void  parseAlfStoredFilterIdx(UInt& idx, UInt numFilterSetsInBuffer);
    204 #endif
    205186  Void  xParseAlfParam       ( ALFParam* pAlfParam );
    206187  Void  xParseAlfCuControlParam(AlfCUCtrlInfo& cAlfParam, Int iNumCUsInPic);
Note: See TracChangeset for help on using the changeset viewer.