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


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/Lib/TLibCommon
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.