Changeset 688 in SHVCSoftware for branches/SHM-6-dev/source/App


Ignore:
Timestamp:
17 Apr 2014, 04:52:55 (11 years ago)
Author:
samsung
Message:

JCTVC-Q0200 is integrated. Related macro "Q0200_CONFORMANCE_BL_SIZE"

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r652 r688  
    694694          const Bool isTff = pcPicTop->isTopField();
    695695#if REPN_FORMAT_IN_VPS
    696           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    697           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    698           m_acTVideoIOYuvReconFile[layerId].write( pcPicTop->getPicYuvRec(), pcPicBottom->getPicYuvRec(),
    699             conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
    700             conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
    701             conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
    702             conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset(), isTff );
    703 
     696#if Q0200_CONFORMANCE_BL_SIZE
     697Int xScal=1,yScal=1;
     698#else
     699UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
     700Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
     701#endif
     702m_acTVideoIOYuvReconFile[layerId].write( pcPicTop->getPicYuvRec(), pcPicBottom->getPicYuvRec(),
     703conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
     704conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
     705conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
     706conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset(), isTff );
    704707#else
    705708#if O0194_DIFFERENT_BITDEPTH_EL_BL
    … …  
    798801          const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
    799802#if REPN_FORMAT_IN_VPS
    800           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    801           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    802           m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
    803             conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
    804             conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
    805             conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
    806             conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
    807 
     803#if Q0200_CONFORMANCE_BL_SIZE
     804Int xScal=1,yScal=1;
     805#else
     806UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
     807Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
     808#endif
     809m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
     810conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
     811conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
     812conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
     813conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
    808814#else
    809815          m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
    … …  
    898904          const Bool isTff = pcPicTop->isTopField();
    899905#if REPN_FORMAT_IN_VPS
    900           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    901           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    902           m_acTVideoIOYuvReconFile[layerId].write( pcPicTop->getPicYuvRec(), pcPicBottom->getPicYuvRec(),
    903             conf.getWindowLeftOffset()  *xScal + defDisp.getWindowLeftOffset(),
    904             conf.getWindowRightOffset() *xScal + defDisp.getWindowRightOffset(),
    905             conf.getWindowTopOffset()   *yScal + defDisp.getWindowTopOffset(),
    906             conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset(), isTff );
    907 
     906#if Q0200_CONFORMANCE_BL_SIZE
     907Int xScal=1,yScal=1;
     908#else
     909UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
     910Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
     911#endif
     912m_acTVideoIOYuvReconFile[layerId].write( pcPicTop->getPicYuvRec(), pcPicBottom->getPicYuvRec(),
     913conf.getWindowLeftOffset()  *xScal + defDisp.getWindowLeftOffset(),
     914conf.getWindowRightOffset() *xScal + defDisp.getWindowRightOffset(),
     915conf.getWindowTopOffset()   *yScal + defDisp.getWindowTopOffset(),
     916conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset(), isTff );
    908917#else
    909918#if O0194_DIFFERENT_BITDEPTH_EL_BL
    … …  
    10051014          const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window();
    10061015#if REPN_FORMAT_IN_VPS
    1007           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
    1008           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    1009           m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
    1010             conf.getWindowLeftOffset()  *xScal + defDisp.getWindowLeftOffset(),
    1011             conf.getWindowRightOffset() *xScal + defDisp.getWindowRightOffset(),
    1012             conf.getWindowTopOffset()   *yScal + defDisp.getWindowTopOffset(),
    1013             conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset() );
    1014 
     1016#if Q0200_CONFORMANCE_BL_SIZE
     1017Int xScal=1,yScal=1;
     1018#else
     1019UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
     1020Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
     1021#endif
     1022m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
     1023conf.getWindowLeftOffset()  *xScal + defDisp.getWindowLeftOffset(),
     1024conf.getWindowRightOffset() *xScal + defDisp.getWindowRightOffset(),
     1025conf.getWindowTopOffset()   *yScal + defDisp.getWindowTopOffset(),
     1026conf.getWindowBottomOffset()*yScal + defDisp.getWindowBottomOffset() );
    10151027#else
    10161028          m_acTVideoIOYuvReconFile[layerId].write( pcPic->getPicYuvRec(),
    … …  
    11051117    const Window &defDisp = m_respectDefDispWindow ? pic->getDefDisplayWindow() : Window();
    11061118    Int xScal =  1, yScal = 1;
    1107 #if REPN_FORMAT_IN_VPS
    1108     UInt chromaFormatIdc = pic->getSlice(0)->getChromaFormatIdc();
    1109     xScal = TComSPS::getWinUnitX( chromaFormatIdc );
    1110     yScal = TComSPS::getWinUnitY( chromaFormatIdc );
    1111 #endif
    1112     m_acTVideoIOYuvReconFile[layerIdx].write( pic->getPicYuvRec(),
    1113       conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
    1114       conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
    1115       conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
    1116       conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
     1119#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
     1120UInt chromaFormatIdc = pic->getSlice(0)->getChromaFormatIdc();
     1121xScal = TComSPS::getWinUnitX( chromaFormatIdc );
     1122yScal = TComSPS::getWinUnitY( chromaFormatIdc );
     1123#endif
     1124m_acTVideoIOYuvReconFile[layerIdx].write( pic->getPicYuvRec(),
     1125conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
     1126conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
     1127conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
     1128conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
    11171129  }
    11181130  // update POC of display order
Note: See TracChangeset for help on using the changeset viewer.