Changeset 683 in 3DVCSoftware for branches/HTM-8.2-dev2-MediaTek/source/Lib/TLibCommon

Timestamp:

8 Nov 2013, 02:45:33 (11 years ago)

Author:

mediatek-htm

Message:

Integration of VSP simplification proposed in FJCT3V-F0111 enabled by the MACRO "MTK_VSP_SIMPLIFICATION_F0111"

By Yi-Wen Chen (yiwen.chen@…)

Location:

branches/HTM-8.2-dev2-MediaTek/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (5 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-8.2-dev2-MediaTek/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3750 +3750 @@
       {
         vspFlag[iCount] = 1;
+#if !MTK_VSP_SIMPLIFICATION_F0111
         xInheritVSPDisInfo(pcCULeft,uiLeftPartIdx,iCount,inheritedVSPDisInfo);
+#endif
       }
 #endif
@@ -3832 +3834 @@
 #endif
 #if H_3D_VSP
+#if MTK_VSP_SIMPLIFICATION_F0111
+      if ( ( ( getAddr() - pcCUAbove->getAddr() ) == 0) && (pcCUAbove->getVSPFlag(uiAbovePartIdx) == 1) )
+#else
       if (pcCUAbove->getVSPFlag(uiAbovePartIdx) == 1)
+#endif
       {
 
         vspFlag[iCount] = 1;
+#if !MTK_VSP_SIMPLIFICATION_F0111
         xInheritVSPDisInfo(pcCUAbove,uiAbovePartIdx,iCount,inheritedVSPDisInfo);
+#endif
       }
 #endif
@@ -3888 +3896 @@
 #endif
 #if H_3D_VSP
+#if MTK_VSP_SIMPLIFICATION_F0111
+    if ( ( ( getAddr() - pcCUAboveRight->getAddr() ) == 0) && (pcCUAboveRight->getVSPFlag(uiAboveRightPartIdx) == 1) )
+#else
     if (pcCUAboveRight->getVSPFlag(uiAboveRightPartIdx) == 1)
+#endif
     {
       vspFlag[iCount] = 1;
+#if !MTK_VSP_SIMPLIFICATION_F0111
       xInheritVSPDisInfo(pcCUAboveRight,uiAboveRightPartIdx,iCount,inheritedVSPDisInfo);
+#endif
     }
 #endif
@@ -4012 +4026 @@
     {
       vspFlag[iCount] = 1;
+#if !MTK_VSP_SIMPLIFICATION_F0111
       xInheritVSPDisInfo(pcCULeftBottom,uiLeftBottomPartIdx,iCount,inheritedVSPDisInfo);
+#endif
     }
 #endif
@@ -4058 +4074 @@
 #endif
 #if H_3D_VSP
+#if MTK_VSP_SIMPLIFICATION_F0111
+      if ( ( ( getAddr() - pcCUAboveLeft->getAddr() ) == 0) && (pcCUAboveLeft->getVSPFlag(uiAboveLeftPartIdx) == 1) )
+#else
       if (pcCUAboveLeft->getVSPFlag(uiAboveLeftPartIdx) == 1)
+#endif
       {
         vspFlag[iCount] = 1;
+#if !MTK_VSP_SIMPLIFICATION_F0111
         xInheritVSPDisInfo(pcCUAboveLeft,uiAboveLeftPartIdx,iCount,inheritedVSPDisInfo);
+#endif
       }
 #endif

branches/HTM-8.2-dev2-MediaTek/source/Lib/TLibCommon/TypeDef.h

@@ -232 +232 @@
 #define H_3D_VSP_CONSTRAINED              0
 #endif
-
+#define MTK_VSP_SIMPLIFICATION_F0111      1   // 1. Inherited VSP also use NBDV of current CU, 2. VSP cannot be inherited from above LCU rowss
 #endif