Changeset 374 in 3DVCSoftware for branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

5 May 2013, 12:09:11 (12 years ago)

Author:

sharpjp-htm

Message:

D0060: Removal of IC's parsing dependency

File:

• branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComDataCU.cpp (modified) (4 diffs)

branches/HTM-6.2-dev1-Sharp/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3003 +3003 @@
   UInt iNumbPart;
 
+#if SHARP_ILLUCOMP_PARSE_D0060
+  if (!(getPartitionSize(uiAbsPartIdx) == SIZE_2Nx2N))
+  {
+    return false;
+  }
+  if (getSlice()->getIcSkipParseFlag())
+  {
+    if (getMergeFlag(uiAbsPartIdx) && getMergeIndex(uiAbsPartIdx) == 0)
+    {
+      return false;
+    }
+  }
+  if (getMergeFlag(uiAbsPartIdx))
+  {
+    return true;
+  }
+#endif
+#if HHI_MPI
   if(!getSlice()->getIsDepth())
   {
+#endif
     Int iWidth, iHeight;
 
@@ -3025 +3044 @@
       }
     }
+#if HHI_MPI
   }
   else
@@ -3046 +3066 @@
     }
   }
+#endif
 
   return false;
@@ -3056 +3077 @@
   Int iWidth, iHeight;
 
+#if SHARP_ILLUCOMP_PARSE_D0060
+  if (!(getPartitionSize(uiAbsPartIdx) == SIZE_2Nx2N))
+  {
+    return false;
+  }
+  if (getSlice()->getIcSkipParseFlag())
+  {
+    if (getMergeFlag(uiAbsPartIdx) && getMergeIndex(uiAbsPartIdx) == 0)
+    {
+      return false;
+    }
+  }
+  if (getMergeFlag(uiAbsPartIdx))
+  {
+    return true;
+  }
+#endif
   UInt uiPartMode = getPartitionSize(uiAbsPartIdx);