Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecTop.h


Ignore:
Timestamp:
23 Oct 2013, 23:01:30 (11 years ago)
Author:
tech
Message:

Merged 8.1-Cleanup@654

File:
1 edited

Legend:

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

    r622 r655  
    176176  Int                     m_iMaxRefPicNum;
    177177 
     178  NalUnitType             m_associatedIRAPType; ///< NAL unit type of the associated IRAP picture
    178179  Int                     m_pocCRA;            ///< POC number of the latest CRA picture
    179   Bool                    m_prevRAPisBLA;      ///< true if the previous RAP (CRA/CRANT/BLA/BLANT/IDR) picture is a BLA/BLANT picture
    180180  Int                     m_pocRandomAccess;   ///< POC number of the random access point (the first IDR or CRA picture)
    181181
     
    211211  Bool                    m_bFirstSliceInPicture;
    212212  Bool                    m_bFirstSliceInSequence;
     213  Bool                    m_prevSliceSkipped;
     214  Int                     m_skippedPOC;
     215
    213216#if H_MV
    214217  // For H_MV m_bFirstSliceInSequence indicates first slice in sequence of the particular layer 
     
    216219  Int                     m_viewId;
    217220  TComPicLists*           m_ivPicLists;
    218 #if H_MV5
    219221  std::vector<TComPic*>   m_refPicSetInterLayer0;
    220222  std::vector<TComPic*>   m_refPicSetInterLayer1;
    221 #else
    222   std::vector<TComPic*>   m_refPicSetInterLayer;
    223 #endif
    224223#if H_3D
    225224  Int                     m_viewIndex;
     
    279278  TComPic*  xGetPic( Int layerId, Int poc );
    280279  Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay, Bool newLayerFlag ); 
    281 #if H_MV5
    282280  Void      xResetPocInPicBuffer();
    283 #endif
    284281#else
    285282  Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay);
Note: See TracChangeset for help on using the changeset viewer.