Changeset 1370 in 3DVCSoftware for branches

Timestamp:

28 Oct 2015, 21:25:34 (9 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-15.2-dev/source

Files:

• App/TAppDecoder/TAppDecCfg.cpp (modified) (1 diff)
• Lib/TLibCommon/TComPicYuv.cpp (modified) (1 diff)
• Lib/TLibCommon/TComRdCost.h (modified) (1 diff)
• Lib/TLibCommon/TComRom.cpp (modified) (1 diff)

branches/HTM-15.2-dev/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -148 +148 @@
   }
 
+#if NH_3D
+  m_pchScaleOffsetFile = cfg_ScaleOffsetFile.empty() ? NULL : strdup(cfg_ScaleOffsetFile.c_str());
+#endif
+
   if (m_bitstreamFileName.empty())
   {

branches/HTM-15.2-dev/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -91 +91 @@
 
 #if NH_3D_IV_MERGE
-// Check if m_iBaseUnitWidth and m_iBaseUnitHeight need to be derived here
+  m_iCuWidth        = maxCUWidth;
+  m_iCuHeight       = maxCUHeight;
+
+  m_iNumCuInWidth   = picWidth / m_iCuWidth;
+  m_iNumCuInWidth  += ( picHeight % m_iCuWidth ) ? 1 : 0;
+  // Check if m_iBaseUnitWidth and m_iBaseUnitHeight need to be derived here
 #endif
 

branches/HTM-15.2-dev/source/Lib/TLibCommon/TComRdCost.h

@@ -130 +130 @@
      m_maximumDistortionForEarlyExit(std::numeric_limits<Distortion>::max()),
      iSubShift(0)
-  { }
+  {
+#if NH_3D_VSO
+    // SAIT_VSO_EST_A0033
+    pVirRec = NULL;
+    pVirOrg = NULL;
+    iStrideVir = 0;
+#endif
+#if NH_3D_SDC_INTER
+    bUseSDCMRSAD = false;
+#endif
+  }
 };
 

branches/HTM-15.2-dev/source/Lib/TLibCommon/TComRom.cpp

@@ -537 +537 @@
 const Bool g_bEncDecTraceEnable  = true;
 const Bool g_bEncDecTraceDisable = false;
-Bool   g_HLSTraceEnable = true;
+Bool   g_HLSTraceEnable = false;
 Bool   g_bJustDoIt = false;
 UInt64 g_nSymbolCounter = 0;