Changeset 1203 in SHVCSoftware for branches/SHM-dev/source/App


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

macro cleanup: REPN_FORMAT_IN_VPS

Location:
branches/SHM-dev/source/App
Files:
8 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 );
Note: See TracChangeset for help on using the changeset viewer.