Changeset 1310 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder


Ignore:
Timestamp:
21 Jul 2015, 01:25:41 (9 years ago)
Author:
seregin
Message:

port rev 4381

Location:
branches/SHM-dev/source/Lib/TLibEncoder
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r1308 r1310  
    103103  ::memset(m_ltRefPicUsedByCurrPicFlag, 0, sizeof(m_ltRefPicUsedByCurrPicFlag));
    104104  m_lastBPSEI         = 0;
    105   xResetNonNestedSEIPresentFlags();
    106   xResetNestedSEIPresentFlags();
     105  m_bufferingPeriodSEIPresentInAU = false;
    107106  m_associatedIRAPType = NAL_UNIT_CODED_SLICE_IDR_N_LP;
    108107  m_associatedIRAPPOC  = 0;
     
    572571    m_seiEncoder.initSEIActiveParameterSets (sei, m_pcCfg->getVPS(), sps);
    573572    seiMessages.push_back(sei);
    574     m_activeParameterSetSEIPresentInAU = true;
    575573  }
    576574
     
    10841082      pictureTimingSEI->m_picStruct = (isField && slice->getPic()->isTopField())? 1 : isField? 2 : 0;
    10851083      seiMessages.push_back(pictureTimingSEI);
    1086       m_pictureTimingSEIPresentInAU = true;
    10871084
    10881085      if ( m_pcCfg->getScalableNestingSEIEnabled() ) // put picture timing SEI into scalable nesting SEI
    10891086      {
    1090         if (m_pcCfg->getScalableNestingSEIEnabled())
    1091         {
    1092           SEIPictureTiming *pictureTimingSEIcopy = new SEIPictureTiming();
    1093           pictureTimingSEI->copyTo(*pictureTimingSEIcopy);
    1094           nestedSeiMessages.push_back(pictureTimingSEIcopy);
    1095         }
    1096         m_nestedPictureTimingSEIPresentInAU = true;
     1087        SEIPictureTiming *pictureTimingSEIcopy = new SEIPictureTiming();
     1088        pictureTimingSEI->copyTo(*pictureTimingSEIcopy);
     1089        nestedSeiMessages.push_back(pictureTimingSEIcopy);
    10971090      }
    10981091    }
     
    25972590#endif
    25982591
     2592    // reset presence of BP SEI indication
     2593    m_bufferingPeriodSEIPresentInAU = false;
    25992594    // create prefix SEI associated with a picture
    26002595    xCreatePerPictureSEIMessages(iGOPid, leadingSeiMessages, nestedSeiMessages, pcSlice);
     
    28872882    }
    28882883#endif
    2889 
    2890     xResetNonNestedSEIPresentFlags();
    2891     xResetNestedSEIPresentFlags();
    28922884
    28932885    pcPic->getPicYuvRec()->copyToPic(pcPicYuvRecOut);
  • branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.h

    r1307 r1310  
    136136  UInt                    m_lastBPSEI;
    137137  UInt                    m_totalCoded;
    138   Bool                    m_activeParameterSetSEIPresentInAU;
    139138  Bool                    m_bufferingPeriodSEIPresentInAU;
    140   Bool                    m_pictureTimingSEIPresentInAU;
    141   Bool                    m_nestedBufferingPeriodSEIPresentInAU;
    142   Bool                    m_nestedPictureTimingSEIPresentInAU;
    143139  SEIEncoder              m_seiEncoder;
    144140
     
    274270  Int xWriteParameterSets (AccessUnit &accessUnit, TComSlice *slice);
    275271
    276   Void xResetNonNestedSEIPresentFlags()
    277   {
    278     m_activeParameterSetSEIPresentInAU = false;
    279     m_bufferingPeriodSEIPresentInAU    = false;
    280     m_pictureTimingSEIPresentInAU      = false;
    281   }
    282   Void xResetNestedSEIPresentFlags()
    283   {
    284     m_nestedBufferingPeriodSEIPresentInAU    = false;
    285     m_nestedPictureTimingSEIPresentInAU      = false;
    286   }
    287272  Void applyDeblockingFilterMetric( TComPic* pcPic, UInt uiNumSlices );
    288273
Note: See TracChangeset for help on using the changeset viewer.