Changeset 1139 in SHVCSoftware for branches/SHM-dev/source


Ignore:
Timestamp:
7 Jul 2015, 23:25:11 (9 years ago)
Author:
seregin
Message:

macro cleanup: NO_OUTPUT_OF_PRIOR_PICS

Location:
branches/SHM-dev/source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r1116 r1139  
    332332#if ALIGNED_BUMPING
    333333      Bool outputPicturesFlag = true; 
    334 #if NO_OUTPUT_OF_PRIOR_PICS
     334
    335335      if( m_acTDecTop[nalu.m_layerId].getNoOutputPriorPicsFlag() )
    336336      {
    337337        outputPicturesFlag = false;
    338338      }
    339 #endif
    340339
    341340      if (nalu.m_nalUnitType == NAL_UNIT_EOS) // End of sequence
     
    351350#endif
    352351      {
    353 #if NO_OUTPUT_OF_PRIOR_PICS
    354         if(
    355 #else
    356         if ( bNewPOC &&
    357 #endif
    358            (   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
     352         if(   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
    359353            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP
    360354            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_N_LP
    361355            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_RADL
    362             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP ) )
     356            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP   )
    363357        {
    364358          flushAllPictures( nalu.m_layerId, outputPicturesFlag );
  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

    r1136 r1139  
    39553955}
    39563956
    3957 #if NO_OUTPUT_OF_PRIOR_PICS
    39583957Bool TComSlice::getBlaPicFlag       ()
    39593958{
     
    39623961    || getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP;
    39633962}
     3963
    39643964Bool TComSlice::getCraPicFlag       ()
    39653965{
    39663966    return getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA;
    39673967}
    3968 #endif
     3968
    39693969#if POC_RESET_IDC_DECODER
    39703970Bool TComSlice::getRaslPicFlag      ()
  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

    r1137 r1139  
    25962596#endif
    25972597
    2598 #if NO_OUTPUT_OF_PRIOR_PICS
    25992598  Bool      getBlaPicFlag       ();
    26002599  Bool      getCraPicFlag       ();
    2601 #endif
    26022600#if POC_RESET_IDC_DECODER
    26032601  Bool      getRaslPicFlag      ();
     
    26182616
    26192617#endif //SVC_EXTENSION
     2618
    26202619protected:
    26212620  TComPic*  xGetRefPic        (TComList<TComPic*>& rcListPic, Int poc);
  • branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

    r1138 r1139  
    117117#endif
    118118#define POC_RESET_INFO_INFERENCE         1      ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present
    119 #define NO_OUTPUT_OF_PRIOR_PICS          1      ///< Use no_output_of_prior_pics_flag
    120119#define REPN_FORMAT_IN_VPS               1      ///< JCTVC-N0092: Signal represenation format (spatial resolution, bit depth, colour format) in the VPS
    121120#define RPL_INIT_N0316_N0082             1      ///< JCTVC-N0316, JCTVC-N0082: initial reference picture list construction
  • branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r1133 r1139  
    838838  bNewPOC = m_apcSlicePilot->getPOC() != m_prevPOC || ( m_apcSlicePilot->getFirstSliceInPic() && m_parseIdc == -1 );
    839839
    840 #if NO_OUTPUT_OF_PRIOR_PICS
    841840#if NO_CLRAS_OUTPUT_FLAG
    842841  if (m_layerId == m_smallestLayerId && m_apcSlicePilot->getRapPicFlag())
     
    892891    }
    893892  }
    894 #endif
    895893
    896894#if POC_RESET_IDC_DECODER
     
    13571355  if (m_bFirstSliceInPicture)
    13581356  {
     1357#if SVC_EXTENSION
    13591358#if AVC_BASE
    13601359    if( m_layerId > 0 && m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getNonHEVCBaseLayerFlag() )
     
    14651464#endif
    14661465
    1467 #if NO_OUTPUT_OF_PRIOR_PICS
    14681466    if ( m_layerId == 0 && m_apcSlicePilot->getRapPicFlag() && getNoClrasOutputFlag() )
    14691467    {
     
    14741472      }
    14751473    }
    1476 #endif
    1477 
    1478 #if SVC_EXTENSION
     1474
    14791475    xCheckLayerReset();
    14801476    xSetLayerInitializedFlag();
Note: See TracChangeset for help on using the changeset viewer.