Changeset 808 in SHVCSoftware


Ignore:
Timestamp:
25 Jun 2014, 03:18:10 (11 years ago)
Author:
seregin
Message:

fix compiler errors

Location:
branches/SHM-6-dev/source/Lib
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp

    r805 r808  
    125125, m_pocMsbValPresentFlag          ( false )
    126126#endif
    127 #if POC_RESET_IDC_DECODER
     127#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    128128, m_picOrderCntLsb (0)
    129129#endif
    … …  
    212212  m_pocMsbValPresentFlag          = false;
    213213#endif
    214 #if POC_RESET_IDC_DECODER
     214#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    215215  m_picOrderCntLsb = 0;
    216216#endif
    … …  
    18701870    if(isAvailable == 0)   
    18711871    {           
    1872 #if UNAVAILABLE_PIC_BUGFIX
    1873 #if 0
     1872#if !UNAVAILABLE_PIC_BUGFIX
    18741873      if (this->getPOC() + pReferencePictureSet->getDeltaPOC(i) >= pocRandomAccess)
    1875 #endif
    18761874#endif
    18771875      {
    … …  
    39253923  return true;
    39263924#else
    3927   setBaseColPic(refLayerIdc, xGetRefPic(rcListPic, getPOC()));
     3925  setBaseColPic(refLayerIdc, xGetRefPic(rcListPic, getPOC()));
     3926  return true;
    39283927#endif
    39293928}

  • branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h

    r805 r808  
    19921992  Int         m_iAssociatedIRAP;
    19931993#if POC_RESET_IDC_ENCODER
    1994   Int                     m_associatedIrapPocBeforeReset;
     1994  Int         m_associatedIrapPocBeforeReset;
    19951995#endif
    19961996
    … …  
    21242124  Int         m_pocValueBeforeReset;
    21252125#endif
    2126 #if POC_RESET_IDC_DECODER
     2126#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    21272127  Int         m_picOrderCntLsb;
    21282128#endif
    … …  
    25002500  Bool      getRaslPicFlag      ();
    25012501  Bool      getRadlPicFlag      ();
     2502#endif
     2503#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    25022504  Int       getPicOrderCntLsb() { return m_picOrderCntLsb; }
    25032505  Void      setPicOrderCntLsb(Int x) { m_picOrderCntLsb = x; }

  • branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r804 r808  
    11541154  if( m_parseIdc == 1 )
    11551155  {
    1156 
    11571156    // Invoke output of pictures if the current picture is a POC reset picture
    11581157    bNewPOC = true;

  • branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r806 r808  
    13251325    pcSlice->setAssociatedIRAPType(m_associatedIRAPType);
    13261326    pcSlice->setAssociatedIRAPPOC(m_associatedIRAPPOC);
     1327#if POC_RESET_IDC_ENCODER
    13271328    pcSlice->setAssociatedIrapPocBeforeReset(m_associatedIrapPocBeforeReset);
     1329#endif
    13281330#endif
    13291331#endif
Note: See TracChangeset for help on using the changeset viewer.