Changeset 1203 in SHVCSoftware


Ignore:
Timestamp:
8 Jul 2015, 20:57:55 (10 years ago)
Author:
seregin
Message:

macro cleanup: REPN_FORMAT_IN_VPS

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

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

    r1179 r1203  
    9595#if AVC_BASE
    9696  ("BLReconFile,-ibl",    cfg_BLReconFile,  string(""), "BL reconstructed YUV input file name")
    97 #if !REPN_FORMAT_IN_VPS
    98   ("BLSourceWidth,-wdt",    m_iBLSourceWidth,        0, "BL source picture width")
    99   ("BLSourceHeight,-hgt",   m_iBLSourceHeight,       0, "BL source picture height")
    100 #endif
    10197#endif
    10298  ("TargetLayerId,-lid", targetLayerId, -1, "Target layer id")

  • branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h

    r1177 r1203  
    8484#if AVC_BASE
    8585  Char*         m_pchBLReconFile;                     ///< input BL reconstruction file name
    86 #if !REPN_FORMAT_IN_VPS
    87   Int           m_iBLSourceWidth;
    88   Int           m_iBLSourceHeight;
    89 #endif
    9086#endif
    9187  CommonDecoderParams             m_commonDecoderParams;
    … …  
    113109#if Q0074_COLOUR_REMAPPING_SEI
    114110  , m_colourRemapSEIEnabled(0)
    115 #endif
    116 #if SVC_EXTENSION
    117 #if AVC_BASE && !REPN_FORMAT_IN_VPS
    118   , m_iBLSourceWidth(0)
    119   , m_iBLSourceHeight(0)
    120 #endif
    121111#endif
    122112  , m_respectDefDispWindow(0)

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

    r1200 r1203  
    796796          if (display)
    797797          {           
    798 #if REPN_FORMAT_IN_VPS
    799798            UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    800799            Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    … …  
    806805              conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
    807806              conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset(), NUM_CHROMA_FORMAT, isTff );
    808 #else
    809             m_acTVideoIOYuvReconFile[layerId].write( pcPicTop->getPicYuvRec(), pcPicBottom->getPicYuvRec(),
    810               m_outputColourSpaceConvert,
    811               conf.getWindowLeftOffset()   + defDisp.getWindowLeftOffset(),
    812               conf.getWindowRightOffset()  + defDisp.getWindowRightOffset(),
    813               conf.getWindowTopOffset()    + defDisp.getWindowTopOffset(),
    814               conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset(), NUM_CHROMA_FORMAT, isTff );
    815 #endif
    816807          }
    817808        }
    … …  
    915906          const Window &conf = pcPic->getConformanceWindow();
    916907          const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();         
    917 #if REPN_FORMAT_IN_VPS
     908
    918909          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    919910          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    … …  
    924915            conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
    925916            conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
    926 #else
    927           m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(), m_outputColourSpaceConvert,
    928             conf.getWindowLeftOffset()   + defDisp.getWindowLeftOffset(),
    929             conf.getWindowRightOffset()  + defDisp.getWindowRightOffset(),
    930             conf.getWindowTopOffset()    + defDisp.getWindowTopOffset(),
    931             conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset() );
    932 #endif
    933917        }
    934918
    … …  
    10511035          const Window &defDisp = m_respectDefDispWindow ? pcPicTop->getDefDisplayWindow() : Window();
    10521036          const Bool isTff = pcPicTop->isTopField();         
    1053 #if REPN_FORMAT_IN_VPS
     1037
    10541038          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    10551039          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    … …  
    10601044            conf.getWindowTopOffset()   *yScal + defDisp.getWindowTopOffset(),
    10611045            conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset(), NUM_CHROMA_FORMAT, isTff );
    1062 #else
    1063           m_acTVideoIOYuvReconFile[layerId].write( pcPicTop->getPicYuvRec(), pcPicBottom->getPicYuvRec(), m_outputColourSpaceConvert,
    1064             conf.getWindowLeftOffset()   + defDisp.getWindowLeftOffset(),
    1065             conf.getWindowRightOffset()  + defDisp.getWindowRightOffset(),
    1066             conf.getWindowTopOffset()    + defDisp.getWindowTopOffset(),
    1067             conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset(), NUM_CHROMA_FORMAT, isTff );
    1068 #endif
    10691046        }
    10701047
    … …  
    11541131          const Window &conf = pcPic->getConformanceWindow();
    11551132          const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();         
    1156 #if REPN_FORMAT_IN_VPS
     1133
    11571134          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    11581135          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    … …  
    11631140            conf.getWindowTopOffset()   *yScal + defDisp.getWindowTopOffset(),
    11641141            conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset() );
    1165 #else
    1166           m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(), m_outputColourSpaceConvert,
    1167             conf.getWindowLeftOffset()   + defDisp.getWindowLeftOffset(),
    1168             conf.getWindowRightOffset()  + defDisp.getWindowRightOffset(),
    1169             conf.getWindowTopOffset()    + defDisp.getWindowTopOffset(),
    1170             conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset() );
    1171 #endif
    11721142        }
    11731143
    … …  
    13001270    const Window &defDisp = m_respectDefDispWindow ? pic->getDefDisplayWindow() : Window();
    13011271    Int xScal =  1, yScal = 1;
    1302 #if REPN_FORMAT_IN_VPS
     1272
    13031273    UInt chromaFormatIdc = pic->getSlice(0)->getChromaFormatIdc();
    13041274    xScal = TComSPS::getWinUnitX( chromaFormatIdc );
    13051275    yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    1306 #endif
     1276
    13071277    TComPicYuv* pPicCYuvRec = pic->getPicYuvRec();
    13081278    m_acTVideoIOYuvReconFile[layerId].write( pPicCYuvRec, m_outputColourSpaceConvert,
    … …  
    16551625        const Window &defDisp = m_respectDefDispWindow ? checkPic.getDefDisplayWindow() : Window();
    16561626        Int xScal = 1, yScal = 1;
    1657   #if REPN_FORMAT_IN_VPS
     1627 
    16581628        UInt chromaFormatIdc = checkPic.getSlice(0)->getChromaFormatIdc();
    16591629        xScal = TComSPS::getWinUnitX( chromaFormatIdc );
    16601630        yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    1661   #endif
     1631 
    16621632        if( checkPic.getPOC() <= pocValue )
    16631633        {

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

    r1202 r1203  
    737737  Double* cfg_fQP            [MAX_LAYERS];
    738738  Int*    cfg_layerId        [MAX_LAYERS];
    739 #if REPN_FORMAT_IN_VPS
    740739  Int*    cfg_repFormatIdx  [MAX_LAYERS];
    741 #endif
    742740  Int*    cfg_SourceWidth   [MAX_LAYERS];
    743741  Int*    cfg_SourceHeight  [MAX_LAYERS];
    … …  
    848846    cfg_colourRemapSEIFileRoot[layer] = &m_acLayerCfg[layer].m_colourRemapSEIFileRoot;
    849847#endif
    850 #if REPN_FORMAT_IN_VPS
    851     cfg_repFormatIdx[layer] = &m_acLayerCfg[layer].m_repFormatIdx;
    852 #endif
     848    cfg_repFormatIdx[layer]         = &m_acLayerCfg[layer].m_repFormatIdx;
    853849    cfg_layerId[layer]              = &m_acLayerCfg[layer].m_layerId;
    854850    cfg_SourceWidth[layer]          = &m_acLayerCfg[layer].m_iSourceWidth;
    … …  
    10411037  ("FrameRate%d,-fr%d",                             cfg_FrameRate,                               0, MAX_LAYERS, "Frame rate for layer %d")
    10421038  ("LambdaModifier%d,-LM%d",                        m_adLambdaModifier,                Double(1.0), MAX_TLAYER, "Lambda modifier for temporal layer %d")
    1043 #if REPN_FORMAT_IN_VPS
    10441039  ("RepFormatIdx%d",                                cfg_repFormatIdx,                           -1, MAX_LAYERS, "Index to the representation format structure used from the VPS")
    1045 #endif
    10461040  ("LayerId%d",                                     cfg_layerId,                                -1, MAX_LAYERS,  "Layer id")
    10471041

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

    r1201 r1203  
    472472  Int       m_adaptiveResolutionChange;                       ///< Indicate adaptive resolution change frame
    473473  Bool      m_skipPictureAtArcSwitch;                         ///< Indicates that when ARC up-switching is performed the higher layer picture is a skip picture
    474 #if REPN_FORMAT_IN_VPS
     474
    475475  RepFormatCfg m_repFormatCfg[16];                            ///< Rep_format structures
    476 #endif
    477476#if N0383_IL_CONSTRAINED_TILE_SETS_SEI
    478477  Bool      m_interLayerConstrainedTileSetsSEIEnabled;
    … …  
    557556  Void cfgStringToArrayNumEntries(Int **arr, string const cfgString, Int &numEntries, const char* logString);
    558557
    559 #if REPN_FORMAT_IN_VPS
    560558  RepFormatCfg* getRepFormatCfg(Int i)  { return &m_repFormatCfg[i]; }
    561 #endif
    562559#if LAYER_CTB
    563560  Bool getUsePCM()                  { return m_usePCM;               }

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp

    r1200 r1203  
    4545  m_cReconFile(string("")),
    4646  m_conformanceMode( 0 ),
    47   m_aidQP(NULL)
    48 #if REPN_FORMAT_IN_VPS
    49 , m_repFormatIdx (-1)
    50 #endif
     47  m_aidQP(NULL),
     48  m_repFormatIdx (-1)
    5149#if Q0074_COLOUR_REMAPPING_SEI
    5250,  m_colourRemapSEIFileRoot(string(""))
    … …  
    214212  printf("Input File                        : %s\n", m_cInputFile.c_str()  );
    215213  printf("Reconstruction File               : %s\n", m_cReconFile.c_str()  );
    216 #if REPN_FORMAT_IN_VPS
     214#if SVC_EXTENSION
    217215  printf("Real     Format                   : %dx%d %dHz\n", m_iSourceWidth - ( m_confWinLeft + m_confWinRight ) * TComSPS::getWinUnitX( m_chromaFormatIDC ), m_iSourceHeight - ( m_confWinTop + m_confWinBottom ) * TComSPS::getWinUnitY( m_chromaFormatIDC ), m_iFrameRate );
    218216#else
    … …  
    314312        m_aiPad[0] = m_confWinRight  = ((m_iSourceWidth / minCuSize) + 1) * minCuSize - m_iSourceWidth;
    315313        m_iSourceWidth  += m_confWinRight;
    316 #if REPN_FORMAT_IN_VPS
     314#if SVC_EXTENSION
    317315        m_confWinRight /= TComSPS::getWinUnitX( m_chromaFormatIDC );
    318316#endif
    … …  
    327325          m_aiPad[1] = m_confWinBottom << 1;
    328326        }
    329 #if REPN_FORMAT_IN_VPS
     327#if SVC_EXTENSION
    330328        m_confWinBottom /= TComSPS::getWinUnitY( m_chromaFormatIDC );
    331329#endif
    … …  
    346344      m_confWinRight  = m_aiPad[0];
    347345      m_confWinBottom = m_aiPad[1];
    348 #if REPN_FORMAT_IN_VPS
     346#if SVC_EXTENSION
    349347      m_confWinRight /= TComSPS::getWinUnitX( m_chromaFormatIDC );
    350348      m_confWinBottom /= TComSPS::getWinUnitY( m_chromaFormatIDC );
    … …  
    429427  xConfirmPara( m_aiPad[1] % TComSPS::getWinUnitY(CHROMA_420) != 0, "Vertical padding must be an integer multiple of the specified chroma subsampling");
    430428
    431 #if !REPN_FORMAT_IN_VPS
     429#if !SVC_EXTENSION
    432430  xConfirmPara( m_confLeft   % TComSPS::getWinUnitX(CHROMA_420) != 0, "Left conformance window offset must be an integer multiple of the specified chroma subsampling");
    433431  xConfirmPara( m_confRight  % TComSPS::getWinUnitX(CHROMA_420) != 0, "Right conformance window offset must be an integer multiple of the specified chroma subsampling");

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

    r1182 r1203  
    118118  Bool      m_useHighPrecisionPredictionWeighting;
    119119
    120 #if REPN_FORMAT_IN_VPS
    121120  Int       m_repFormatIdx;
    122 #endif
    123121#if Q0074_COLOUR_REMAPPING_SEI
    124122  string    m_colourRemapSEIFileRoot;                           ///< Colour Remapping Information SEI message parameters file
    … …  
    206204  Bool    getRCForceIntraQP()         {return m_RCForceIntraQP;        }
    207205#endif
    208 #if REPN_FORMAT_IN_VPS
    209206  Int     getRepFormatIdx()           { return m_repFormatIdx;  }
    210207  Void    setRepFormatIdx(Int x)      { m_repFormatIdx = x;     }
    211208  Void    setSourceWidth(Int x)       { m_iSourceWidth = x;     }
    212209  Void    setSourceHeight(Int x)      { m_iSourceHeight = x;    }
    213 #endif
    214210  Int     getMaxTidIlRefPicsPlus1()   { return m_maxTidIlRefPicsPlus1; }
    215211#if LAYER_CTB

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

    r1201 r1203  
    9393  }
    9494
    95 #if REPN_FORMAT_IN_VPS 
    9695  Int maxRepFormatIdx = -1;
    9796  Int formatIdx = -1;
    … …  
    183182    m_acTEncTop[mapIdxToLayer[idx]].setSkipPictureAtArcSwitch             ( m_skipPictureAtArcSwitch );
    184183  }
     184
    185185  delete [] mapIdxToLayer;
    186 #endif
    187186
    188187  //Populate PTL in VPS
    … …  
    21982197Void TAppEncTop::xWriteRecon(UInt layer, Int iNumEncoded)
    21992198{
    2200 #if REPN_FORMAT_IN_VPS
     2199#if SVC_EXTENSION
    22012200  ChromaFormat chromaFormatIdc = m_acLayerCfg[layer].getChromaFormatIDC();
    22022201  Int xScal = TComSPS::getWinUnitX( chromaFormatIdc );
    … …  
    22242223      if( !m_acLayerCfg[layer].getReconFile().empty() && pcPicYuvRecTop->isReconstructed() && pcPicYuvRecBottom->isReconstructed() )
    22252224      {
    2226 #if REPN_FORMAT_IN_VPS
     2225#if SVC_EXTENSION
    22272226        m_acTVideoIOYuvReconFile[layer].write( pcPicYuvRecTop, pcPicYuvRecBottom, ipCSC, m_acLayerCfg[layer].getConfWinLeft() * xScal, m_acLayerCfg[layer].getConfWinRight() * xScal,
    22282227          m_acLayerCfg[layer].getConfWinTop() * yScal, m_acLayerCfg[layer].getConfWinBottom() * yScal, NUM_CHROMA_FORMAT, m_isTopFieldFirst );
    … …  
    22492248      if( !m_acLayerCfg[layer].getReconFile().empty() && pcPicYuvRec->isReconstructed() )
    22502249      {
    2251 #if REPN_FORMAT_IN_VPS
     2250#if SVC_EXTENSION
    22522251        m_acTVideoIOYuvReconFile[layer].write( pcPicYuvRec, ipCSC, m_acLayerCfg[layer].getConfWinLeft() * xScal, m_acLayerCfg[layer].getConfWinRight() * xScal,
    22532252          m_acLayerCfg[layer].getConfWinTop() * yScal, m_acLayerCfg[layer].getConfWinBottom() * yScal );

  • branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp

    r1147 r1203  
    326326  TComSlice * pcSlice = pcPic->getSlice(pcPic->getCurrSliceIdx());
    327327
    328 #if REPN_FORMAT_IN_VPS
     328#if SVC_EXTENSION
    329329  const UInt picWidth = pcSlice->getPicWidthInLumaSamples();
    330330  const UInt picHeight = pcSlice->getPicHeightInLumaSamples();
    … …  
    11491149  const UInt numPartInCtuWidth = m_pcPic->getNumPartInCtuWidth();
    11501150 
    1151 #if REPN_FORMAT_IN_VPS
     1151#if SVC_EXTENSION
    11521152  if( ( m_pcPic->getCtu(m_ctuRsAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxRT] + m_pcPic->getMinCUWidth() ) >= m_pcSlice->getPicWidthInLumaSamples() )
    11531153#else
    … …  
    12091209  UInt uiAbsZorderCUIdxLB = g_auiZscanToRaster[ m_absZIdxInCtu ] + (m_puhHeight[0] / m_pcPic->getMinCUHeight() - 1)*numPartInCtuWidth;
    12101210
    1211 #if REPN_FORMAT_IN_VPS
     1211#if SVC_EXTENSION
    12121212  if( ( m_pcPic->getCtu(m_ctuRsAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxLB] + m_pcPic->getMinCUHeight() ) >= m_pcSlice->getPicHeightInLumaSamples() )
    12131213#else
    … …  
    12571257  UInt uiAbsZorderCUIdxLB = g_auiZscanToRaster[ m_absZIdxInCtu ] + ((m_puhHeight[0] / m_pcPic->getMinCUHeight()) - 1)*numPartInCtuWidth;
    12581258 
    1259 #if REPN_FORMAT_IN_VPS
     1259#if SVC_EXTENSION
    12601260  if( ( m_pcPic->getCtu(m_ctuRsAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxLB] + (m_pcPic->getPicSym()->getMinCUHeight() * uiPartUnitOffset)) >= m_pcSlice->getPicHeightInLumaSamples())
    12611261#else
    … …  
    13051305  const UInt numPartInCtuWidth = m_pcPic->getNumPartInCtuWidth();
    13061306 
    1307 #if REPN_FORMAT_IN_VPS
     1307#if SVC_EXTENSION
    13081308  if( ( m_pcPic->getCtu(m_ctuRsAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxRT] + (m_pcPic->getPicSym()->getMinCUHeight() * uiPartUnitOffset)) >= m_pcSlice->getPicWidthInLumaSamples() )
    13091309#else
    … …  
    25112511    Int ctuRsAddr = -1;
    25122512
    2513 #if REPN_FORMAT_IN_VPS
     2513#if SVC_EXTENSION
    25142514    if (   ( ( m_pcPic->getCtu(m_ctuRsAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdxTmp] + m_pcPic->getMinCUWidth () ) < m_pcSlice->getPicWidthInLumaSamples() )  // image boundary check
    25152515        && ( ( m_pcPic->getCtu(m_ctuRsAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdxTmp] + m_pcPic->getMinCUHeight() ) < m_pcSlice->getPicHeightInLumaSamples() ) )
    … …  
    28532853    uiAbsPartIdx = g_auiZscanToRaster[uiPartIdxRB];
    28542854    Int ctuRsAddr = -1;
    2855 #if REPN_FORMAT_IN_VPS
     2855
     2856#if SVC_EXTENSION
    28562857    if (  ( ( m_pcPic->getCtu(m_ctuRsAddr)->getCUPelX() + g_auiRasterToPelX[uiAbsPartIdx] + m_pcPic->getMinCUWidth () ) < m_pcSlice->getPicWidthInLumaSamples())   // image boundary check
    28572858       && ( ( m_pcPic->getCtu(m_ctuRsAddr)->getCUPelY() + g_auiRasterToPelY[uiAbsPartIdx] + m_pcPic->getMinCUHeight() ) < m_pcSlice->getPicHeightInLumaSamples() ) )   
    … …  
    29302931  Int  iMvShift = 2;
    29312932  Int iOffset = 8;
    2932 #if REPN_FORMAT_IN_VPS
     2933#if SVC_EXTENSION
    29332934  Int iHorMax = ( m_pcSlice->getPicWidthInLumaSamples() + iOffset - m_uiCUPelX - 1 ) << iMvShift;
    29342935#else
    … …  
    29372938  Int iHorMin = (       -(Int)g_uiMaxCUWidth - iOffset - (Int)m_uiCUPelX + 1 ) << iMvShift;
    29382939 
    2939 #if REPN_FORMAT_IN_VPS
     2940#if SVC_EXTENSION
    29402941  Int iVerMax = ( m_pcSlice->getPicHeightInLumaSamples() + iOffset - m_uiCUPelY - 1 ) << iMvShift;
    29412942#else

  • branches/SHM-dev/source/Lib/TLibCommon/TComLoopFilter.cpp

    r1029 r1203  
    181181      UInt uiLPelX   = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsZorderIdx] ];
    182182      UInt uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsZorderIdx] ];
    183 #if REPN_FORMAT_IN_VPS
     183#if SVC_EXTENSION
    184184      if( ( uiLPelX < pcCU->getSlice()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcCU->getSlice()->getPicHeightInLumaSamples() ) )
    185185#else

  • branches/SHM-dev/source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp

    r1029 r1203  
    668668      UInt uiLPelX   = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsZorderIdx] ];
    669669      UInt uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsZorderIdx] ];
    670 #if REPN_FORMAT_IN_VPS
     670#if SVC_EXTENSION
    671671      if( ( uiLPelX < pcCU->getSlice()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcCU->getSlice()->getPicHeightInLumaSamples() ) )
    672672#else

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

    r1200 r1203  
    19321932, m_bitRatePresentVpsFlag     (false)
    19331933, m_picRatePresentVpsFlag     (false)
    1934 #if REPN_FORMAT_IN_VPS
    19351934, m_repFormatIdxPresentFlag   (false)
    19361935, m_vpsNumRepFormats          (1)
    1937 #endif
    19381936, m_viewIdLen                (0)
    19391937, m_vpsNonVuiExtLength (0)
    … …  
    20092007  }
    20102008
    2011   ::memset(m_bitRatePresentFlag, 0, sizeof(m_bitRatePresentFlag));
    2012   ::memset(m_picRatePresentFlag, 0, sizeof(m_picRatePresentFlag));
    2013   ::memset(m_avgBitRate        , 0, sizeof(m_avgBitRate)        );
    2014   ::memset(m_maxBitRate        , 0, sizeof(m_maxBitRate)        );
    2015   ::memset(m_constPicRateIdc   , 0, sizeof(m_constPicRateIdc)   );
    2016   ::memset(m_avgPicRate        , 0, sizeof(m_avgPicRate)        );
    2017 #if REPN_FORMAT_IN_VPS
    2018   ::memset( m_vpsRepFormatIdx, 0, sizeof(m_vpsRepFormatIdx) );
    2019 #endif
    2020   ::memset(m_viewIdVal, 0, sizeof(m_viewIdVal));
     2009  ::memset( m_bitRatePresentFlag, 0, sizeof(m_bitRatePresentFlag) );
     2010  ::memset( m_picRatePresentFlag, 0, sizeof(m_picRatePresentFlag) );
     2011  ::memset( m_avgBitRate        , 0, sizeof(m_avgBitRate)         );
     2012  ::memset( m_maxBitRate        , 0, sizeof(m_maxBitRate)         );
     2013  ::memset( m_constPicRateIdc   , 0, sizeof(m_constPicRateIdc)    );
     2014  ::memset( m_avgPicRate        , 0, sizeof(m_avgPicRate)         );
     2015  ::memset( m_vpsRepFormatIdx   , 0, sizeof(m_vpsRepFormatIdx)    );
     2016  ::memset( m_viewIdVal         , 0, sizeof(m_viewIdVal))         ;
    20212017
    20222018  for( Int i = 0; i < MAX_NUM_LAYER_IDS; i++ )
    … …  
    21152111, m_extensionFlag             ( false )
    21162112, m_bV1CompatibleSPSFlag      (  0)
    2117 #if REPN_FORMAT_IN_VPS
    21182113, m_updateRepFormatFlag       (false)
    21192114, m_updateRepFormatIndex      (0)
    2120 #endif
    21212115#if SCALINGLIST_INFERRING
    21222116, m_inferScalingListFlag ( false )
    … …  
    35073501}
    35083502
    3509 #if REPN_FORMAT_IN_VPS
    35103503UInt TComSlice::getPicWidthInLumaSamples()
    35113504{
    … …  
    35733566#endif
    35743567
    3575   if ( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
     3568  if( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
    35763569  {
    35773570    if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
    … …  
    35983591  UInt retVal, layerId = getLayerId();
    35993592
    3600   if ( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
     3593  if( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
    36013594  {
    36023595    if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
    … …  
    36233616  UInt retVal, layerId = getLayerId();
    36243617
    3625   if ( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
     3618  if( layerId == 0 || sps->getV1CompatibleSPSFlag() == 1 )
    36263619  {
    36273620    if( layerId == 0 && vps->getNonHEVCBaseLayerFlag() )
    … …  
    36873680, m_bitDepthVpsChroma           (0)
    36883681{}
    3689 #endif //REPN_FORMAT_IN_VPS
    36903682
    36913683Void TComPTL::copyProfileInfo(TComPTL *ptl)

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

    r1201 r1203  
    508508};
    509509
    510 #if REPN_FORMAT_IN_VPS
     510#if SVC_EXTENSION
    511511class RepFormat
    512512{
    … …  
    558558  Void    setConformanceWindowVps(Window& conformanceWindow ) { m_conformanceWindowVps = conformanceWindow; }
    559559};
    560 #endif //REPN_FORMAT_IN_VPS
     560#endif
    561561
    562562class TComVPS
    … …  
    682682  Bool       m_altOutputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1 + 2*MAX_NUM_ADD_LAYER_SETS];
    683683
    684 #if REPN_FORMAT_IN_VPS
    685684  Bool       m_repFormatIdxPresentFlag;
    686685  Int        m_vpsNumRepFormats;            // coded as minus1
    687686  RepFormat  m_vpsRepFormat[16];
    688687  Int        m_vpsRepFormatIdx[16];
    689 #endif
     688
    690689  Int        m_viewIdLen;
    691690  Int        m_viewIdVal                [MAX_LAYERS];
    … …  
    10511050  Void     setBspHrdIdx(Int  i, Int j, Int k, Int l, Int m, Int val)            { m_bspHrdIdx[i][j][k][l][m] = val; }
    10521051#endif
    1053   Void   setBaseLayerPSCompatibilityFlag (Int layer, int val)   { m_baseLayerPSCompatibilityFlag[layer] = val; }
    1054   Int    getBaseLayerPSCompatibilityFlag (Int layer)            { return m_baseLayerPSCompatibilityFlag[layer];}
    1055   Bool   getAltOuputLayerFlag(Int idx)                          { return m_altOutputLayerFlag[idx]; }
    1056   Void   setAltOuputLayerFlag(Int idx, Bool x)                  { m_altOutputLayerFlag[idx] = x;    }
    1057 
    1058 #if REPN_FORMAT_IN_VPS
    1059   Bool   getRepFormatIdxPresentFlag()       { return m_repFormatIdxPresentFlag; }
    1060   Void   setRepFormatIdxPresentFlag(Bool x) { m_repFormatIdxPresentFlag = x;    }
    1061 
    1062   Int    getVpsNumRepFormats()              { return m_vpsNumRepFormats;        }
    1063   Void   setVpsNumRepFormats(Int x)         { m_vpsNumRepFormats = x;           }
    1064 
    1065   RepFormat* getVpsRepFormat(Int idx)       { return &m_vpsRepFormat[idx];      }
    1066 
    1067   Int    getVpsRepFormatIdx(Int idx)        { return m_vpsRepFormatIdx[idx];    }
    1068   Void   setVpsRepFormatIdx(Int idx, Int x) { m_vpsRepFormatIdx[idx] = x;       }         
    1069 #endif
    1070 
    1071   Void   setViewIdLen( Int  val )                                   { m_viewIdLen = val;  }
    1072   Int    getViewIdLen(  )                                           { return m_viewIdLen; }
    1073 
    1074   Void   setViewIdVal( Int viewOrderIndex, Int  val )               { m_viewIdVal[viewOrderIndex] = val;  }
    1075   Int    getViewIdVal( Int viewOrderIndex )                         { return m_viewIdVal[viewOrderIndex]; }
     1052  Void   setBaseLayerPSCompatibilityFlag (Int layer, int val)                   { m_baseLayerPSCompatibilityFlag[layer] = val; }
     1053  Int    getBaseLayerPSCompatibilityFlag (Int layer)                            { return m_baseLayerPSCompatibilityFlag[layer];}
     1054  Bool   getAltOuputLayerFlag(Int idx)                                          { return m_altOutputLayerFlag[idx]; }
     1055  Void   setAltOuputLayerFlag(Int idx, Bool x)                                  { m_altOutputLayerFlag[idx] = x;    }
     1056
     1057  Bool   getRepFormatIdxPresentFlag()                                           { return m_repFormatIdxPresentFlag; }
     1058  Void   setRepFormatIdxPresentFlag(Bool x)                                     { m_repFormatIdxPresentFlag = x;    }
     1059
     1060  Int    getVpsNumRepFormats()                                                  { return m_vpsNumRepFormats;        }
     1061  Void   setVpsNumRepFormats(Int x)                                             { m_vpsNumRepFormats = x;           }
     1062
     1063  RepFormat* getVpsRepFormat(Int idx)                                           { return &m_vpsRepFormat[idx];      }
     1064
     1065  Int    getVpsRepFormatIdx(Int idx)                                            { return m_vpsRepFormatIdx[idx];    }
     1066  Void   setVpsRepFormatIdx(Int idx, Int x)                                     { m_vpsRepFormatIdx[idx] = x;       }         
     1067
     1068  Void   setViewIdLen( Int  val )                                               { m_viewIdLen = val;  }
     1069  Int    getViewIdLen(  )                                                       { return m_viewIdLen; }
     1070
     1071  Void   setViewIdVal( Int viewOrderIndex, Int  val )                           { m_viewIdVal[viewOrderIndex] = val;  }
     1072  Int    getViewIdVal( Int viewOrderIndex )                                     { return m_viewIdVal[viewOrderIndex]; }
    10761073  Int    getScalabilityId(Int, ScalabilityType scalType );
    10771074
    1078   Int    getViewIndex    ( Int layerIdInNuh )                       { return getScalabilityId( getLayerIdxInVps(layerIdInNuh), VIEW_ORDER_INDEX  ); }   
     1075  Int    getViewIndex    ( Int layerIdInNuh )                                   { return getScalabilityId( getLayerIdxInVps(layerIdInNuh), VIEW_ORDER_INDEX  ); }   
    10791076
    10801077  Int    getNumViews();
    … …  
    13761373  Bool        m_multiLayerExtSpsFlag;
    13771374  Int         m_NumDirectRefLayers;
    1378 #if REPN_FORMAT_IN_VPS
    13791375  Bool        m_updateRepFormatFlag;
    13801376  UInt        m_updateRepFormatIndex;
    1381 #endif
    13821377#if SCALINGLIST_INFERRING
    13831378  Bool        m_inferScalingListFlag;
    … …  
    15481543  Int      getNumDirectRefLayers()                  { return  m_NumDirectRefLayers;  }
    15491544  Void     setNumDirectRefLayers(Int n)             {  m_NumDirectRefLayers = n;     }
    1550 #if REPN_FORMAT_IN_VPS
    15511545  Bool     getUpdateRepFormatFlag()                 { return m_updateRepFormatFlag;   }
    15521546  Void     setUpdateRepFormatFlag(Bool x)           { m_updateRepFormatFlag = x;      }
    15531547  Int      getUpdateRepFormatIndex()                { return m_updateRepFormatIndex;  }
    15541548  Void     setUpdateRepFormatIndex(UInt index)      { m_updateRepFormatIndex = index; }
    1555 #endif
    15561549#if SCALINGLIST_INFERRING
    15571550  Bool     getInferScalingListFlag()                { return m_inferScalingListFlag;  }
    … …  
    23432336  Int       getNumNegativeRpsCurrTempList();
    23442337
    2345 #if REPN_FORMAT_IN_VPS
    23462338  UInt getPicWidthInLumaSamples();
    23472339  UInt getPicHeightInLumaSamples();
    … …  
    23572349
    23582350  Window& getConformanceWindow();
    2359 #endif
    23602351
    23612352  Void setILRPic(TComPic **pcIlpPic);

  • branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp

    r1029 r1203  
    112112  }
    113113
    114 #if REPN_FORMAT_IN_VPS
     114#if SVC_EXTENSION
    115115  TComSlice* slice = const_cast<TComSlice*> (cu.getSlice());
    116116#endif
    … …  
    118118  *this = QpParam(cu.getQP( 0 ),
    119119                  toChannelType(compID),
    120 #if REPN_FORMAT_IN_VPS
     120#if SVC_EXTENSION
    121121                  isLuma(compID) ? slice->getQpBDOffsetY() : slice->getQpBDOffsetC(),
    122122#else

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

    r1202 r1203  
    7878#endif
    7979#define POC_RESET_INFO_INFERENCE         1      ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present
    80 #define REPN_FORMAT_IN_VPS               1      ///< JCTVC-N0092: Signal represenation format (spatial resolution, bit depth, colour format) in the VPS
    8180#define SCALINGLIST_INFERRING            1      ///< JCTVC-N0371: inter-layer scaling list
    8281

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

    r1200 r1203  
    738738  {
    739739    Window &conf = pcSPS->getConformanceWindow();
    740 #if REPN_FORMAT_IN_VPS
     740#if SVC_EXTENSION
    741741    READ_UVLC(   uiCode, "conf_win_left_offset" );               conf.setWindowLeftOffset  ( uiCode );
    742742    READ_UVLC(   uiCode, "conf_win_right_offset" );              conf.setWindowRightOffset ( uiCode );
    … …  
    11881188    pcSlice->setDependentSliceSegmentFlag(false);
    11891189  }
    1190 #if REPN_FORMAT_IN_VPS
     1190#if SVC_EXTENSION
    11911191  Int numCTUs = ((pcSlice->getPicWidthInLumaSamples()+sps->getMaxCUWidth()-1)/sps->getMaxCUWidth())*((pcSlice->getPicHeightInLumaSamples()+sps->getMaxCUHeight()-1)/sps->getMaxCUHeight());
    11921192#else
    … …  
    17891789    pcSlice->setSliceQp (26 + pps->getPicInitQPMinus26() + iCode);
    17901790
    1791 #if REPN_FORMAT_IN_VPS
     1791#if SVC_EXTENSION
    17921792    g_bitDepthLayer[CHANNEL_TYPE_LUMA][pcSlice->getLayerId()] = pcSlice->getBitDepthY();
    17931793    g_bitDepthLayer[CHANNEL_TYPE_CHROMA][pcSlice->getLayerId()] = pcSlice->getBitDepthC();
    … …  
    23362336#endif
    23372337
    2338 #if REPN_FORMAT_IN_VPS
     2338#if SVC_EXTENSION
    23392339  Int qpBdOffsetY = pcCU->getSlice()->getQpBDOffsetY();
    23402340#else
    … …  
    29572957  vps->checkNecessaryLayerFlagCondition(); 
    29582958
    2959 #if REPN_FORMAT_IN_VPS
    29602959  READ_UVLC( uiCode, "vps_num_rep_formats_minus1" );
    29612960  vps->setVpsNumRepFormats( uiCode + 1 );
    … …  
    30053004    }
    30063005  }
    3007 #endif
    30083006
    30093007  READ_FLAG(uiCode, "max_one_active_ref_layer_flag" );
    … …  
    31833181}
    31843182
    3185 #if REPN_FORMAT_IN_VPS
    31863183Void  TDecCavlc::parseRepFormat( RepFormat *repFormat, RepFormat *repFormatPrev )
    31873184{
    … …  
    32353232  }
    32363233}
    3237 #endif //REPN_FORMAT_IN_VPS
     3234
    32383235#if VPS_DPB_SIZE_TABLE
    32393236Void TDecCavlc::parseVpsDpbSizeTable( TComVPS *vps )

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.h

    r1185 r1203  
    132132  Void  parseVPSVUI         ( TComVPS* pcVPS );
    133133  Void  defaultVPSVUI       ( TComVPS* pcVPS );
    134 #if REPN_FORMAT_IN_VPS
    135134  Void  parseRepFormat      ( RepFormat *repFormat, RepFormat *repFormatPrev );
    136 #endif
    137135#if VPS_DPB_SIZE_TABLE
    138136  Void  parseVpsDpbSizeTable( TComVPS *vps );

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

    r1128 r1203  
    222222
    223223  TComSlice * pcSlice = pcCU->getPic()->getSlice(pcCU->getPic()->getCurrSliceIdx());
    224 #if REPN_FORMAT_IN_VPS
     224
     225#if SVC_EXTENSION
    225226  if( ( uiRPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) )
    226227#else
    … …  
    254255      uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiIdx] ];
    255256
    256 #if REPN_FORMAT_IN_VPS
     257#if SVC_EXTENSION
    257258      if ( !isLastCtuOfSliceSegment && ( uiLPelX < pcCU->getSlice()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcCU->getSlice()->getPicHeightInLumaSamples() ) )
    258259#else
    … …  
    406407  TComSlice * pcSlice = pCtu->getPic()->getSlice(pCtu->getPic()->getCurrSliceIdx());
    407408
    408 #if REPN_FORMAT_IN_VPS
     409#if SVC_EXTENSION
    409410  if( ( uiRPelX >= pcSlice->getPicWidthInLumaSamples() ) || ( uiBPelY >= pcSlice->getPicHeightInLumaSamples() ) )
    410 
    411411#else
    412412  if( ( uiRPelX >= pcSlice->getSPS()->getPicWidthInLumaSamples() ) || ( uiBPelY >= pcSlice->getSPS()->getPicHeightInLumaSamples() ) )
    … …  
    426426      uiTPelY = pCtu->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiIdx] ];
    427427
    428 #if REPN_FORMAT_IN_VPS
     428#if SVC_EXTENSION
    429429      if( ( uiLPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiTPelY < pcSlice->getPicHeightInLumaSamples() ) )
    430430#else

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecSbac.cpp

    r1029 r1203  
    946946  {
    947947    UInt uiSign;
    948 #if REPN_FORMAT_IN_VPS
     948#if SVC_EXTENSION
    949949    Int qpBdOffsetY = pcCU->getSlice()->getQpBDOffsetY();
    950950#else

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

    r1200 r1203  
    288288    }
    289289
    290 #if REPN_FORMAT_IN_VPS
    291290    rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    292291                     conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    293 #else
    294     rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    295                      conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    296 #endif
    297 
    298292#else //SVC_EXTENSION
    299293    rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    … …  
    345339  }
    346340
    347 #if REPN_FORMAT_IN_VPS
    348341  rpcPic->create ( pcSlice->getPicWidthInLumaSamples(), pcSlice->getPicHeightInLumaSamples(), pcSlice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    349342                   conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    350 #else
    351   rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    352                    conformanceWindow, defaultDisplayWindow, numReorderPics, pcSlice->getSPS(), true);
    353 #endif
    354343#else  //SVC_EXTENSION
    355344  rpcPic->create ( pcSlice->getSPS()->getPicWidthInLumaSamples(), pcSlice->getSPS()->getPicHeightInLumaSamples(), pcSlice->getSPS()->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth,
    … …  
    652641  for (UInt channel = 0; channel < MAX_NUM_CHANNEL_TYPE; channel++)
    653642  {
    654 #if REPN_FORMAT_IN_VPS
     643#if SVC_EXTENSION
    655644    g_bitDepth[channel] = isLuma(ChannelType(channel)) ? m_apcSlicePilot->getBitDepthY() : m_apcSlicePilot->getBitDepthC();
    656645#else
    … …  
    677666
    678667  m_cSAO.destroy();
    679 #if REPN_FORMAT_IN_VPS
     668#if SVC_EXTENSION
    680669  m_cSAO.create( m_apcSlicePilot->getPicWidthInLumaSamples(), m_apcSlicePilot->getPicHeightInLumaSamples(), sps->getChromaFormatIdc(), sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth(), pps->getSaoOffsetBitShift(CHANNEL_TYPE_LUMA), pps->getSaoOffsetBitShift(CHANNEL_TYPE_CHROMA) );
    681670#else
    … …  
    12051194  xActivateParameterSets();
    12061195
    1207 #if REPN_FORMAT_IN_VPS
     1196#if SVC_EXTENSION
    12081197  // Initialize ILRP if needed, only for the current layer 
    12091198  // ILRP intialization should go along with activation of parameters sets,
    … …  
    12111200  xInitILRP(m_apcSlicePilot);
    12121201#endif
     1202
    12131203  if (!m_apcSlicePilot->getDependentSliceSegmentFlag())
    12141204  {
    … …  
    22842274
    22852275#if SVC_EXTENSION
    2286 #if !REPN_FORMAT_IN_VPS
    2287 Void TDecTop::xInitILRP(TComSPS *pcSPS)
    2288 #else
    22892276Void TDecTop::xInitILRP(TComSlice *slice)
    2290 #endif
    2291 {
    2292 #if REPN_FORMAT_IN_VPS
     2277{
    22932278  TComSPS* pcSPS = slice->getSPS();
    22942279  Int bitDepthY   = slice->getBitDepthY();
    … …  
    22962281  Int picWidth    = slice->getPicWidthInLumaSamples();
    22972282  Int picHeight   = slice->getPicHeightInLumaSamples();
    2298 #endif
    2299   if(m_layerId>0)
    2300   {
    2301 #if REPN_FORMAT_IN_VPS
     2283
     2284  if( m_layerId > 0 )
     2285  {
     2286
    23022287    g_bitDepth[CHANNEL_TYPE_LUMA]     = bitDepthY;
    23032288    g_bitDepth[CHANNEL_TYPE_CHROMA]   = bitDepthC;
    2304 #else
    2305     g_bitDepth[CHANNEL_TYPE_LUMA]     = pcSPS->getBitDepthY();
    2306     g_bitDepth[CHANNEL_TYPE_CHROMA]   = pcSPS->getBitDepthC();
    2307 #endif
    23082289    g_uiMaxCUWidth  = pcSPS->getMaxCUWidth();
    23092290    g_uiMaxCUHeight = pcSPS->getMaxCUHeight();
    … …  
    23382319
    23392320#if AUXILIARY_PICTURES
    2340 #if REPN_FORMAT_IN_VPS
    23412321        m_cIlpPic[j]->create(picWidth, picHeight, slice->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    23422322#else
    2343         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), pcSPS->getChromaFormatIdc(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    2344 #endif
    2345 #else
    2346 #if REPN_FORMAT_IN_VPS
    23472323        m_cIlpPic[j]->create(picWidth, picHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    2348 #else
    2349         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, pcSPS, true);
    2350 #endif
    23512324#endif
    23522325        for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCtusInFrame(); i++)

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

    r1199 r1203  
    136136#if AVC_BASE
    137137  fstream*                m_pBLReconFile;
    138 #if !REPN_FORMAT_IN_VPS
    139   Int                     m_iBLSourceWidth;
    140   Int                     m_iBLSourceHeight;
    141 #endif
    142138#endif
    143139
    … …  
    258254  Void      setBLReconFile( fstream* pFile )                                { m_pBLReconFile = pFile; }
    259255  fstream*  getBLReconFile()                                                { return m_pBLReconFile;  }
    260 #if !REPN_FORMAT_IN_VPS
    261   Void      setBLsize( Int iWidth, Int iHeight ) { m_iBLSourceWidth = iWidth; m_iBLSourceHeight = iHeight; }
    262   Int       getBLWidth() { return  m_iBLSourceWidth; }
    263   Int       getBLHeight() { return  m_iBLSourceHeight; }
    264 #endif
    265 #endif
    266 #if REPN_FORMAT_IN_VPS
     256#endif
    267257  Void      xInitILRP(TComSlice *slice);
    268 #else
    269   Void      xInitILRP(TComSPS *pcSPS);
    270 #endif
    271258  CommonDecoderParams*    getCommonDecoderParams()                          { return m_commonDecoderParams; }
    272259  Void                    setCommonDecoderParams(CommonDecoderParams* x)    { m_commonDecoderParams = x;    }

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

    r1199 r1203  
    587587  if (conf.getWindowEnabledFlag())
    588588  {
    589 #if REPN_FORMAT_IN_VPS
     589#if SVC_EXTENSION
    590590    WRITE_UVLC( conf.getWindowLeftOffset(),   "conf_win_left_offset"   );
    591591    WRITE_UVLC( conf.getWindowRightOffset(),  "conf_win_right_offset"  );
    … …  
    16061606  Int iDQp  = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx );
    16071607
    1608 #if REPN_FORMAT_IN_VPS
     1608#if SVC_EXTENSION
    16091609  Int qpBdOffsetY =  pcCU->getSlice()->getQpBDOffsetY();
    16101610#else
    … …  
    21322132  }
    21332133
    2134 #if REPN_FORMAT_IN_VPS
    21352134  // The value of vps_num_rep_formats_minus1 shall be in the range of 0 to 255, inclusive.
    21362135  assert( vps->getVpsNumRepFormats() > 0 && vps->getVpsNumRepFormats() <= 256 );
    … …  
    21662165    }
    21672166  }
    2168 #endif
    21692167
    21702168  WRITE_FLAG(vps->getMaxOneActiveRefLayerFlag(), "max_one_active_ref_layer_flag");
    … …  
    22302228}
    22312229
    2232 #if REPN_FORMAT_IN_VPS
    22332230Void  TEncCavlc::codeRepFormat( RepFormat *repFormat )
    22342231{
    … …  
    22632260  }
    22642261}
    2265 #endif
     2262
    22662263#if VPS_DPB_SIZE_TABLE
    22672264Void TEncCavlc::codeVpsDpbSizeTable(TComVPS *vps)

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.h

    r1185 r1203  
    160160  Void codeVPSExtension        ( TComVPS* pcVPS );
    161161  Void codeVPSVUI              ( TComVPS *vps   );
    162 #if REPN_FORMAT_IN_VPS
    163162  Void  codeRepFormat          ( RepFormat *repFormat );
    164 #endif
    165163#if VPS_DPB_SIZE_TABLE
    166164  Void  codeVpsDpbSizeTable    (TComVPS *vps);

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

    r1150 r1203  
    11631163
    11641164#if SVC_EXTENSION
    1165 #if REPN_FORMAT_IN_VPS
    11661165struct RepFormatCfg
    11671166{
    … …  
    11821181};
    11831182std::istringstream &operator>>(std::istringstream &in, RepFormatCfg &repFormatCfg);
    1184 #endif
    11851183#endif //SVC_EXTENSION
    11861184

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp

    r1029 r1203  
    410410  {
    411411    Int idQP = m_pcEncCfg->getMaxDeltaQP();
    412 #if REPN_FORMAT_IN_VPS
     412#if SVC_EXTENSION
    413413    iMinQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP );
    414414    iMaxQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP );
    … …  
    446446  TComSlice * pcSlice = rpcTempCU->getPic()->getSlice(rpcTempCU->getPic()->getCurrSliceIdx());
    447447  // We need to split, so don't try these modes.
    448 #if REPN_FORMAT_IN_VPS
     448#if SVC_EXTENSION
    449449  if ( ( uiRPelX < rpcBestCU->getSlice()->getPicWidthInLumaSamples() ) &&
    450450       ( uiBPelY < rpcBestCU->getSlice()->getPicHeightInLumaSamples() ) )
    … …  
    808808  {
    809809    Int idQP = m_pcEncCfg->getMaxDeltaQP();
    810 #if REPN_FORMAT_IN_VPS
     810#if SVC_EXTENSION
    811811    iMinQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP );
    812812    iMaxQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP );
    … …  
    858858        pcSubTempPartCU->initSubCU( rpcTempCU, uiPartUnitIdx, uhNextDepth, iQP );           // clear sub partition datas or init.
    859859
    860 #if REPN_FORMAT_IN_VPS
     860#if SVC_EXTENSION
    861861        if( ( pcSubBestPartCU->getCUPelX() < pcSlice->getPicWidthInLumaSamples() ) && ( pcSubBestPartCU->getCUPelY() < pcSlice->getPicHeightInLumaSamples() ) )
    862862#else
    … …  
    10321032    iQpOffset = Int(floor( dQpOffset + 0.49999 ));
    10331033  }
    1034 #if REPN_FORMAT_IN_VPS
     1034#if SVC_EXTENSION
    10351035  return Clip3(-pcCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQp+iQpOffset );
    10361036#else
    … …  
    10631063#endif
    10641064
    1065 #if REPN_FORMAT_IN_VPS
     1065#if SVC_EXTENSION
    10661066  if( ( uiRPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) )
    10671067#else
    … …  
    10931093      uiLPelX   = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];
    10941094      uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
    1095 #if REPN_FORMAT_IN_VPS
     1095
     1096#if SVC_EXTENSION
    10961097      if( ( uiLPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiTPelY < pcSlice->getPicHeightInLumaSamples() ) )
    10971098#else

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

    r1201 r1203  
    22372237      }
    22382238
    2239 #if REPN_FORMAT_IN_VPS
     2239#if SVC_EXTENSION
    22402240      sliceQP = Clip3( -pcSlice->getQpBDOffsetY(), MAX_QP, sliceQP );
    22412241#else
    … …  
    30163016      const Int minCuWidth  = pcPic->getMinCUWidth();
    30173017      const Int minCuHeight = pcPic->getMinCUHeight();
    3018 #if REPN_FORMAT_IN_VPS
     3018#if SVC_EXTENSION
    30193019      const Int paddedWidth = ((pcSlice->getPicWidthInLumaSamples()  + minCuWidth  - 1) / minCuWidth) * minCuWidth;
    30203020      const Int paddedHeight= ((pcSlice->getPicHeightInLumaSamples() + minCuHeight - 1) / minCuHeight) * minCuHeight;

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp

    r1029 r1203  
    876876  Int iDQp  = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx );
    877877 
    878 #if REPN_FORMAT_IN_VPS 
     878#if SVC_EXTENSION 
    879879  Int qpBdOffsetY =  pcCU->getSlice()->getQpBDOffsetY();
    880880#else

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

    r1201 r1203  
    46964696  }
    46974697
    4698 #if REPN_FORMAT_IN_VPS
     4698#if SVC_EXTENSION
    46994699  qpMin =  bHighPass ? Clip3( -pcCU->getSlice()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) - m_iMaxDeltaQP ) : pcCU->getQP( 0 );
    47004700  qpMax =  bHighPass ? Clip3( -pcCU->getSlice()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) + m_iMaxDeltaQP ) : pcCU->getQP( 0 );

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

    r1201 r1203  
    339339  if(eSliceType!=I_SLICE)
    340340  {
    341 #if REPN_FORMAT_IN_VPS
     341#if SVC_EXTENSION
    342342    if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getQpBDOffsetY() ) && (rpcSlice->getPPS()->getTransquantBypassEnableFlag())))
    343343#else
    … …  
    413413    }
    414414
    415 #if REPN_FORMAT_IN_VPS
     415#if SVC_EXTENSION
    416416    iQP = max( -rpcSlice->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) );
    417417#else
    … …  
    474474  {
    475475    dQP = xGetQPValueAccordingToLambda( dLambda );
    476 #if REPN_FORMAT_IN_VPS
     476#if SVC_EXTENSION
    477477    iQP = max( -rpcSlice->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) );
    478478#else
    … …  
    721721    pCtu->initCtu( pcPic, ctuRsAddr );
    722722
    723 #if REPN_FORMAT_IN_VPS
     723#if SVC_EXTENSION
    724724    Int height  = min( pcSlice->getSPS()->getMaxCUHeight(),pcSlice->getPicHeightInLumaSamples() - ctuRsAddr / pcPic->getFrameWidthInCtus() * pcSlice->getSPS()->getMaxCUHeight() );
    725725    Int width   = min( pcSlice->getSPS()->getMaxCUWidth(),pcSlice->getPicWidthInLumaSamples() - ctuRsAddr % pcPic->getFrameWidthInCtus() * pcSlice->getSPS()->getMaxCUWidth() );
    … …  
    897897        }
    898898
    899 #if REPN_FORMAT_IN_VPS
     899#if SVC_EXTENSION
    900900        estQP     = Clip3( -pcSlice->getQpBDOffsetY(), MAX_QP, estQP );
    901901#else

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

    r1200 r1203  
    813813  for (UInt channelType = 0; channelType < MAX_NUM_CHANNEL_TYPE; channelType++)
    814814  {
    815 #if REPN_FORMAT_IN_VPS
     815#if SVC_EXTENSION
    816816    m_cSPS.setBitDepth    (ChannelType(channelType), m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_cVPS.getLayerIdxInVps( m_layerId ) ) )->getBitDepthVps(ChannelType(channelType))            );
    817817    m_cSPS.setQpBDOffset  (ChannelType(channelType), (6 * (m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_cVPS.getLayerIdxInVps( m_layerId ) ) )->getBitDepthVps(ChannelType(channelType)) - 8)));
    … …  
    14081408}
    14091409
    1410 #if !REPN_FORMAT_IN_VPS
    1411 Void TEncTop::xInitILRP()
    1412 {
    1413   if(m_layerId>0)
    1414   {
    1415     g_bitDepthY     = m_cSPS.getBitDepthY();
    1416     g_bitDepthC     = m_cSPS.getBitDepthC();
    1417     g_uiMaxCUWidth  = m_cSPS.getMaxCUWidth();
    1418     g_uiMaxCUHeight = m_cSPS.getMaxCUHeight();
    1419     g_uiMaxCUDepth  = m_cSPS.getMaxCUDepth();
    1420     g_uiAddCUDepth  = max (0, m_cSPS.getLog2MinCodingBlockSize() - (Int)m_cSPS.getQuadtreeTULog2MinSize() );
    1421 
    1422     Int  numReorderPics[MAX_TLAYER];
    1423     Window &conformanceWindow = m_cSPS.getConformanceWindow();
    1424     Window defaultDisplayWindow = m_cSPS.getVuiParametersPresentFlag() ? m_cSPS.getVuiParameters()->getDefaultDisplayWindow() : Window();
    1425 
    1426     if (m_cIlpPic[0] == NULL)
    1427     {
    1428       for (Int j=0; j < m_numLayer; j++) // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
    1429       {
    1430         m_cIlpPic[j] = new  TComPic;
    1431 #if AUXILIARY_PICTURES
    1432         m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
    1433 #else
    1434         m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true);
    1435 #endif
    1436         for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCUsInFrame(); i++)
    1437         {
    1438           m_cIlpPic[j]->getPicSym()->getCU(i)->initCU(m_cIlpPic[j], i);
    1439         }
    1440       }
    1441     }
    1442   }
    1443 }
    1444 #else
    14451410Void TEncTop::xInitILRP()
    14461411{
    … …  
    15101475  }
    15111476}
    1512 #endif
    15131477
    15141478Window& TEncTop::getScaledRefLayerWindowForLayer(Int layerId)
Note: See TracChangeset for help on using the changeset viewer.