Changeset 821 in 3DVCSoftware for branches/HTM-9.3-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

5 Feb 2014, 12:28:40 (10 years ago)

Author:

rwth

Message:

• fixed bracketing
• removed global variable

File:

• branches/HTM-9.3-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.cpp (modified) (6 diffs)

branches/HTM-9.3-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.cpp

@@ -651 +651 @@
       // SIZE_Nx2N
       if(x<uiHalfSize)  // left
+      {
         matchedPartSum[0][ucSegment]++;
+      }
       else  // right
+      {
         matchedPartSum[0][1-ucSegment]++;
+      }
       
       // SIZE_2NxN
       if(y<uiHalfSize)  // top
+      {
         matchedPartSum[1][ucSegment]++;
+      }
       else  // bottom
+      {
         matchedPartSum[1][1-ucSegment]++;
+      }
       
       if( bAMPAvail )
@@ -665 +673 @@
         // SIZE_2NxnU
         if(y<uiQuarterSize)  // top (1/4)
+        {
           matchedPartSum[2][ucSegment]++;
+        }
         else  // bottom (3/4)
+        {
           matchedPartSum[2][1-ucSegment]++;
+        }
         
         // SIZE_2NxnD
         if(y<(uiQuarterSize*3))  // top (3/4)
+        {
           matchedPartSum[3][ucSegment]++;
+        }
         else  // bottom (1/4)
+        {
           matchedPartSum[3][1-ucSegment]++;
+        }
         
         // SIZE_nLx2N
         if(x<uiQuarterSize)  // left (1/4)
+        {
           matchedPartSum[4][ucSegment]++;
+        }
         else  // right (3/4)
+        {
           matchedPartSum[4][1-ucSegment]++;
+        }
         
         // SIZE_nRx2N
         if(x<(uiQuarterSize*3))  // left (3/4)
+        {
           matchedPartSum[5][ucSegment]++;
+        }
         else  // right (1/4)
+        {
           matchedPartSum[5][1-ucSegment]++;
+        }
       }
     }
@@ -730 +754 @@
       
       if( depthPel > uiMaxDepth )
+      {
         uiMaxDepth = depthPel;
+      }
       if( depthPel < uiMinDepth )
+      {
         uiMinDepth = depthPel;
+      }
     }
     
@@ -741 +769 @@
   // don't generate mask for blocks with small depth range (encoder decision)
   if( uiMaxDepth - uiMinDepth < 10 )
+  {
     return false;
+  }
   
   AOF(uiWidth==uiHeight);
@@ -764 +794 @@
       
       if( bInvertMask )
+      {
         ucSegment = 1-ucSegment;
+      }
       
       // count pixels for each segment
@@ -782 +814 @@
   UInt uiMinPixPerSegment = (uiWidth*uiHeight) >> 3;
   if( !( uiSumPix[0] > uiMinPixPerSegment && uiSumPix[1] > uiMinPixPerSegment ) )
+  {
     return false;
+  }
   
   // all good