Changeset 282 in 3DVCSoftware for branches/HTM-5.1-dev1-LG-Fix

Timestamp:

16 Feb 2013, 01:58:05 (12 years ago)

Author:

lg

Message:

Bug fix of JCT3V-C0046

Location:

branches/HTM-5.1-dev1-LG-Fix/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (3 diffs)

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

@@ -145 +145 @@
 #define LGE_ILLUCOMP_B0045_ENCSIMP        1
 #define FIX_LGE_ILLUCOMP_B0045            1
-#define LGE_ILLUCOMP_DEPTH_C0046          0   // JCT2-C0046 Apply illumination compensation to depth
+#define LGE_ILLUCOMP_DEPTH_C0046          1   // JCT2-C0046 Apply illumination compensation to depth
+#if LGE_ILLUCOMP_DEPTH_C0046
+#define FIX_ILLUCOMP_DEPTH                1
+#endif
 #endif
 

branches/HTM-5.1-dev1-LG-Fix/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1239 +1239 @@
         xCheckRDCostMvInheritance( rpcBestCU, rpcTempCU, uiDepth, false, false );
         rpcTempCU->initEstData( uiDepth, iQP );
+#if FIX_ILLUCOMP_DEPTH
+        rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
+#endif
         xCheckRDCostMvInheritance( rpcBestCU, rpcTempCU, uiDepth, true, false );
         rpcTempCU->initEstData( uiDepth, iQP );

branches/HTM-5.1-dev1-LG-Fix/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -4829 +4829 @@
     m_pcEntropyCoder->encodeMergeIndex( pcCU, 0, 0, true );
 #if LGE_ILLUCOMP_B0045
-    m_pcEntropyCoder->encodeICFlag(pcCU, 0, true);
+    m_pcEntropyCoder->encodeICFlag(pcCU, 0, true
+#if FIX_ILLUCOMP_DEPTH
+      , pcCU->getDepth( 0 )
+#endif
+      );
 #endif
 #if HHI_INTER_VIEW_RESIDUAL_PRED
@@ -6212 +6216 @@
     m_pcEntropyCoder->encodeMergeIndex(pcCU, 0, 0, true);
 #if LGE_ILLUCOMP_B0045
-    m_pcEntropyCoder->encodeICFlag(pcCU, 0, true);
+    m_pcEntropyCoder->encodeICFlag(pcCU, 0, true
+#if FIX_ILLUCOMP_DEPTH
+      , pcCU->getDepth( 0 )
+#endif
+      );
 #endif
 #if HHI_INTER_VIEW_RESIDUAL_PRED
@@ -6235 +6243 @@
     m_pcEntropyCoder->encodePredInfo( pcCU, 0, true );
 #if LGE_ILLUCOMP_B0045
-    m_pcEntropyCoder->encodeICFlag(pcCU, 0, true);
+    m_pcEntropyCoder->encodeICFlag(pcCU, 0, true
+#if FIX_ILLUCOMP_DEPTH
+      , pcCU->getDepth( 0 )
+#endif
+      );
 #endif
 #if HHI_INTER_VIEW_RESIDUAL_PRED