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


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/App/TAppDecoder
Files:
3 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        {
Note: See TracChangeset for help on using the changeset viewer.