Changeset 1118 in 3DVCSoftware for branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncSearch.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/TLibEncoder/TEncSearch.cpp (modified) (3 diffs)

branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2881 +2881 @@
   Int index=0;
   Pel testDepth;
+#if SINGLE_DEPTH_SIMP_J0115
+  Pel DepthNeighbours[2];
+#else
   Pel DepthNeighbours[5];
+#endif
   //construction of depth candidates
+#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, 0, &testDepth, i))
@@ -2891 +2899 @@
     DepthNeighbours[index]=testDepth;
     index++;
+#if !SINGLE_DEPTH_SIMP_J0115
     for(Int j=0;j<index-1;j++)
     {
@@ -2899 +2908 @@
       }
     }
+#endif
   }