Changeset 931 in 3DVCSoftware

Timestamp:

21 Apr 2014, 10:32:30 (11 years ago)

Author:

mediatek-htm

Message:

implementation of H0205

Location:

branches/HTM-10.2-dev1-MediaTek/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (6 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecSbac.cpp (modified) (1 diff)

branches/HTM-10.2-dev1-MediaTek/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4068 +4068 @@
 #if H_3D_DBBP
   Bool bDBBPFlag = getDBBPFlag(uiAbsPartIdx);
+#if MTK_DIS_SPBIP8X4_H0205
+  assert(bDBBPFlag == getDBBPFlag(0));  
+#endif
 #endif
 
@@ -4504 +4507 @@
                 }
               }
+#if MTK_DIS_SPBIP8X4_H0205
+              if (iPUHeight + iPUWidth == 12)
+              {
+                if (puhInterDirSP[iPartition] == 3)
+                {
+                  puhInterDirSP[iPartition] = 1;
+                  pcMvFieldSP[2*iPartition + 1].setMvField(TComMv(0,0), -1);
+                }
+              }
+#endif
 #if !MPI_SUBPU_DEFAULT_MV_H0077_H0099_H0111_H0133
               else
@@ -4916 +4929 @@
 #if ETRIKHU_CLEANUP_H0083
       Bool SPIVMPFlag = false;
+#if MTK_DIS_SPBIP8X4_H0205
+      if(!m_pcSlice->getIsDepth())
+#else
       if(!m_pcSlice->getIsDepth() && getPartitionSize(0) == SIZE_2Nx2N )
+#endif
       {
         SPIVMPFlag = true;
@@ -7312 +7329 @@
   if(!m_pcSlice->getIsDepth())
   {
+#if MTK_DIS_SPBIP8X4_H0205
+    if (!getDBBPFlag(0))
+#else
     if( getPartitionSize(0) == SIZE_2Nx2N )
+#endif
     {
       Int iNumSPInOneLine, iNumSP, iSPWidth, iSPHeight;
@@ -7469 +7490 @@
 
             }
+#if MTK_DIS_SPBIP8X4_H0205
+            if (iSPHeight + iSPWidth == 12)
+            {
+              if (puhInterDirSP[iPartition] == 3)
+              {
+                puhInterDirSP[iPartition] = 1;
+                pcMvFieldSP[2*iPartition + 1].setMvField(TComMv(0,0), -1);
+              }
+            }
+#endif
             iPartition ++;
           }
@@ -7490 +7521 @@
     iCurrPosY  += ( iHeight >> 1 );
   }
+#if MTK_DIS_SPBIP8X4_H0205
+  for(Int iLoopCan = ( (m_pcSlice->getIsDepth() || getDBBPFlag(0)) ? 0 : 1 ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++) 
+#else
   for(Int iLoopCan = ( (m_pcSlice->getIsDepth() || getPartitionSize(uiPartAddr) != SIZE_2Nx2N) ? 0 : 1 ); iLoopCan < ( 2 - m_pcSlice->getIsDepth() ); iLoopCan ++) 
+#endif
 #else
   for(Int iLoopCan = 0; iLoopCan < 2; iLoopCan ++)

branches/HTM-10.2-dev1-MediaTek/source/Lib/TLibCommon/TypeDef.h

@@ -231 +231 @@
 #define ETRIKHU_CLEANUP_H0083             1   // cleaned-up source code for constructing merging candidate list
 #define SHARP_SIMPLE_MERGE_H0062          1   // Restrict 3D-HEVC merge cand in small PUs
+#define MTK_DIS_SPBIP8X4_H0205            1   // Disable bi-prediction for 8x4 and 4x8 sub PU and remove the SPIVMP 2Nx2N restriction
 
 // Rate Control

branches/HTM-10.2-dev1-MediaTek/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -2153 +2153 @@
   {
     pcCU->setDBBPFlagSubParts(true, uiAbsPartIdx, 0, uiDepth);
+#if MTK_DIS_SPBIP8X4_H0205
+    UInt uiCurrPartNumQ = (pcCU->getPic()->getNumPartInCU() >> (2 * uiDepth)) >> 2;
+    pcCU->setDBBPFlagSubParts(true, uiAbsPartIdx + 2*uiCurrPartNumQ, 1, uiDepth);
+#endif
   }
 }