Changeset 423 in 3DVCSoftware

Timestamp:

20 May 2013, 02:48:30 (12 years ago)

Author:

lg

Message:

D0135 : #define LGE_ROUND_OFFSET_D0135 1

Location:

branches/HTM-6.2-dev1-LG/source/Lib/TLibCommon

Files:

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

branches/HTM-6.2-dev1-LG/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3820 +3820 @@
 #endif //  H3D_IVMP 
 
-#if MERL_VSP_COMPENSATION_C0152
-  //===== vsp 0 ===== 
-#if LGE_VSP_INHERIT_D0092
-  if ( !xAddVspMergeCand(0, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )
-#else
-  if( iCount < 4 + extraMergeCand )
-    if ( !xAddVspMergeCand(0, 1, bVspMvZeroDone, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )
-#endif
-      return;
-#endif
-
   //left
   UInt uiLeftPartIdx = 0;
@@ -3919 +3908 @@
   }
 
-#if MERL_VSP_COMPENSATION_C0152
-  //===== vsp 1 =====
-#if LGE_VSP_INHERIT_D0092
-    if ( !xAddVspMergeCand(1, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )
-#else
-    if( iCount < 4 + extraMergeCand )
-        if ( !xAddVspMergeCand(1, 1, bVspMvZeroDone, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )
-#endif
-            return;
-#endif
-
   // above
   UInt uiAbovePartIdx = 0;
@@ -4012 +3990 @@
 #endif
   }
-
-#if MERL_VSP_COMPENSATION_C0152
-  //===== vsp 2 =====
-#if LGE_VSP_INHERIT_D0092
-    if ( !xAddVspMergeCand(2, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )
-#else
-    if( iCount < 4 + extraMergeCand )
-        if ( !xAddVspMergeCand(2, 1, bVspMvZeroDone, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )
-#endif
-            return;
-#endif
 
   // above right
@@ -4213 +4180 @@
     }
 #endif
-#endif
-
-#if MERL_VSP_COMPENSATION_C0152
-    //===== vsp 4 =====
-    if( iCount < 4 + extraMergeCand )
-#if LGE_VSP_INHERIT_D0092
-        if ( !xAddVspMergeCand(4, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )
-#else
-        if ( !xAddVspMergeCand(4, 1, bVspMvZeroDone, uiDepth, abCandIsInter, iCount, puhInterDirNeighbours, pcMvFieldNeighbours, iVSPIndexTrue, mrgCandIdx, &cDisInfo) )
-#endif
-            return;
 #endif
 

branches/HTM-6.2-dev1-LG/source/Lib/TLibCommon/TypeDef.h

@@ -162 +162 @@
 #define FIX_APPENCTOP_T_ONLY              1   // For Texture-only coding
 #define LGE_ROUND_OFFSET_D0135            1   // JCT3V-D0135 Rounding offset
-#define LGE_SAO_MIGRATION_D0091           1
+#define LGE_SAO_MIGRATION_D0091           0
 
 #if LGE_SAO_MIGRATION_D0091
@@ -201 +201 @@
 
 #define MTK_D0156                 1
-#define LGE_VSP_INHERIT_D0092     1
+#define LGE_VSP_INHERIT_D0092     0
 /*
  * Two macros are used to configure combinations of JCT3V-C0152 and JCT3V-C0131