Changeset 1424 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

5 Aug 2015, 19:23:14 (9 years ago)

Author:

seregin

Message:

fix uninitialized variables at encoder

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCfg.h (modified) (2 diffs)
• TEncSearch.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -395 +395 @@
   UInt      m_layerId;   
   UInt      m_numLayer;
-  Int       m_elRapSliceBEnabled;
+  Bool      m_elRapSliceBEnabled;
   Int       m_adaptiveResolutionChange;
   Int       m_layerSwitchOffBegin;
@@ -1096 +1096 @@
   Void      setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
   Void      setElRapSliceTypeB(Int bEnabled)                 { m_elRapSliceBEnabled = bEnabled;   }
-  Int       getElRapSliceTypeB()                             { return m_elRapSliceBEnabled;       }
+  Bool      getElRapSliceTypeB()                             { return m_elRapSliceBEnabled;       }
   Void      setAdaptiveResolutionChange(Int x)               { m_adaptiveResolutionChange = x;    }
   Int       getAdaptiveResolutionChange()                    { return m_adaptiveResolutionChange; }

branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2354 +2354 @@
       if (m_pcEncCfg->getFastUDIUseMPMEnabled())
       {
-#if FAST_INTRA_SHVC == 0
+#if !FAST_INTRA_SHVC
         Int uiPreds[NUM_MOST_PROBABLE_MODES] = {-1, -1, -1};