Changeset 9 in SHVCSoftware for branches/0.1.1-bugfix/source

Timestamp:

16 Nov 2012, 18:59:17 (12 years ago)

Author:

seregin

Message:

Bug fix for IntraBL 4x4 transform using inverse DCT. Patch was provided by Patrice Onno <Patrice.Onno@…>

Location:

branches/0.1.1-bugfix/source/Lib

Files:

• TLibCommon/CommonDef.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCu.cpp (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (1 diff)

branches/0.1.1-bugfix/source/Lib/TLibCommon/CommonDef.h

@@ -56 +56 @@
 // ====================================================================================================================
 
-#define NV_VERSION        "0.1.1"                 ///< Current software version
+#define NV_VERSION        "0.1.1bf"                 ///< Current software version
 
 // ====================================================================================================================

branches/0.1.1-bugfix/source/Lib/TLibCommon/TypeDef.h

@@ -55 +55 @@
 #else
 #define INTRA_BL                         1      ///< inter-layer texture prediction
+#if INTRA_BL
+#define INTRA_BL_DCT_FIX                 1      ///< fix : use DCT reconstruction instead of DST
+#endif
 // Hooks
 #if !AVC_BASE

branches/0.1.1-bugfix/source/Lib/TLibDecoder/TDecCu.cpp

@@ -556 +556 @@
   Int scalingListType = (pcCU->isIntra(uiAbsPartIdx) ? 0 : 3) + g_eTTable[(Int)TEXT_LUMA];
   assert(scalingListType < 6);
+#if INTRA_BL_DCT_FIX
+  if(pcCU->isIntraBL(uiAbsPartIdx))
+  {
+    m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA, REG_DCT, piResi, uiStride, pcCoeff, uiWidth, uiHeight, scalingListType, useTransformSkip );
+  }
+  else
+  {
+    m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA, pcCU->getLumaIntraDir( uiAbsPartIdx ), piResi, uiStride, pcCoeff, uiWidth, uiHeight, scalingListType, useTransformSkip );
+  }
+#else
   m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA, pcCU->getLumaIntraDir( uiAbsPartIdx ), piResi, uiStride, pcCoeff, uiWidth, uiHeight, scalingListType, useTransformSkip );
+#endif
 
   

branches/0.1.1-bugfix/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -1145 +1145 @@
     Int scalingListType = 0 + g_eTTable[(Int)TEXT_LUMA];
     assert(scalingListType < 6);
+#if INTRA_BL_DCT_FIX
+    if(pcCU->isIntraBL(uiAbsPartIdx))
+    {
+      m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA, REG_DCT, piResi, uiStride, pcCoeff, uiWidth, uiHeight, scalingListType, useTransformSkip );
+    }
+    else
+    {
+      m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA,pcCU->getLumaIntraDir( uiAbsPartIdx ), piResi, uiStride, pcCoeff, uiWidth, uiHeight, scalingListType, useTransformSkip );
+    }
+#else
     m_pcTrQuant->invtransformNxN( pcCU->getCUTransquantBypass(uiAbsPartIdx), TEXT_LUMA,pcCU->getLumaIntraDir( uiAbsPartIdx ), piResi, uiStride, pcCoeff, uiWidth, uiHeight, scalingListType, useTransformSkip );
+#endif
   }
   else