Changeset 702 in SHVCSoftware for branches/SHM-6-dev


Ignore:
Timestamp:
19 Apr 2014, 00:38:24 (11 years ago)
Author:
seregin
Message:

code clean up

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r695 r702  
    702702          }
    703703#endif
    704 #if REPN_FORMAT_IN_VPS
    705 #if Q0200_CONFORMANCE_BL_SIZE
    706           Int xScal = 1, yScal = 1;
    707 #else
     704#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
    708705          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    709706          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    710 #endif
     707
    711708          m_acTVideoIOYuvReconFile[layerId].write( pPicCYuvRecTop, pPicCYuvRecBot,
    712709            conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
    … …  
    715712            conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset(), isTff );
    716713#else
    717 #if O0194_DIFFERENT_BITDEPTH_EL_BL
    718           // Compile time bug-fix
    719714          m_acTVideoIOYuvReconFile[layerId].write( pPicCYuvRecTop, pPicCYuvRecBot,
    720 #else
    721           m_cTVideoIOYuvReconFile.write( pPicCYuvRecTop, pPicCYuvRecBot,
    722 #endif
    723             conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(),
    724             conf.getWindowRightOffset() + defDisp.getWindowRightOffset(),
    725             conf.getWindowTopOffset() + defDisp.getWindowTopOffset(),
     715            conf.getWindowLeftOffset()   + defDisp.getWindowLeftOffset(),
     716            conf.getWindowRightOffset()  + defDisp.getWindowRightOffset(),
     717            conf.getWindowTopOffset()    + defDisp.getWindowTopOffset(),
    726718            conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset(), isTff );
    727719#endif
    … …  
    826818#endif
    827819
    828 #if REPN_FORMAT_IN_VPS
    829 #if Q0200_CONFORMANCE_BL_SIZE
    830           Int xScal = 1, yScal = 1;
    831 #else
     820#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
    832821          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    833822          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    834 #endif
     823
    835824          m_acTVideoIOYuvReconFile[layerId].write( pPicCYuvRec,
    836825            conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
    … …  
    840829#else
    841830          m_acTVideoIOYuvReconFile[layerId].write( pPicCYuvRec,
    842             conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(),
    843             conf.getWindowRightOffset() + defDisp.getWindowRightOffset(),
    844             conf.getWindowTopOffset() + defDisp.getWindowTopOffset(),
     831            conf.getWindowLeftOffset()   + defDisp.getWindowLeftOffset(),
     832            conf.getWindowRightOffset()  + defDisp.getWindowRightOffset(),
     833            conf.getWindowTopOffset()    + defDisp.getWindowTopOffset(),
    845834            conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset() );
    846835#endif
    … …  
    945934          }
    946935#endif
    947 #if REPN_FORMAT_IN_VPS
    948 #if Q0200_CONFORMANCE_BL_SIZE
    949           Int xScal = 1, yScal = 1;
    950 #else
     936#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
    951937          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    952938          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    953 #endif
     939
    954940          m_acTVideoIOYuvReconFile[layerId].write( pPicCYuvRecTop, pPicCYuvRecBot,
    955941            conf.getWindowLeftOffset()  *xScal + defDisp.getWindowLeftOffset(),
    … …  
    958944            conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset(), isTff );
    959945#else
    960 #if O0194_DIFFERENT_BITDEPTH_EL_BL
    961           // Compile time bug-fix
    962946          m_acTVideoIOYuvReconFile[layerId].write( pPicCYuvRecTop, pPicCYuvRecBot,
    963 #else
    964           m_cTVideoIOYuvReconFile[layerId].write( pPicCYuvRecTop, pPicCYuvRecBot,
    965 #endif
    966             conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(),
    967             conf.getWindowRightOffset() + defDisp.getWindowRightOffset(),
    968             conf.getWindowTopOffset() + defDisp.getWindowTopOffset(),
     947            conf.getWindowLeftOffset()   + defDisp.getWindowLeftOffset(),
     948            conf.getWindowRightOffset()  + defDisp.getWindowRightOffset(),
     949            conf.getWindowTopOffset()    + defDisp.getWindowTopOffset(),
    969950            conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset(), isTff );
    970951#endif
    … …  
    10711052          }
    10721053#endif
    1073 #if REPN_FORMAT_IN_VPS
    1074 #if Q0200_CONFORMANCE_BL_SIZE
    1075           Int xScal = 1,yScal = 1;
    1076 #else
     1054#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
    10771055          UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    10781056          Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    1079 #endif
     1057
    10801058          m_acTVideoIOYuvReconFile[layerId].write( pPicCYuvRec,
    10811059            conf.getWindowLeftOffset()  *xScal + defDisp.getWindowLeftOffset(),
    … …  
    10851063#else
    10861064          m_acTVideoIOYuvReconFile[layerId].write( pPicCYuvRec,
    1087             conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(),
    1088             conf.getWindowRightOffset() + defDisp.getWindowRightOffset(),
    1089             conf.getWindowTopOffset() + defDisp.getWindowTopOffset(),
     1065            conf.getWindowLeftOffset()   + defDisp.getWindowLeftOffset(),
     1066            conf.getWindowRightOffset()  + defDisp.getWindowRightOffset(),
     1067            conf.getWindowTopOffset()    + defDisp.getWindowTopOffset(),
    10901068            conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset() );
    10911069#endif
Note: See TracChangeset for help on using the changeset viewer.