Changeset 613 in 3DVCSoftware for branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp

Timestamp:

3 Sep 2013, 19:44:30 (12 years ago)

Author:

hhi

Message:

LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX: Fix for LGE_PKU_DMM3_OVERLAP_E0159, now including all DMM3 overlap related code.

File:

• branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp (modified) (1 diff)

branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp

@@ -2852 +2852 @@
   Int           uiColTexIntraDir = pcColTexCU->isIntra( uiTexPartIdx ) ? pcColTexCU->getLumaIntraDir( uiTexPartIdx ) : 255;
 
+#if LGE_PKU_DMM3_OVERLAP_E0159_HHIFIX
+  assert( uiColTexIntraDir > DC_IDX && uiColTexIntraDir < 35 );
+  return g_aauiWdgLstM3[g_aucConvertToBit[uiWidth]][uiColTexIntraDir-2].at(intraTabIdx);
+#else
   if( uiColTexIntraDir > DC_IDX && uiColTexIntraDir < 35 ) { return g_aauiWdgLstM3[g_aucConvertToBit[uiWidth]][uiColTexIntraDir-2].at(intraTabIdx); }
   else                                                     { return g_dmmWedgeNodeLists[(g_aucConvertToBit[uiWidth])].at(intraTabIdx).getPatternIdx(); }
+#endif
 }