Changeset 1116 in 3DVCSoftware for branches

Timestamp:

8 Nov 2014, 06:33:18 (10 years ago)

Author:

hisilicon-htm

Message:

Integration of JCT3V-J0066

Location:

branches/HTM-12.2-dev1-Hisilicon

Files:

• codingresults/J0066_J0115_J0029_J0033_J0059_J0060_J0035_vs_J0115_J0029_J0033_J0059_J0060_J0035-CTC.xlsm (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)

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

@@ -6710 +6710 @@
 
   iNumSPInOneLine = iPUWidth/iSubPUSize;
+#if !HS_SP_SIMP_J0066
   iNumSPInOneLine = iNumSPInOneLine < 1 ? 1: iNumSPInOneLine;
+#endif
   Int iNumSPInOneColumn = iPUHeight/iSubPUSize;
+#if !HS_SP_SIMP_J0066
   iNumSPInOneColumn = iNumSPInOneColumn < 1 ? 1: iNumSPInOneColumn;
+#else
+  iNumSPInOneLine = (iPUHeight % iSubPUSize != 0 || iPUWidth % iSubPUSize != 0 ) ? 1 : iNumSPInOneLine;
+  iNumSPInOneColumn = (iPUHeight % iSubPUSize != 0  || iPUWidth % iSubPUSize != 0 ) ? 1 : iNumSPInOneColumn;
+#endif
   iNumSP = iNumSPInOneLine * iNumSPInOneColumn;
 

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

@@ -367 +367 @@
 #endif
 
+
+#if H_3D_SPIVMP
+#define HS_SP_SIMP_J0066                        1
+#endif
+
 /////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////   MV_HEVC HLS  //////////////////////////////