Changeset 1118 in 3DVCSoftware for branches/HTM-12.2-dev0/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

8 Nov 2014, 21:07:36 (9 years ago)

Author:

tech

Message:

Merged 12.2-dev1-Hisilicon@1116.

File:

• branches/HTM-12.2-dev0/source/Lib/TLibDecoder/TDecCu.cpp (modified) (3 diffs)

branches/HTM-12.2-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -744 +744 @@
   //construction of depth candidates
   Pel testDepth;
+#if SINGLE_DEPTH_SIMP_J0115
+  Pel DepthNeighbours[2];
+#else
   Pel DepthNeighbours[5];
+#endif
   Int index =0;
+#if SINGLE_DEPTH_SIMP_J0115
+  for( Int i = 0; (i < 2) && (index<SINGLE_DEPTH_MODE_CAND_LIST_SIZE) ; i++ )
+#else
   for( Int i = 0; (i < 5) && (index<SINGLE_DEPTH_MODE_CAND_LIST_SIZE) ; i++ )
+#endif
   {
     if(!pcCU->getNeighDepth (0, uiAbsPartIdx, &testDepth, i))
@@ -754 +762 @@
     DepthNeighbours[index]=testDepth;
     index++;
+#if !SINGLE_DEPTH_SIMP_J0115
     for(Int j=0;j<index-1;j++)
     {
@@ -762 +771 @@
      }
     }
+#endif
   }