Changeset 652 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
7 Apr 2014, 23:08:52 (11 years ago)
Author:
seregin
Message:

update to HM-14.0

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

Legend:

Unmodified
Added
Removed

  • branches/SHM-6-dev/source/Lib/TLibDecoder/AnnexBread.h

    r595 r652  
    6565  , m_Input(istream)
    6666  {
    67     istream.exceptions(std::istream::eofbit);
     67    istream.exceptions(std::istream::eofbit | std::istream::badbit);
    6868  }
    6969

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

    r644 r652  
    518518{
    519519  UInt val;
    520   READ_CODE(4, val, "active_vps_id");      sei.activeVPSId = val;
    521   READ_FLAG( val, "full_random_access_flag");  sei.m_fullRandomAccessFlag = val ? true : false;
    522   READ_FLAG( val, "no_param_set_update_flag"); sei.m_noParamSetUpdateFlag = val ? true : false;
     520  READ_CODE(4, val, "active_video_parameter_set_id");   sei.activeVPSId = val;
     521  READ_FLAG(   val, "self_contained_cvs_flag");         sei.m_selfContainedCvsFlag = val ? true : false;
     522  READ_FLAG(   val, "no_parameter_set_update_flag");    sei.m_noParameterSetUpdateFlag = val ? true : false;
    523523  READ_UVLC(   val, "num_sps_ids_minus1"); sei.numSpsIdsMinus1 = val;
    524524
    525   sei.activeSeqParamSetId.resize(sei.numSpsIdsMinus1 + 1);
     525  sei.activeSeqParameterSetId.resize(sei.numSpsIdsMinus1 + 1);
    526526  for (Int i=0; i < (sei.numSpsIdsMinus1 + 1); i++)
    527527  {
    528     READ_UVLC(val, "active_seq_param_set_id");  sei.activeSeqParamSetId[i] = val;
    529   }
    530 
    531   UInt uibits = m_pcBitstream->getNumBitsUntilByteAligned();
    532  
    533   while(uibits--)
    534   {
    535     READ_FLAG(val, "alignment_bit");
    536   }
     528    READ_UVLC(val, "active_seq_parameter_set_id");      sei.activeSeqParameterSetId[i] = val;
     529  }
     530
     531  xParseByteAlign();
    537532}
    538533
    … …  
    812807    case 4:
    813808      {
    814         READ_CODE( 8, val, "camera_iso_speed_idc" );                     sei.m_cameraIsoSpeedValue = val;
    815         if( sei.m_cameraIsoSpeedValue == 255) //Extended_ISO
     809        READ_CODE( 8, val, "camera_iso_speed_idc" );                     sei.m_cameraIsoSpeedIdc = val;
     810        if( sei.m_cameraIsoSpeedIdc == 255) //Extended_ISO
    816811        {
    817812          READ_CODE( 32,   val,   "camera_iso_speed_value" );            sei.m_cameraIsoSpeedValue = val;
     813        }
     814        READ_CODE( 8, val, "exposure_index_idc" );                       sei.m_exposureIndexIdc = val;
     815        if( sei.m_exposureIndexIdc == 255) //Extended_ISO
     816        {
     817          READ_CODE( 32,   val,   "exposure_index_value" );              sei.m_exposureIndexValue = val;
    818818        }
    819819        READ_FLAG( val, "exposure_compensation_value_sign_flag" );       sei.m_exposureCompensationValueSignFlag = val;

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

    r649 r652  
    681681    for(UInt i=0; i <= pcSPS->getMaxTLayers()-1; i++)
    682682    {
    683       READ_UVLC ( uiCode, "sps_max_dec_pic_buffering_minus1");
     683      READ_UVLC ( uiCode, "sps_max_dec_pic_buffering_minus1[i]");
    684684      pcSPS->setMaxDecPicBuffering( uiCode + 1, i);
    685       READ_UVLC ( uiCode, "sps_num_reorder_pics" );
     685      READ_UVLC ( uiCode, "sps_num_reorder_pics[i]" );
    686686      pcSPS->setNumReorderPics(uiCode, i);
    687       READ_UVLC ( uiCode, "sps_max_latency_increase_plus1");
     687      READ_UVLC ( uiCode, "sps_max_latency_increase_plus1[i]");
    688688      pcSPS->setMaxLatencyIncrease( uiCode, i );
    689689
    … …  
    887887  READ_CODE( 6,  uiCode,  "vps_reserved_zero_6bits" );            assert(uiCode == 0);
    888888#endif
    889   READ_CODE( 3,  uiCode,  "vps_max_sub_layers_minus1" );          pcVPS->setMaxTLayers( uiCode + 1 ); assert(uiCode <= 6);
     889  READ_CODE( 3,  uiCode,  "vps_max_sub_layers_minus1" );          pcVPS->setMaxTLayers( uiCode + 1 ); assert(uiCode+1 <= MAX_TLAYER);
    890890  READ_FLAG(     uiCode,  "vps_temporal_id_nesting_flag" );       pcVPS->setTemporalNestingFlag( uiCode ? true:false );
    891891  assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag());
    … …  
    21022102  if( rpcSlice->getRapPicFlag())
    21032103  {
    2104 #if !NO_OUTPUT_OF_PRIOR_PICS
    2105     READ_FLAG( uiCode, "no_output_of_prior_pics_flag" );  //ignored
    2106 #else
    2107     READ_FLAG( uiCode, "no_output_of_prior_pics_flag" );  rpcSlice->setNoOutputOfPriorPicsFlag( uiCode ? true : false );
     2104    READ_FLAG( uiCode, "no_output_of_prior_pics_flag" );  //ignored -- updated already
     2105#if SETTING_NO_OUT_PIC_PRIOR
     2106    rpcSlice->setNoOutputPriorPicsFlag(uiCode ? true : false);
     2107#else
     2108    rpcSlice->setNoOutputPicPrior( false );
    21082109#endif
    21092110  }
    … …  
    23052306        else
    23062307        {
    2307           uiCode = 0;
     2308          uiCode = 0;       
    23082309        }
    23092310        *rps = *(sps->getRPSList()->getReferencePictureSet(uiCode));

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

    r595 r652  
    715715{
    716716  UInt  uiInitTrDepth = ( pcCU->getPartitionSize(0) == SIZE_2Nx2N ? 0 : 1 );
    717   UInt  uiNumPart     = pcCU->getNumPartInter();
     717  UInt  uiNumPart     = pcCU->getNumPartitions();
    718718  UInt  uiNumQParts   = pcCU->getTotalNumPart() >> 2;
    719719 

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

    r595 r652  
    248248  }
    249249
     250#if SETTING_PIC_OUTPUT_MARK
     251  rpcPic->setOutputMark(rpcPic->getSlice(0)->getPicOutputFlag() ? true : false);
     252#else
    250253  rpcPic->setOutputMark(true);
     254#endif
    251255  rpcPic->setReconMark(true);
    252256}

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

    r644 r652  
    7979  m_prevSliceSkipped = false;
    8080  m_skippedPOC = 0;
    81 #if NO_CLRAS_OUTPUT_FLAG
    82   m_noClrasOutputFlag          = false;
     81#if SETTING_NO_OUT_PIC_PRIOR
     82  m_bFirstSliceInBitstream  = true;
     83  m_lastPOCNoOutputPriorPics = -1;
     84  m_craNoRaslOutputFlag = false;
     85  m_isNoOutputPriorPics = false;
     86#endif
     87#if NO_CLRAS_OUTPUT_FLAG 
    8388  m_layerInitializedFlag       = false;
    84   m_firstPicInLayerDecodedFlag = false;
    85   m_noOutputOfPriorPicsFlags   = false;
     89  m_firstPicInLayerDecodedFlag = false; 
    8690  m_bRefreshPending            = false;
    8791#endif
    … …  
    503507
    504508  // Execute Deblock + Cleanup
    505 
    506509  m_cGopDecoder.filterPicture(pcPic);
    507510
    … …  
    517520  return;
    518521}
     522
     523#if SETTING_NO_OUT_PIC_PRIOR
     524Void TDecTop::checkNoOutputPriorPics (TComList<TComPic*>*& rpcListPic)
     525{
     526  if (!rpcListPic || !m_isNoOutputPriorPics) return;
     527
     528  TComList<TComPic*>::iterator  iterPic   = rpcListPic->begin();
     529
     530  while (iterPic != rpcListPic->end())
     531  {
     532    TComPic*& pcPicTmp = *(iterPic++);
     533    if (m_lastPOCNoOutputPriorPics != pcPicTmp->getPOC())
     534    {
     535      pcPicTmp->setOutputMark(false);
     536    }
     537  }
     538}
     539#endif
    519540
    520541#if EARLY_REF_PIC_MARKING
    … …  
    843864  TComPic*&   pcPic         = m_pcPic;
    844865#if SVC_EXTENSION
    845 #if !NO_OUTPUT_OF_PRIOR_PICS
    846 #if NO_CLRAS_OUTPUT_FLAG
    847   Bool bFirstSliceInSeq;
    848 #endif
    849 #endif
    850866  m_apcSlicePilot->setVPS( m_parameterSetManagerDecoder.getPrefetchedVPS(0) );
    851867#if OUTPUT_LAYER_SET_INDEX
    … …  
    900916  m_apcSlicePilot->setAssociatedIRAPType(m_associatedIRAPType);
    901917
    902 #if NO_OUTPUT_OF_PRIOR_PICS
    903   // Infer the value of NoOutputOfPriorPicsFlag
    904   if( m_apcSlicePilot->getRapPicFlag() )
    905   {
    906     if ( m_apcSlicePilot->getBlaPicFlag() || m_apcSlicePilot->getIdrPicFlag()  ||
    907         (m_apcSlicePilot->getCraPicFlag() && m_bFirstSliceInSequence) ||
    908         (m_apcSlicePilot->getCraPicFlag() && m_apcSlicePilot->getHandleCraAsBlaFlag()))
    909     {
    910       m_apcSlicePilot->setNoRaslOutputFlag( true );
     918#if SETTING_NO_OUT_PIC_PRIOR
     919  //For inference of NoOutputOfPriorPicsFlag
     920  if (m_apcSlicePilot->getRapPicFlag())
     921  {
     922    if ((m_apcSlicePilot->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_apcSlicePilot->getNalUnitType() <= NAL_UNIT_CODED_SLICE_IDR_N_LP) ||
     923        (m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA && m_bFirstSliceInSequence) ||
     924        (m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA && m_apcSlicePilot->getHandleCraAsBlaFlag()))
     925    {
     926      m_apcSlicePilot->setNoRaslOutputFlag(true);
     927    }
     928    //the inference for NoOutputPriorPicsFlag
     929    if (!m_bFirstSliceInBitstream && m_apcSlicePilot->getRapPicFlag() && m_apcSlicePilot->getNoRaslOutputFlag())
     930    {
     931      if (m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA)
     932      {
     933        m_apcSlicePilot->setNoOutputPriorPicsFlag(true);
     934      }
    911935    }
    912936    else
    913937    {
    914       m_apcSlicePilot->setNoRaslOutputFlag( false );
    915     }
     938      m_apcSlicePilot->setNoOutputPriorPicsFlag(false);
     939    }
     940
     941    if(m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA)
     942    {
     943      m_craNoRaslOutputFlag = m_apcSlicePilot->getNoRaslOutputFlag();
     944    }
     945  }
     946  if (m_apcSlicePilot->getRapPicFlag() && m_apcSlicePilot->getNoOutputPriorPicsFlag())
     947  {
     948    m_lastPOCNoOutputPriorPics = m_apcSlicePilot->getPOC();
     949    m_isNoOutputPriorPics = true;
     950  }
     951  else
     952  {
     953    m_isNoOutputPriorPics = false;
     954  }
     955
     956  //For inference of PicOutputFlag
     957  if (m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_RASL_N || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_RASL_R)
     958  {
     959    if ( m_craNoRaslOutputFlag )
     960    {
     961      m_apcSlicePilot->setPicOutputFlag(false);
     962    }
     963  }
     964#endif
     965
     966#if FIX_POC_CRA_NORASL_OUTPUT
     967  if (m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA && m_craNoRaslOutputFlag) //Reset POC MSB when CRA has NoRaslOutputFlag equal to 1
     968  {
     969    Int iMaxPOClsb = 1 << m_apcSlicePilot->getSPS()->getBitsForPOC();
     970    m_apcSlicePilot->setPOC( m_apcSlicePilot->getPOC() & (iMaxPOClsb - 1) );
    916971  }
    917972#endif
    … …  
    9751030    if( m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA && m_apcSlicePilot->getNoRaslOutputFlag() )
    9761031    {
    977       this->setNoOutputOfPriorPicsFlags( true );
     1032      this->setNoOutputPriorPicsFlag( true );
    9781033    }
    9791034    else if( m_apcSlicePilot->getRapPicFlag() && m_apcSlicePilot->getNoRaslOutputFlag() )
    9801035    {
    981       this->setNoOutputOfPriorPicsFlags( m_apcSlicePilot->getNoOutputOfPriorPicsFlag() );
     1036      this->setNoOutputPriorPicsFlag( m_apcSlicePilot->getNoOutputPriorPicsFlag() );
    9821037    }
    9831038    else
    … …  
    9851040      if( this->m_ppcTDecTop[0]->getNoClrasOutputFlag() )
    9861041      {
    987         this->setNoOutputOfPriorPicsFlags( true );
     1042        this->setNoOutputPriorPicsFlag( true );
    9881043      }
    9891044    }
    … …  
    10061061#else
    10071062  //we should only get a different poc for a new picture (with CTU address==0)
    1008   if (m_apcSlicePilot->isNextSlice() && m_apcSlicePilot->getPOC()!=m_prevPOC && !m_bFirstSliceInSequence && (!m_apcSlicePilot->getSliceCurStartCUAddr()==0))
     1063  if (m_apcSlicePilot->isNextSlice() && m_apcSlicePilot->getPOC()!=m_prevPOC && !m_bFirstSliceInSequence && (m_apcSlicePilot->getSliceCurStartCUAddr()!=0))
    10091064  {
    10101065    printf ("Warning, the first slice of a picture might have been lost!\n");
    … …  
    10501105#endif
    10511106  }
    1052 #if !NO_OUTPUT_OF_PRIOR_PICS
    1053 #if NO_CLRAS_OUTPUT_FLAG
    1054   bFirstSliceInSeq = m_bFirstSliceInSequence;
    1055 #endif
    1056 #endif
    10571107  m_bFirstSliceInSequence = false;
     1108#if SETTING_NO_OUT_PIC_PRIOR 
     1109  m_bFirstSliceInBitstream  = false;
     1110#endif
    10581111#if POC_RESET_FLAG
    10591112  // This operation would do the following:
    … …  
    12161269#endif
    12171270
    1218 #if !NO_OUTPUT_OF_PRIOR_PICS
    1219 #if NO_CLRAS_OUTPUT_FLAG
    1220     if (m_layerId == 0 &&
    1221         (m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP
    1222       || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_RADL
    1223       || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_N_LP
    1224       || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL
    1225       || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP
    1226       || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA))
    1227     {
    1228       if (bFirstSliceInSeq)
    1229       {
    1230         setNoClrasOutputFlag(true);
    1231       }
    1232       else if (m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP
    1233             || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_RADL
    1234             || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_N_LP)
    1235       {
    1236         setNoClrasOutputFlag(true);
    1237       }
    1238 #if O0149_CROSS_LAYER_BLA_FLAG
    1239       else if ((m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP) &&
    1240                m_apcSlicePilot->getCrossLayerBLAFlag())
    1241       {
    1242         setNoClrasOutputFlag(true);
    1243       }
    1244 #endif
    1245       else
    1246       {
    1247         setNoClrasOutputFlag(false);
    1248       }
    1249       if (getNoClrasOutputFlag())
    1250       {
    1251         for (UInt i = 0; i < m_apcSlicePilot->getVPS()->getMaxLayers(); i++)
    1252         {
    1253           m_ppcTDecTop[i]->setLayerInitializedFlag(false);
    1254           m_ppcTDecTop[i]->setFirstPicInLayerDecodedFlag(false);
    1255         }
    1256       }
    1257     }
    1258 #endif
    1259 
    1260 #if NO_CLRAS_OUTPUT_FLAG
    1261     m_apcSlicePilot->decodingRefreshMarking(m_pocCRA, m_bRefreshPending, m_cListPic, getNoClrasOutputFlag());
    1262 #endif
    1263 #else
     1271#if NO_OUTPUT_OF_PRIOR_PICS
    12641272    if ( m_layerId == 0 && m_apcSlicePilot->getRapPicFlag() && getNoClrasOutputFlag() )
    12651273    {
    … …  
    12731281    // Buffer initialize for prediction.
    12741282    m_cPrediction.initTempBuff();
    1275 #if !ALIGNED_BUMPING
     1283#if ALIGNED_BUMPING
     1284    m_apcSlicePilot->checkLeadingPictureRestrictions(m_cListPic);
     1285#else
    12761286    m_apcSlicePilot->applyReferencePictureSet(m_cListPic, m_apcSlicePilot->getRPS());
    1277 #else
    1278     m_apcSlicePilot->checkLeadingPictureRestrictions(m_cListPic);
    12791287#endif
    12801288    //  Get a new picture buffer
    … …  
    18091817      SEIActiveParameterSets *seiAps = (SEIActiveParameterSets*)(*activeParamSets.begin());
    18101818      m_parameterSetManagerDecoder.applyPrefetchedPS();
    1811       assert(seiAps->activeSeqParamSetId.size()>0);
    1812       if( !m_parameterSetManagerDecoder.activateSPSWithSEI( seiAps->activeSeqParamSetId[0] ) )
     1819      assert(seiAps->activeSeqParameterSetId.size()>0);
     1820      if( !m_parameterSetManagerDecoder.activateSPSWithSEI( seiAps->activeSeqParameterSetId[0] ) )
    18131821      {
    18141822        printf ("Warning SPS activation with Active parameter set SEI failed");
    … …  
    18371845      SEIActiveParameterSets *seiAps = (SEIActiveParameterSets*)(*activeParamSets.begin());
    18381846      m_parameterSetManagerDecoder.applyPrefetchedPS();
    1839       assert(seiAps->activeSeqParamSetId.size()>0);
    1840       if (! m_parameterSetManagerDecoder.activateSPSWithSEI(seiAps->activeSeqParamSetId[0] ))
     1847      assert(seiAps->activeSeqParameterSetId.size()>0);
     1848      if (! m_parameterSetManagerDecoder.activateSPSWithSEI(seiAps->activeSeqParameterSetId[0] ))
    18411849      {
    18421850        printf ("Warning SPS activation with Active parameter set SEI failed");
    … …  
    19972005      return false;
    19982006     
     2007    case NAL_UNIT_FILLER_DATA:
     2008      return false;
    19992009     
    20002010    case NAL_UNIT_RESERVED_VCL_N10:
    … …  
    20172027    case NAL_UNIT_RESERVED_VCL31:
    20182028     
    2019     case NAL_UNIT_FILLER_DATA:
    20202029    case NAL_UNIT_RESERVED_NVCL41:
    20212030    case NAL_UNIT_RESERVED_NVCL42:

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

    r644 r652  
    104104  Bool                    m_prevSliceSkipped;
    105105  Int                     m_skippedPOC;
     106#if SETTING_NO_OUT_PIC_PRIOR 
     107  Bool                    m_bFirstSliceInBitstream;
     108  Int                     m_lastPOCNoOutputPriorPics;
     109  Bool                    m_isNoOutputPriorPics;
     110  Bool                    m_craNoRaslOutputFlag;    //value of variable NoRaslOutputFlag of the last CRA pic
     111#endif
    106112
    107113#if SVC_EXTENSION
    … …  
    136142#endif
    137143
    138 #if NO_CLRAS_OUTPUT_FLAG
    139   Bool                    m_noClrasOutputFlag;
     144#if NO_CLRAS_OUTPUT_FLAG 
    140145  Bool                    m_layerInitializedFlag;
    141146  Bool                    m_firstPicInLayerDecodedFlag;
    142   Bool                    m_noOutputOfPriorPicsFlags;
    143 
    144   Bool                   m_bRefreshPending;
     147  Bool                    m_bRefreshPending;
    145148#endif
    146149#if RESOLUTION_BASED_DPB
    147   Int                    m_subDpbIdx;     // Index to the sub-DPB that the layer belongs to.
    148                                           // When new VPS is activated, this should be re-initialized to -1
     150  Int                     m_subDpbIdx;     // Index to the sub-DPB that the layer belongs to.
     151                                           // When new VPS is activated, this should be re-initialized to -1
    149152#endif
    150153public:
    … …  
    166169  Void  deletePicBuffer();
    167170
     171 
     172  TComSPS* getActiveSPS() { return m_parameterSetManagerDecoder.getActiveSPS(); }
     173
     174
    168175  Void executeLoopFilters(Int& poc, TComList<TComPic*>*& rpcListPic);
     176#if SETTING_NO_OUT_PIC_PRIOR 
     177  Void  checkNoOutputPriorPics (TComList<TComPic*>*& rpcListPic);
     178  Bool  getNoOutputPriorPicsFlag ()         { return m_isNoOutputPriorPics; }
     179  Void  setNoOutputPriorPicsFlag (Bool val) { m_isNoOutputPriorPics = val; }
     180#endif
     181
    169182#if SVC_EXTENSION
    170183#if EARLY_REF_PIC_MARKING
    … …  
    239252  fstream* getBLSyntaxFile() { return m_pBLSyntaxFile; }
    240253#endif
    241 #if NO_OUTPUT_OF_PRIOR_PICS
    242 #if NO_CLRAS_OUTPUT_FLAG
    243   Bool getNoOutputOfPriorPicsFlags()         { return m_noOutputOfPriorPicsFlags;}
    244   Void setNoOutputOfPriorPicsFlags(Bool x)   { m_noOutputOfPriorPicsFlags = x;   }
    245 #endif
    246 #endif
    247254protected:
    248255  Void  xGetNewPicBuffer  (TComSlice* pcSlice, TComPic*& rpcPic);
    … …  
    265272
    266273#if NO_CLRAS_OUTPUT_FLAG
    267   Int  getNoClrasOutputFlag()                { return m_noClrasOutputFlag;}
    268   Void setNoClrasOutputFlag(Bool x)          { m_noClrasOutputFlag = x;   }
     274  Int  getNoClrasOutputFlag()                { return m_craNoRaslOutputFlag;}
     275  Void setNoClrasOutputFlag(Bool x)          { m_craNoRaslOutputFlag = x;   }
    269276  Int  getLayerInitializedFlag()             { return m_layerInitializedFlag;}
    270277  Void setLayerInitializedFlag(Bool x)       { m_layerInitializedFlag = x;   }
    271278  Int  getFirstPicInLayerDecodedFlag()       { return m_firstPicInLayerDecodedFlag;}
    272279  Void setFirstPicInLayerDecodedFlag(Bool x) { m_firstPicInLayerDecodedFlag = x;   }
    273 #if !NO_OUTPUT_OF_PRIOR_PICS
    274   Int  getNoOutputOfPriorPicsFlags()         { return m_noOutputOfPriorPicsFlags;}
    275   Void setNoOutputOfPriorPicsFlags(Bool x)   { m_noOutputOfPriorPicsFlags = x;   }
    276 #endif
    277280#endif
    278281};// END CLASS DEFINITION TDecTop
Note: See TracChangeset for help on using the changeset viewer.