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

Timestamp:

18 Apr 2014, 19:18:30 (11 years ago)

Author:

seregin

Message:

code formatting

Location:

branches/SHM-6-dev/source/Lib

Files:

• TLibCommon/TComUpsampleFilter.cpp (modified) (2 diffs)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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

@@ -128 +128 @@
 #if Q0200_CONFORMANCE_BL_SIZE
   const Window &confBL = currSlice->getBaseColPic(refLayerIdc)->getConformanceWindow();
-  widthBL  -= (confBL.getWindowLeftOffset() + confBL.getWindowRightOffset());
-  heightBL -= (confBL.getWindowBottomOffset() + confBL.getWindowTopOffset());
+  widthBL  -= confBL.getWindowLeftOffset() + confBL.getWindowRightOffset();
+  heightBL -= confBL.getWindowBottomOffset() + confBL.getWindowTopOffset();
 #endif
 #if P0312_VERT_PHASE_ADJ
@@ -442 +442 @@
     leftOffset = leftStartC > 0 ? leftStartC : 0;
 #if Q0200_CONFORMANCE_BL_SIZE
-leftStartC+= (confBL.getWindowLeftOffset()>>1)<<4;
-topStartC+= (confBL.getWindowTopOffset()>>1)<<4;
+    leftStartC += ( confBL.getWindowLeftOffset() >> 1 ) << 4;
+    topStartC  += ( confBL.getWindowTopOffset() >> 1 ) << 4;
 #endif
     shiftX = 16;

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(); 
-widthBL   -= (confBL.getWindowLeftOffset()+confBL.getWindowRightOffset());
-heightBL  -= (confBL.getWindowTopOffset()+confBL.getWindowBottomOffset());
+        const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow(); 
+        widthBL  -= confBL.getWindowLeftOffset() + confBL.getWindowRightOffset();
+        heightBL -= confBL.getWindowTopOffset() + confBL.getWindowBottomOffset();
 #endif
         Int widthEL   = pcPic->getPicYuvRec()->getWidth()  - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1044 +1044 @@
         Int heightBL  = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight();
 #if Q0200_CONFORMANCE_BL_SIZE
-const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow(); 
-widthBL   -= (confBL.getWindowLeftOffset()+confBL.getWindowRightOffset());
-heightBL  -= (confBL.getWindowTopOffset()+confBL.getWindowBottomOffset());
+        const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getConformanceWindow(); 
+        widthBL  -= confBL.getWindowLeftOffset() + confBL.getWindowRightOffset();
+        heightBL -= confBL.getWindowTopOffset() + confBL.getWindowBottomOffset();
 #endif
         Int widthEL   = pcPic->getPicYuvRec()->getWidth()  - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();