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

Timestamp:

20 Apr 2014, 10:31:20 (11 years ago)

Author:

qualcomm

Message:

Fix for Q0200 integration, from cjianle@…

File:

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

branches/SHM-6-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -141 +141 @@
   Int xScal = TComSPS::getWinUnitX( chromaFormatIdc );
   Int yScal = TComSPS::getWinUnitY( chromaFormatIdc );
-
-  widthBL  -= ( confBL.getWindowLeftOffset() + confBL.getWindowRightOffset() ) * xScal;
-  heightBL -= ( confBL.getWindowBottomOffset() + confBL.getWindowTopOffset() ) * yScal;
 #endif
 #if P0312_VERT_PHASE_ADJ
@@ -429 +426 @@
     widthBL   = pcBasePic->getWidth ();
     heightBL  = pcBasePic->getHeight();
-#if Q0200_CONFORMANCE_BL_SIZE
-    widthBL  -= ( confBL.getWindowLeftOffset() + confBL.getWindowRightOffset() ) * xScal;
-    heightBL -= ( confBL.getWindowBottomOffset() + confBL.getWindowTopOffset() ) * yScal;
-#endif
     widthEL   = pcUsPic->getWidth () - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();
     heightEL  = pcUsPic->getHeight() - scalEL.getWindowTopOffset()  - scalEL.getWindowBottomOffset();