Changeset 512 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source

Timestamp:

3 Jul 2013, 14:07:30 (11 years ago)

Author:

mitsubishi-htm

Message:

-(intermediate version)

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (2 diffs)
• TComPrediction.cpp (modified) (1 diff)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2683 +2683 @@
   if(ucVspMergePos == H_3D_VSP_POSITION && picDepth != NULL && 0 != m_pcSlice->getViewIndex() ) // VSP can be used only when depth is used as input
   {
-    abCandIsInter[iCount] = true;
-    puhInterDirNeighbours[iCount] = 0;
-    vspFlag[iCount] = 1;
-
     Bool refViewAvailFlag = false;
     UChar predFlag[2] = {0, 0};
@@ -2732 +2728 @@
     }
 
+    abCandIsInter[iCount] = true;
     puhInterDirNeighbours[iCount] = (predFlag[0] | (predFlag[1] << 1));
+    vspFlag[iCount] = 1;
 
     if ( mrgCandIdx == iCount )

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1510 +1510 @@
 
   Pel* depthTemp, *depthInitial=depth;
-  for (Int yTxt =0; yTxt<sizeY; yTxt++)
-  {
-    for (Int xTxt =0; xTxt<sizeX; xTxt++)
+  for (Int yTxt = 0; yTxt < sizeY; yTxt++)
+  {
+    for (Int xTxt = 0; xTxt < sizeX; xTxt++)
     {
       if (depthPosX+xTxt < widthDepth)