Changeset 173 in 3DVCSoftware for branches/HTM-4.1-dev1-HHI/source/Lib

Timestamp:

9 Nov 2012, 12:46:33 (12 years ago)

Author:

tech

Message:

Incorporated FIX_LGE_IVMP_PARALLEL_MERGE_B0136

Location:

branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon

Files:

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

branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5711 +5711 @@
 #if LGE_DVMCP
 #if QC_SIMPLE_NBDV_B0047
+#if FIX_LGE_IVMP_PARALLEL_MERGE_B0136
+      getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo, false); 
+#else
       getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo); 
+#endif
 #else
       getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo, false, eRefPicList, iRefIdx );
@@ -5767 +5771 @@
 #if LGE_DVMCP
 #if QC_SIMPLE_NBDV_B0047 
+#if FIX_LGE_IVMP_PARALLEL_MERGE_B0136
+    getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo, false);
+#else
     getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo);
+#endif
 #else
     getDisMvpCand2(uiPartIdx, uiPartAddr, &cDisInfo, false, eRefPicList, iRefIdx );
@@ -7653 +7661 @@
 #if LGE_DVMCP
 #if QC_SIMPLE_NBDV_B0047
+#if FIX_LGE_IVMP_PARALLEL_MERGE_B0136
+  getDisMvpCand2( 0, 0,  &cDisInfo, false);
+#else
   getDisMvpCand2( 0, 0,  &cDisInfo);
+#endif
 #else
   getDisMvpCand2( 0, 0,  &cDisInfo, true );

branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TypeDef.h

@@ -42 +42 @@
 //! \{
 
+// A
 #define FIXES                             1
 #define POZNAN_CABAC_INIT_FLAG_FIX        1
@@ -54 +55 @@
 #define FIX_REMOVE_TILE_DEPENDENCE        1
 #define FIX_DBL_CONTROL_DEFAULT           1
+
+
+// B
+#define FIX_LGE_IVMP_PARALLEL_MERGE_B0136 1
+
 
 #define DV_DERIVATION_PARALLEL_B0096      1 //JCT3V-B0096, enable parallel derivation of disparity vector