Changeset 1114 in 3DVCSoftware

Timestamp:

7 Nov 2014, 17:32:36 (9 years ago)

Author:

hisilicon-htm

Message:

integration of J0115

Location:

branches/HTM-12.2-dev1-Hisilicon

Files:

• checklist/HiSilicon_J0115.doc (added)
• codingresults/J0115_J0029_J0033_J0059_J0060_J0035_vs_J0029_J0033_J0059_J0060_J0035-AI.xls (added)
• codingresults/J0115_J0029_J0033_J0059_J0060_J0035_vs_J0029_J0033_J0059_J0060_J0035-CTC.xlsm (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (2 diffs)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• source/Lib/TLibDecoder/TDecCu.cpp (modified) (3 diffs)
• source/Lib/TLibEncoder/TEncSearch.cpp (modified) (3 diffs)

branches/HTM-12.2-dev1-Hisilicon/source/Lib/TLibCommon/TComDataCU.cpp

@@ -6118 +6118 @@
     }
     break;
+#if !SINGLE_DEPTH_SIMP_J0115
   case 2: // Above
     if(yP != 0)
@@ -6139 +6140 @@
     }
     break;
+#endif
   default:
       break;

branches/HTM-12.2-dev1-Hisilicon/source/Lib/TLibCommon/TypeDef.h

@@ -294 +294 @@
 #if H_3D_SINGLE_DEPTH
 #define SINGLE_DEPTH_MODE_CAND_LIST_SIZE            2 // size of the sample candidate list
+#define SINGLE_DEPTH_SIMP_J0115           1 
 #endif
 

branches/HTM-12.2-dev1-Hisilicon/source/Lib/TLibDecoder/TDecCu.cpp

@@ -735 +735 @@
   //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))
@@ -745 +753 @@
     DepthNeighbours[index]=testDepth;
     index++;
+#if !SINGLE_DEPTH_SIMP_J0115
     for(Int j=0;j<index-1;j++)
     {
@@ -753 +762 @@
      }
     }
+#endif
   }
 

branches/HTM-12.2-dev1-Hisilicon/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
   }