Changeset 377 in SHVCSoftware for branches


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

remove REF_IDX_FRAMEWORK macro

Location:
branches/SHM-3.1-dev/source
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-3.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r362 r377  
    7272, m_pRowHeight()
    7373, m_scalingListFile()
    74 #if REF_IDX_FRAMEWORK
    7574, m_elRapSliceBEnabled(0)
    76 #endif
    7775{
    7876  for(UInt layer=0; layer<MAX_LAYERS; layer++)
    … …  
    514512#endif
    515513#endif
    516 #if REF_IDX_FRAMEWORK
    517514  ("EnableElRapB,-use-rap-b",  m_elRapSliceBEnabled, 0, "Set ILP over base-layer I picture to B picture (default is P picture)")
    518 #endif 
    519515#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    520516  ("IlSampleOnlyPred%d",       m_ilSampleOnlyPred, 0, MAX_LAYERS, "Set inter_layer_sample_pred_only_flag for all slices")
    521517#endif
    522 #else 
     518#else
    523519  ("InputFile,i",           cfg_InputFile,     string(""), "Original YUV input file name")
    524520  ("BitstreamFile,b",       cfg_BitstreamFile, string(""), "Bitstream output file name")
    … …  
    22392235  printf("AvcBase:%d ", 0);
    22402236#endif
    2241 #if REF_IDX_FRAMEWORK
    2242   printf("REF_IDX_FRAMEWORK:%d ", REF_IDX_FRAMEWORK);
    22432237  printf("EL_RAP_SliceType: %d ", m_elRapSliceBEnabled);
    22442238  printf("REF_IDX_ME_ZEROMV: %d ", REF_IDX_ME_ZEROMV);
    22452239  printf("ENCODER_FAST_MODE: %d ", ENCODER_FAST_MODE);
    22462240  printf("REF_IDX_MFM: %d ", REF_IDX_MFM);
    2247 #endif
    22482241#else
    22492242  printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );

  • branches/SHM-3.1-dev/source/App/TAppEncoder/TAppEncCfg.h

    r345 r377  
    5959  // file I/O
    6060#if SVC_EXTENSION
    61   TAppEncLayerCfg m_acLayerCfg [MAX_LAYERS]; 
     61  TAppEncLayerCfg m_acLayerCfg [MAX_LAYERS];
    6262  Int       m_numLayers;                                      ///< number of layers
    6363  Int       m_scalabilityMask[MAX_VPS_NUM_SCALABILITY_TYPES]; ///< scalability_mask
    … …  
    340340  Int       m_log2MaxMvLengthVertical;                        ///< Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units
    341341
    342 #if REF_IDX_FRAMEWORK
     342#if SVC_EXTENSION
    343343  Int       m_elRapSliceBEnabled;
    344344#endif

  • branches/SHM-3.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r372 r377  
    475475    m_acTEncTop[layer].setLog2MaxMvLengthHorizontal( m_log2MaxMvLengthHorizontal );
    476476    m_acTEncTop[layer].setLog2MaxMvLengthVertical( m_log2MaxMvLengthVertical );
    477 #if REF_IDX_FRAMEWORK
    478477    m_acTEncTop[layer].setElRapSliceTypeB(layer == 0? 0 : m_elRapSliceBEnabled);
    479 #endif
    480478#if SCALED_REF_LAYER_OFFSETS
    481479    if( layer > 0 )

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComDataCU.h

    r375 r377  
    516516  UInt&         getTotalBins            ()                            { return m_uiTotalBins;                                                                                                  }
    517517
    518 #if REF_IDX_FRAMEWORK
     518#if SVC_EXTENSION
    519519#if FAST_INTRA_SHVC
    520520  Int           reduceSetOfIntraModes              (  UInt   uiAbsPartIdx, Int* uiIntraDirPred, Int &fullSetOfModes );
    … …  
    538538  UInt          getCoefScanIdx(UInt uiAbsPartIdx, UInt uiWidth, Bool bIsLuma, Bool bIsIntra);
    539539
    540 #if REF_IDX_FRAMEWORK
     540#if SVC_EXTENSION
    541541#if SVC_COL_BLK
    542542  TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt uiCuAbsPartIdx, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Int iMotionMapping = 0 );

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComPic.cpp

    r375 r377  
    524524}
    525525
    526 #if REF_IDX_FRAMEWORK
     526#if SVC_EXTENSION
    527527Void copyOnetoOnePicture(    // SVC_NONCOLL
    528528                  Pel *in,       

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComPic.h

    r313 r377  
    207207  const SEIMessages& getSEIs() const { return m_SEIs; }
    208208
    209 #if REF_IDX_FRAMEWORK
     209#if SVC_EXTENSION
    210210  Void  copyUpsampledPictureYuv(TComPicYuv*   pcPicYuvIn, TComPicYuv*   pcPicYuvOut);
    211 #endif
    212211#if AVC_SYNTAX
    213212  Void readBLSyntax( fstream* filestream, UInt numBytes );
    214213#endif
     214#endif
    215215#if SYNTAX_OUTPUT
    216216  Void wrireBLSyntax( fstream* filestream, UInt numBytes );

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComPicSym.cpp

    r313 r377  
    147147  m_apcTComDataCU = NULL;
    148148
    149 #if AVC_BASE || REF_IDX_FRAMEWORK
     149#if SVC_EXTENSION
    150150  if( m_apcTComTile )
    151151  {
    … …  
    156156  }
    157157  delete [] m_apcTComTile;
    158 #if AVC_BASE || REF_IDX_FRAMEWORK
     158#if SVC_EXTENSION
    159159  }
    160160#endif

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComPrediction.h

    r345 r377  
    118118  Int  getPredicBufHeight()       { return m_iYuvExtHeight; }
    119119
    120 #if REF_IDX_FRAMEWORK
     120#if SVC_EXTENSION
    121121#if SVC_UPSAMPLING
    122122#if SCALED_REF_LAYER_OFFSETS

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

    r376 r377  
    116116#if SVC_EXTENSION
    117117  memset( m_pcBaseColPic, 0, sizeof( m_pcBaseColPic ) );
    118 #if REF_IDX_FRAMEWORK
    119118#if JCTVC_M0458_INTERLAYER_RPS_SIG
    120119  m_activeNumILRRefIdx        = 0;
    … …  
    133132#endif
    134133#endif
    135 #endif
    136134
    137135  initEqualRef();
    … …  
    168166#if SVC_EXTENSION
    169167  m_layerId = layerId;
    170 #endif
    171   m_aiNumRefIdx[0]      = 0;
    172   m_aiNumRefIdx[1]      = 0;
    173 #if REF_IDX_FRAMEWORK
    174168#if JCTVC_M0458_INTERLAYER_RPS_SIG
    175169  m_activeNumILRRefIdx        = 0;
    … …  
    177171#else
    178172  m_numILRRefIdx              = 0;
    179 #endif 
     173#endif
    180174#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    181175  m_numSamplePredRefLayers       = 0;
    … …  
    183177#endif
    184178#endif
     179  m_aiNumRefIdx[0]      = 0;
     180  m_aiNumRefIdx[1]      = 0;
    185181  m_colFromL0Flag = 1;
    186182 
    … …  
    384380  Int i;
    385381
    386 #if REF_IDX_FRAMEWORK
     382#if SVC_EXTENSION
    387383  if( m_layerId == 0 || ( m_layerId > 0 && ( m_activeNumILRRefIdx == 0 || !((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) ) ) )
    388384  {
    … …  
    439435    pcRefPic->setCheckLTMSBPresent(m_pcRPS->getCheckLTMSBPresent(i)); 
    440436  }
    441 #if REF_IDX_FRAMEWORK
    442   }
    443 #endif
    444 
    445 #if REF_IDX_FRAMEWORK
     437#if SVC_EXTENSION
     438  }
     439#endif
     440
     441#if SVC_EXTENSION
    446442  for( i = 0; i < m_activeNumILRRefIdx; i++ )
    447443  {
    … …  
    477473  TComPic*  rpsCurrList0[MAX_NUM_REF+1];
    478474  TComPic*  rpsCurrList1[MAX_NUM_REF+1];
    479 #if REF_IDX_FRAMEWORK
     475#if SVC_EXTENSION
    480476#if ILR_RESTR
    481477  Int numInterLayerRPSPics = 0;
    … …  
    584580      rpsCurrList0[cIdx] = RefPicSetStCurr0[i];
    585581    }
     582#if SVC_EXTENSION
    586583#if RPL_INIT_N0316_N0082
    587 #if REF_IDX_FRAMEWORK
    588584    if( m_layerId > 0 )
    589585    {
    … …  
    613609    }   
    614610#if !RPL_INIT_N0316_N0082
    615 #if REF_IDX_FRAMEWORK
     611#if SVC_EXTENSION
    616612    if( m_layerId > 0 )
    617613    {
    … …  
    650646    }   
    651647
    652 #if REF_IDX_FRAMEWORK
     648#if SVC_EXTENSION
    653649    if( m_layerId > 0 )
    654650    {
    … …  
    702698}
    703699
    704 #if REF_IDX_FRAMEWORK
     700#if SVC_EXTENSION
    705701Void TComSlice::setRefPicListModificationSvc()
    706702{
    … …  
    832828  Int numRpsCurrTempList = 0;
    833829
    834 #if REF_IDX_FRAMEWORK
     830#if SVC_EXTENSION
    835831  if( m_eSliceType == I_SLICE || ( m_pcSPS->getLayerId() &&
    836832    (m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP) &&
    … …  
    840836#endif
    841837  {
    842 #if REF_IDX_FRAMEWORK
     838#if SVC_EXTENSION
    843839#if JCTVC_M0458_INTERLAYER_RPS_SIG
    844840    return m_activeNumILRRefIdx;
    … …  
    857853    }
    858854  }
    859 #if REF_IDX_FRAMEWORK
     855#if SVC_EXTENSION
    860856  if( m_layerId > 0 )
    861857  {
    … …  
    10801076  m_interLayerPredEnabledFlag  = pSrc->m_interLayerPredEnabledFlag;
    10811077  memcpy( m_interLayerPredLayerIdc, pSrc->m_interLayerPredLayerIdc, sizeof( m_interLayerPredLayerIdc ) );
    1082 #elif REF_IDX_FRAMEWORK
    1083   m_numILRRefIdx               = pSrc->m_numILRRefIdx;
    10841078#endif
    10851079#endif

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

    r345 r377  
    14041404  Int         m_interLayerPredLayerIdc  [MAX_VPS_LAYER_ID_PLUS1];
    14051405#else
    1406 #if REF_IDX_FRAMEWORK
     1406#if SVC_EXTENSION
    14071407  Int         m_numILRRefIdx;       //< for inter-layer reference picture ser
    14081408#endif
    … …  
    14601460  TComPic*    m_pcBaseColPic[MAX_LAYERS];
    14611461  TComPicYuv* m_pcFullPelBaseRec[MAX_LAYERS];
    1462 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
     1462#if M0457_COL_PICTURE_SIGNALING
    14631463  Int         m_numMotionPredRefLayers;
    14641464#if REF_IDX_MFM
    … …  
    17611761#endif
    17621762
    1763 #if REF_IDX_FRAMEWORK
    17641763  Void      setRefPicListModificationSvc();
    17651764  Int       getNumILRRefIdx     ( )                     { return  m_pcVPS->getNumDirectRefLayers( m_layerId ); }
    … …  
    17891788#endif
    17901789
    1791 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
     1790#if M0457_COL_PICTURE_SIGNALING
    17921791  Void      setNumMotionPredRefLayers(int i)            { m_numMotionPredRefLayers = i; }
    17931792  Int       getNumMotionPredRefLayers()                 { return m_numMotionPredRefLayers; }
    … …  
    18061805#endif
    18071806
    1808 #else
    1809   // temporal solution for IntraBL. Only one reference layer is supported.
    1810   Int       getActiveNumILRRefIdx     ( )               { return  1; }
    1811   Int       getInterLayerPredLayerIdc (UInt layerIdx)   { return  m_layerId - 1;}
    1812   Void      setActiveNumILRRefIdx     ( Int i )         {}
    1813   Void      setInterLayerPredEnabledFlag( Bool   val )  {}
    1814 #endif
    1815 
    18161807TComPic* getRefPic(TComList<TComPic*>& rcListPic, Int poc) { return xGetRefPic( rcListPic, poc ); }
    18171808

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

    r376 r377  
    9393#define ILP_RAP                          1      ///< JCTVC-M0208 proposal 3
    9494
    95 #define REF_IDX_FRAMEWORK                1      ///< inter-layer reference framework
    96 
    9795#define IDR_ALIGNMENT                    1      ///< align IDR picures across layers
    9896
    … …  
    102100#endif
    103101
    104 #if REF_IDX_FRAMEWORK
    105102#define REF_IDX_ME_ZEROMV                1      ///< L0051: use zero motion for inter-layer reference picture (without fractional ME)
    106103#define ENCODER_FAST_MODE                1      ///< L0174: enable encoder fast mode. TestMethod 1 is enabled by setting to 1 and TestMethod 2 is enable by setting to 2. By default it is set to 1.
    … …  
    127124#else
    128125#define M0457_IL_SAMPLE_PRED_ONLY_FLAG   0      ///< shall be 0, JCTVC-N0107
    129 #endif
    130126#endif
    131127

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

    r376 r377  
    14141414    }
    14151415
    1416 #if REF_IDX_FRAMEWORK
     1416#if SVC_EXTENSION
    14171417#if JCTVC_M0458_INTERLAYER_RPS_SIG
    14181418    rpcSlice->setActiveNumILRRefIdx(0);
    … …  
    16371637    if ( rpcSlice->getEnableTMVPFlag() )
    16381638    {
    1639 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
     1639#if M0457_COL_PICTURE_SIGNALING
    16401640#if REMOVE_COL_PICTURE_SIGNALING
    16411641      rpcSlice->setMFMEnabledFlag( rpcSlice->getNumMotionPredRefLayers() > 0 ? true : false );
    … …  
    16801680        rpcSlice->setColRefIdx(0);
    16811681      }
    1682 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
     1682#if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING
    16831683      }
    16841684#endif

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

    r356 r377  
    247247    for (Int iRefIndex = 0; iRefIndex < pcSlice->getNumRefIdx(RefPicList(iRefList)); iRefIndex++)
    248248    {
    249 #if REF_IDX_FRAMEWORK
     249#if SVC_EXTENSION
    250250#if VPS_EXTN_DIRECT_REF_LAYERS
    251251      if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR( m_layerId ) )

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

    r374 r377  
    7272  m_pBLReconFile = NULL;
    7373#endif
    74 #endif
    75 #if REF_IDX_FRAMEWORK
    7674  memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
    7775#endif
    … …  
    108106 
    109107  m_cSliceDecoder.destroy();
    110 #if REF_IDX_FRAMEWORK
     108#if SVC_EXTENSION
    111109  for(Int i=0; i<MAX_NUM_REF; i++)
    112110  {
    … …  
    137135}
    138136
    139 #if REF_IDX_FRAMEWORK
     137#if SVC_EXTENSION
    140138Void TDecTop::xInitILRP(TComSPS *pcSPS)
    141139{
    … …  
    607605  m_apcSlicePilot->setTLayerInfo(nalu.m_temporalId);
    608606
     607#if SVC_EXTENSION
    609608#if VPS_EXTN_DIRECT_REF_LAYERS && M0457_PREDICTION_INDICATIONS
    610609  setRefLayerParams(m_apcSlicePilot->getVPS());
    611610#endif
    612 #if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING
     611#if M0457_COL_PICTURE_SIGNALING
    613612  m_apcSlicePilot->setNumMotionPredRefLayers(m_numMotionPredRefLayers);
    614613#endif
    615 
    616 #if SVC_EXTENSION
    617614#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
    618615  m_apcSlicePilot->setNumSamplePredRefLayers( getNumSamplePredRefLayers() );
    … …  
    878875    pcSlice->checkCRA(pcSlice->getRPS(), m_pocCRA, m_prevRAPisBLA, m_cListPic );
    879876    // Set reference list
    880 #if REF_IDX_FRAMEWORK
     877#if SVC_EXTENSION
    881878    if (m_layerId == 0)
    882879#endif
    … …  
    972969    }
    973970
    974 #if REF_IDX_FRAMEWORK
    975971    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
    976972    {
    … …  
    988984#endif
    989985      }
    990 #endif
    991986      pcSlice->setRefPicList( m_cListPic, false, m_cIlpPic);
    992987    }
    … …  
    11031098  m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
    11041099#endif
    1105 #if REF_IDX_FRAMEWORK
     1100#if SVC_EXTENSION
    11061101  if(m_numLayer>0)
    11071102  {

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

    r374 r377  
    130130  Bool                    m_motionPredEnabledFlag[MAX_VPS_LAYER_ID_PLUS1];
    131131#endif
     132  TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture
    132133#endif
    133134#if AVC_SYNTAX || SYNTAX_OUTPUT
    134135  fstream*               m_pBLSyntaxFile;
    135 #endif
    136 #if REF_IDX_FRAMEWORK
    137   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture
    138136#endif
    139137
    … …  
    209207  Int       getBLHeight() { return  m_iBLSourceHeight; }
    210208#endif
     209  Void      xInitILRP(TComSPS *pcSPS);
     210  Void      setILRPic(TComPic *pcPic);
    211211#endif
    212212#if AVC_SYNTAX || SYNTAX_OUTPUT
    213213  Void      setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; }
    214214  fstream* getBLSyntaxFile() { return m_pBLSyntaxFile; }
    215 #endif
    216 #if REF_IDX_FRAMEWORK
    217   Void      xInitILRP(TComSPS *pcSPS);
    218   Void      setILRPic(TComPic *pcPic);
    219215#endif
    220216

  • 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.