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


Ignore:
Timestamp:
30 Aug 2013, 03:29:41 (12 years ago)
Author:
seregin
Message:

remove REF_IDX_FRAMEWORK macro

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

Legend:

Unmodified
Added
Removed

  • branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r363 r377  
    12311231    if ( pcSlice->getEnableTMVPFlag() )
    12321232    {
    1233 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
     1233#if SVC_EXTENSION && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    12341234      if ( !pcSlice->getIdrPicFlag() && pcSlice->getLayerId() > 0 && pcSlice->getActiveNumILRRefIdx() > 0 && pcSlice->getNumMotionPredRefLayers() > 0 )
    12351235      {
    … …  
    12541254        WRITE_UVLC( pcSlice->getColRefIdx(), "collocated_ref_idx" );
    12551255      }
    1256 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
     1256#if SVC_EXTENSION && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    12571257      }
    12581258#endif

  • branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncCfg.h

    r362 r377  
    363363  UInt      m_layerId;   
    364364  UInt      m_numLayer;
    365 #endif
    366 #if REF_IDX_FRAMEWORK
    367   Int      m_elRapSliceBEnabled;
    368 #endif
     365  Int       m_elRapSliceBEnabled;
    369366#if M0040_ADAPTIVE_RESOLUTION_CHANGE
    370   Int      m_adaptiveResolutionChange;
     367  Int       m_adaptiveResolutionChange;
     368#endif
    371369#endif
    372370
    … …  
    868866  Void      setConformanceMode    (Int mode)     { m_conformanceMode = mode; }
    869867  Void      setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
    870 #endif
    871 #if REF_IDX_FRAMEWORK
    872868  Void      setElRapSliceTypeB(Int bEnabled) {m_elRapSliceBEnabled = bEnabled;}
    873869  Int       getElRapSliceTypeB()              {return m_elRapSliceBEnabled;}
    874 #endif
    875870#if M0040_ADAPTIVE_RESOLUTION_CHANGE
    876871  Void      setAdaptiveResolutionChange(Int x) { m_adaptiveResolutionChange = x;    }
    877872  Int       getAdaptiveResolutionChange()      { return m_adaptiveResolutionChange; }
    878873#endif
     874#endif
    879875};
    880876

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

    r374 r377  
    631631#if SVC_UPSAMPLING
    632632        if( pcPic->isSpatialEnhLayer(refLayerIdc))
    633         { 
     633        {
    634634#if SCALED_REF_LAYER_OFFSETS
    635635          m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc) );
    … …  
    659659      }
    660660#endif
    661 
    662     }
    663 #endif
    664 
    665 #if REF_IDX_FRAMEWORK
    666     if( m_layerId > 0 && (pocCurr % m_pcCfg->getIntraPeriod() == 0) )
    667     {
     661     
     662      if( pocCurr % m_pcCfg->getIntraPeriod() == 0 )
     663      {
    668664#if IDR_ALIGNMENT
    669       TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
    670       TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
    671       if( picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP )
    672       {
    673         pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
    674       }
    675       else
    676 #endif
    677       pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
    678     }
    679 
    680     if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 && pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )
    681     {
    682       pcSlice->setSliceType(I_SLICE);
    683     }
    684     else if( m_layerId > 0 && !m_pcEncTop->getElRapSliceTypeB() )
    685     {
    686       if( (pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) &&
    687           (pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) &&
     665        TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
     666        TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
     667        if( picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP )
     668        {
     669          pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());
     670        }
     671        else
     672#endif
     673          pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
     674      }
     675     
     676      if( pcSlice->getActiveNumILRRefIdx() == 0 && pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )
     677      {
     678        pcSlice->setSliceType(I_SLICE);
     679      }
     680      else if( !m_pcEncTop->getElRapSliceTypeB() )
     681      {
     682        if( (pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) &&
     683           (pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) &&
    688684           pcSlice->getSliceType() == B_SLICE )
    689       {
    690         pcSlice->setSliceType(P_SLICE);
    691       }
    692     }
    693 #endif
     685        {
     686          pcSlice->setSliceType(P_SLICE);
     687        }
     688      }
     689    }
     690#endif //SVC_EXTENSION
    694691    if(pcSlice->getTemporalLayerNonReferenceFlag())
    695692    {
    … …  
    789786    pcSlice->setNumRefIdx(REF_PIC_LIST_1,min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive,pcSlice->getRPS()->getNumberOfPictures()));
    790787
    791 #if REF_IDX_FRAMEWORK
     788#if SVC_EXTENSION
    792789    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
    793790    {
    … …  
    827824#endif
    828825    }
    829 #endif
     826#endif //SVC_EXTENSION
    830827
    831828#if ADAPTIVE_QP_SELECTION
    … …  
    833830#endif     
    834831
    835 #if REF_IDX_FRAMEWORK
     832#if SVC_EXTENSION
    836833#if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    837834    if ( pcSlice->getSliceType() == B_SLICE && !(pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0) )
    … …  
    842839      pcSlice->setColFromL0Flag(1-uiColDir);
    843840    }
    844 #endif
    845841
    846842    //  Set reference list
    847 #if REF_IDX_FRAMEWORK
    848843    if(m_layerId ==  0 || ( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 ) )
    849844    {
    850845      pcSlice->setRefPicList( rcListPic);
    851846    }
    852 #else
    853     pcSlice->setRefPicList ( rcListPic );
    854 #endif
    855 #if REF_IDX_FRAMEWORK
     847
    856848    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
    857849    {
    858850      m_pcEncTop->setILRPic(pcPic);
    859 
    860851#if REF_IDX_MFM
    861852#if M0457_COL_PICTURE_SIGNALING
    862853      if( pcSlice->getMFMEnabledFlag() )
    863854#else
    864       if( pcSlice->getSPS()->getMFMEnabledFlag() )
    865 #endif
    866       {
    867         pcSlice->setRefPOCListILP(m_pcEncTop->getIlpList(), pcSlice->getBaseColPic());
     855        if( pcSlice->getSPS()->getMFMEnabledFlag() )
     856#endif
     857        {
     858          pcSlice->setRefPOCListILP(m_pcEncTop->getIlpList(), pcSlice->getBaseColPic());
    868859#if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    869         pcSlice->setMotionPredIlp(getMotionPredIlp(pcSlice));
    870 #endif
    871       }
    872 #endif
     860          pcSlice->setMotionPredIlp(getMotionPredIlp(pcSlice));
     861#endif
     862        }
     863#else
     864    //  Set reference list
     865    pcSlice->setRefPicList ( rcListPic );
     866#endif //SVC_EXTENSION
    873867      pcSlice->setRefPicListModificationSvc();
    874868      pcSlice->setRefPicList( rcListPic, false, m_pcEncTop->getIlpList());
    … …  
    934928#endif
    935929    {
    936 #if !REF_IDX_FRAMEWORK
     930#if !SVC_EXTENSION
    937931      pcSlice->setColFromL0Flag(1-uiColDir);
    938932#endif
    … …  
    16491643            startCUAddrSliceSegmentIdx++;
    16501644          }
    1651 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
     1645#if SVC_EXTENSION && M0457_COL_PICTURE_SIGNALING
    16521646          pcSlice->setNumMotionPredRefLayers(m_pcEncTop->getNumMotionPredRefLayers());
    16531647#endif
    … …  
    26552649    for (Int iRefIndex = 0; iRefIndex < pcSlice->getNumRefIdx(RefPicList(iRefList)); iRefIndex++)
    26562650    {
    2657 #if REF_IDX_FRAMEWORK
     2651#if SVC_EXTENSION
    26582652#if VPS_EXTN_DIRECT_REF_LAYERS
    26592653      if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR(m_layerId) )

  • branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncSlice.cpp

    r345 r377  
    400400  eSliceType = (pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
    401401 
    402 #if REF_IDX_FRAMEWORK
     402#if SVC_EXTENSION
    403403  if(m_pcCfg->getLayerId() > 0)
    404404  {
    … …  
    485485  xStoreWPparam( pPPS->getUseWP(), pPPS->getWPBiPred() );
    486486
    487 #if SVC_EXTENSION && REF_IDX_FRAMEWORK
     487#if SVC_EXTENSION
    488488  if( layerId > 0 )
    489489  {

  • branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncTop.cpp

    r367 r377  
    8383  m_pcBitCounters          = NULL;
    8484  m_pcRdCosts              = NULL;
    85 #if REF_IDX_FRAMEWORK
     85#if SVC_EXTENSION
    8686  memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
    87 #endif
    8887#if REF_IDX_MFM
    8988  m_bMFMEnabledFlag = false;
    … …  
    9190#if SCALED_REF_LAYER_OFFSETS
    9291  m_numScaledRefLayerOffsets = 0;
     92#endif
    9393#endif
    9494}
    … …  
    288288  delete[] m_pcRdCosts;
    289289 
    290 #if !SVC_EXTENSION
    291   // destroy ROM
    292   destroyROM();
    293 #endif
    294 #if REF_IDX_FRAMEWORK
     290#if SVC_EXTENSION
    295291  for(Int i=0; i<MAX_NUM_REF; i++)
    296292  {
    … …  
    301297      m_cIlpPic[i] = NULL;
    302298    }
    303   }   
     299  }
     300#else
     301  // destroy ROM
     302  destroyROM();
    304303#endif
    305304  return;
    … …  
    346345  m_iSPSIdCnt ++;
    347346  m_iPPSIdCnt ++;
    348 #endif
    349 #if REF_IDX_FRAMEWORK
    350347  xInitILRP();
    351348#endif
    … …  
    860857    }
    861858  }
    862 #if REF_IDX_FRAMEWORK
     859#if SVC_EXTENSION
    863860  if (!m_layerId)
    864861  {
    … …  
    869866    m_cPPS.setListsModificationPresentFlag(true);
    870867  }
    871 #endif
    872 #if SVC_EXTENSION
     868
    873869  m_cPPS.setPPSId         ( m_iPPSIdCnt         );
    874870  m_cPPS.setSPSId         ( m_iSPSIdCnt         );
    … …  
    12151211#endif
    12161212
    1217 #if REF_IDX_FRAMEWORK
     1213#if SVC_EXTENSION
    12181214Void TEncTop::xInitILRP()
    12191215{

  • branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncTop.h

    r313 r377  
    132132  TEncTop**               m_ppcTEncTop;
    133133  TEncTop*                getLayerEnc(UInt layer)   { return m_ppcTEncTop[layer]; }
    134 #endif
    135 #if REF_IDX_FRAMEWORK
    136134  TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture
    137 #endif
    138135#if REF_IDX_MFM
    139136  Bool                    m_bMFMEnabledFlag;
    … …  
    145142  UInt                    m_numScaledRefLayerOffsets;
    146143  Window                  m_scaledRefLayerWindow[MAX_LAYERS];
     144#endif
    147145#endif
    148146protected:
    … …  
    153151  Void  xInitPPSforTiles  ();
    154152  Void  xInitRPS          ();                             ///< initialize PPS from encoder options
    155 #if REF_IDX_FRAMEWORK
     153#if SVC_EXTENSION
    156154  Void xInitILRP();
    157155#endif
    … …  
    220218  /// encode several number of pictures until end-of-sequence
    221219#if SVC_EXTENSION
    222 #if REF_IDX_FRAMEWORK
    223220  TComPic** getIlpList() { return m_cIlpPic; }
    224221  Void      setILRPic(TComPic *pcPic);
    225 #endif
    226222#if REF_IDX_MFM
    227223  Void      setMFMEnabledFlag       (Bool flag)   {m_bMFMEnabledFlag = flag;}
Note: See TracChangeset for help on using the changeset viewer.