Changeset 723 in 3DVCSoftware for branches/HTM-8.2-dev0-Fix

Timestamp:

29 Nov 2013, 11:28:41 (11 years ago)

Author:

tech

Message:

Integrated Bug fix on F0093 related to VSP candidate (BUGFIX_2_F0093).

Location:

branches/HTM-8.2-dev0-Fix/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (3 diffs)
• TypeDef.h (modified) (2 diffs)

branches/HTM-8.2-dev0-Fix/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4145 +4145 @@
     iPosLeftAbove[1] = numA1B1B0;
 #if H_3D_VSP
+#if BUGFIX_2_F0093 && MTK_VSP_SIMPLIFICATION_F0111
+    if ( ( ( getAddr() - pcCUAbove->getAddr() ) == 0) && (pcCUAbove->getVSPFlag(uiAbovePartIdx) == 1) 
+#else
     if (pcCUAbove->getVSPFlag(uiAbovePartIdx) == 1
+#endif
 #if LGE_SHARP_VSP_INHERIT_F0104
 #if H_3D_IC
@@ -4173 +4177 @@
   {
 #if H_3D_VSP
+#if BUGFIX_2_F0093 && MTK_VSP_SIMPLIFICATION_F0111
+    if ( ( ( getAddr() - pcCUAboveRight->getAddr() ) == 0) && (pcCUAboveRight->getVSPFlag(uiAboveRightPartIdx) == 1) 
+#else
     if (pcCUAboveRight->getVSPFlag(uiAboveRightPartIdx) == 1
+#endif
 #if LGE_SHARP_VSP_INHERIT_F0104
 #if H_3D_IC
@@ -4227 +4235 @@
   {
 #if H_3D_VSP
+#if BUGFIX_2_F0093 && MTK_VSP_SIMPLIFICATION_F0111
+    if ( ( ( getAddr() - pcCUAboveLeft->getAddr() ) == 0) && (pcCUAboveLeft->getVSPFlag(uiAboveLeftPartIdx) == 1) 
+#else
     if (pcCUAboveLeft->getVSPFlag(uiAboveLeftPartIdx) == 1
+#endif
 #if LGE_SHARP_VSP_INHERIT_F0104
 #if H_3D_IC

branches/HTM-8.2-dev0-Fix/source/Lib/TLibCommon/TypeDef.h

@@ -249 +249 @@
 
 #if H_3D
+
 #define FIX_MISSING_MACRO_R690                  1 // Missing macro in integration to revision 690
 
@@ -264 +265 @@
 #define MTK_SPIVMP_F0110                        1 // JCT3V-F0110: Sub-PU level inter-view motion prediction
 #define BUGFIX_F0093                            1 // bug fix for F0093 for depth IvMC pruning
+#define BUGFIX_2_F0093                          1 // bug fix for VSP inheritance
 #endif