Changeset 1424 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

fix uninitialized variables at encoder

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (8 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncCfg.h (modified) (2 diffs)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -119 +119 @@
 , m_snrInternalColourSpace(false)
 , m_outputInternalColourSpace(false)
-, m_elRapSliceBEnabled(0)
+, m_elRapSliceBEnabled(false)
 {
   memset( m_apcLayerCfg, 0, sizeof(m_apcLayerCfg) );
@@ -1146 +1146 @@
   ("InputBLFile,-ibl",                                cfg_BLInputFile,                             string(""), "Base layer rec YUV input file name")
 #endif
-  ("EnableElRapB,-use-rap-b",                         m_elRapSliceBEnabled,                                 0, "Set ILP over base-layer I picture to B picture (default is P picture)")
+  ("EnableElRapB,-use-rap-b",                         m_elRapSliceBEnabled,                             false, "Set ILP over base-layer I picture to B picture (default is P picture)")
   ("InputChromaFormat",                               tmpInputChromaFormat,                               420, "InputChromaFormatIDC")
   ("ChromaFormatIDC,-cf",                             tmpChromaFormat,                                      0, "ChromaFormatIDC (400|420|422|444 or set 0 (default) for same as InputChromaFormat)")
@@ -1188 +1188 @@
   ("ConfWinTop",                                      m_confWinTop,                                         0, "Top offset for window conformance mode 3")
   ("ConfWinBottom",                                   m_confWinBottom,                                      0, "Bottom offset for window conformance mode 3")
+#endif
   ("AccessUnitDelimiter",                             m_AccessUnitDelimiter,                            false, "Enable Access Unit Delimiter NALUs")
+#if !SVC_EXTENSION
   ("FrameRate,-fr",                                   m_iFrameRate,                                         0, "Frame rate")
 #if Q0074_COLOUR_REMAPPING_SEI
@@ -1414 +1416 @@
   ("LFCrossTileBoundaryFlag",                         m_bLFCrossTileBoundaryFlag,                        true, "1: cross-tile-boundary loop filtering. 0:non-cross-tile-boundary loop filtering")
 #if SVC_EXTENSION
+#if FAST_INTRA_SHVC
+  ("FIS",                                             m_useFastIntraScalable,                           false, "Fast Intra Decision for Scalable HEVC")
+#endif
   ("WaveFrontSynchro%d",                              cfg_waveFrontSynchro,                   0,  m_numLayers, "0: no synchro; 1 synchro with TR; 2 TRR etc")
   ("ScalingList%d",                                   cfg_UseScalingListId,     SCALING_LIST_OFF, m_numLayers, "0/off: no scaling list, 1/default: default scaling lists, 2/file: scaling lists specified in ScalingListFile")
@@ -1436 +1441 @@
   ("CFM",                                             m_bUseCbfFastMode,                                false, "Cbf fast mode setting")
   ("ESD",                                             m_useEarlySkipDetection,                          false, "Early SKIP detection setting")
-#if FAST_INTRA_SHVC
-  ("FIS",                                             m_useFastIntraScalable, false, "Fast Intra Decision for Scalable HEVC")
-#endif
 #if RC_SHVC_HARMONIZATION
   ("RateControl%d",                                   cfg_RCEnableRateControl,             false, m_numLayers, "Rate control: enable rate control for layer %d")
@@ -4525 +4527 @@
   printf("CFM:%d ", m_bUseCbfFastMode                    );
   printf("ESD:%d ", m_useEarlySkipDetection              );
-#if FAST_INTRA_SHVC
-  printf("FIS:%d ", m_useFastIntraScalable  );
-#endif
   printf("RQT:%d ", 1                                    );
   printf("TransformSkip:%d ",     m_useTransformSkip     );
@@ -4572 +4571 @@
 
   printf(" SignBitHidingFlag:%d ", m_signHideFlag);
+  printf("RecalQP:%d ", m_recalculateQPAccordingToLambda ? 1 : 0 );
+
 #if SVC_EXTENSION
-  printf("RecalQP:%d ", m_recalculateQPAccordingToLambda ? 1 : 0 );
-  printf("EL_RAP_SliceType: %d ", m_elRapSliceBEnabled);
+  printf("\n\nSHVC TOOL CFG: ");
+  printf("ElRapSliceType: %c-slice ", m_elRapSliceBEnabled ? 'B' : 'P');
   printf("REF_IDX_ME_ZEROMV: %d ", REF_IDX_ME_ZEROMV);
   printf("ENCODER_FAST_MODE: %d ", ENCODER_FAST_MODE);
+#if FAST_INTRA_SHVC
+  printf("FIS:%d ", m_useFastIntraScalable  );
+#endif
 #if CGS_3D_ASYMLUT
   printf("CGS: %d CGSMaxOctantDepth: %d CGSMaxYPartNumLog2: %d CGSLUTBit:%d ", m_nCGSFlag, m_nCGSMaxOctantDepth, m_nCGSMaxYPartNumLog2, m_nCGSLUTBit );
@@ -4584 +4588 @@
 #endif
 #endif
-#else
-  printf("RecalQP:%d", m_recalculateQPAccordingToLambda ? 1 : 0 );
 #endif
 

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -482 +482 @@
 #endif
   Bool      m_altOutputLayerFlag;                             ///< Specifies the value of alt_output_laye_flag in VPS extension
-  Int       m_elRapSliceBEnabled;
+  Bool      m_elRapSliceBEnabled;
 #endif
 #if Q0074_COLOUR_REMAPPING_SEI

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -373 +373 @@
     }
 
+    m_cTEncTop.setElRapSliceTypeB                        ( m_elRapSliceBEnabled );
+
     m_cTEncTop.setAdaptiveResolutionChange               ( m_adaptiveResolutionChange );
     m_cTEncTop.setLayerSwitchOffBegin                    ( m_apcLayerCfg[layer]->m_layerSwitchOffBegin );
@@ -390 +392 @@
 #endif
     m_cTEncTop.setNumAddLayerSets                        ( m_numAddLayerSets );
+
+#if FAST_INTRA_SHVC
+    m_cTEncTop.setUseFastIntraScalable                              ( m_useFastIntraScalable );
+#endif
 
 #if P0123_ALPHA_CHANNEL_SEI
@@ -826 +832 @@
   m_cTEncTop.setSummaryVerboseness                                ( m_summaryVerboseness );
 
-#if FAST_INTRA_SHVC
-  m_cTEncTop.setUseFastIntraScalable                              ( m_useFastIntraScalable );
-#endif
 #if Q0074_COLOUR_REMAPPING_SEI
 #if SVC_EXTENSION

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};