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

Timestamp:

19 Apr 2014, 06:07:35 (11 years ago)

Author:

samsung

Message:

Q0200_CONFORMANCE_BL_SIZE synchronized with REPN_FORMAT_IN_VPS

Location:

branches/SHM-6-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (5 diffs)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)

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

@@ -702 +702 @@
           }
 #endif
-#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
+#if REPN_FORMAT_IN_VPS
           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
@@ -818 +818 @@
 #endif
 
-#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
+#if REPN_FORMAT_IN_VPS
           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
@@ -934 +934 @@
           }
 #endif
-#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
+#if REPN_FORMAT_IN_VPS
           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
@@ -1052 +1052 @@
           }
 #endif
-#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
+#if REPN_FORMAT_IN_VPS
           UInt chromaFormatIdc = pcPic->getSlice(0)->getChromaFormatIdc();
           Int xScal =  TComSPS::getWinUnitX( chromaFormatIdc ), yScal = TComSPS::getWinUnitY( chromaFormatIdc );
@@ -1160 +1160 @@
     const Window &defDisp = m_respectDefDispWindow ? pic->getDefDisplayWindow() : Window();
     Int xScal =  1, yScal = 1;
-#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
+#if REPN_FORMAT_IN_VPS
     UInt chromaFormatIdc = pic->getSlice(0)->getChromaFormatIdc();
     xScal = TComSPS::getWinUnitX( chromaFormatIdc );

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

@@ -658 +658 @@
   {
     Window &conf = pcSPS->getConformanceWindow();
-#if REPN_FORMAT_IN_VPS && !Q0200_CONFORMANCE_BL_SIZE
+#if REPN_FORMAT_IN_VPS
     READ_UVLC(   uiCode, "conf_win_left_offset" );               conf.setWindowLeftOffset  ( uiCode );
     READ_UVLC(   uiCode, "conf_win_right_offset" );              conf.setWindowRightOffset ( uiCode );

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

@@ -1556 +1556 @@
         Int heightBL  = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight();
 #if Q0200_CONFORMANCE_BL_SIZE
-        const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow(); 
+        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();
@@ -1619 +1628 @@
         }
         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
       }