Changeset 705 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibDecoder

Timestamp:

19 Apr 2014, 06:59:58 (11 years ago)

Author:

seregin

Message:

change the conformance input to be not multiplied by SubWidthC and SubHeightC, it should be a lossless change

File:

• branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)

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

@@ -1556 +1556 @@
         Int heightBL  = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight();
 #if Q0200_CONFORMANCE_BL_SIZE
-        Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow();
-#if REPN_FORMAT_IN_VPS 
-UInt chromaFormatIdc =  pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getChromaFormatIdc();
-Int xScal = TComSPS::getWinUnitX( chromaFormatIdc );
-Int yScal = TComSPS::getWinUnitY( chromaFormatIdc );
-confBL.setWindowBottomOffset(confBL.getWindowBottomOffset()*yScal);
-confBL.setWindowTopOffset(confBL.getWindowTopOffset()*yScal);
-confBL.setWindowLeftOffset(confBL.getWindowLeftOffset()*xScal);
-confBL.setWindowRightOffset(confBL.getWindowRightOffset()*xScal);
-#endif
-        widthBL  -= confBL.getWindowLeftOffset() + confBL.getWindowRightOffset();
-        heightBL -= confBL.getWindowTopOffset() + confBL.getWindowBottomOffset();
+        Int chromaFormatIdc = pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getChromaFormatIdc();
+        const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow(); 
+        widthBL  -= ( confBL.getWindowLeftOffset() + confBL.getWindowRightOffset() ) * TComSPS::getWinUnitX( chromaFormatIdc );
+        heightBL -= ( confBL.getWindowTopOffset() + confBL.getWindowBottomOffset() ) * TComSPS::getWinUnitY( chromaFormatIdc );
 #endif
         Int widthEL   = pcPic->getPicYuvRec()->getWidth()  - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();
@@ -1628 +1620 @@
         }
         pcSlice->setFullPelBaseRec ( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc) );
-#if REPN_FORMAT_IN_VPS && Q0200_CONFORMANCE_BL_SIZE
-confBL.setWindowBottomOffset(confBL.getWindowBottomOffset()/yScal);
-confBL.setWindowTopOffset(confBL.getWindowTopOffset()/yScal);
-confBL.setWindowLeftOffset(confBL.getWindowLeftOffset()/xScal);
-confBL.setWindowRightOffset(confBL.getWindowRightOffset()/xScal);
-#endif
 #endif
       }