Changeset 559 in SHVCSoftware for branches/SHM-5.0-dev/source/App

Timestamp:

27 Jan 2014, 17:15:16 (11 years ago)

Author:

seregin

Message:

delete M0457_IL_SAMPLE_PRED_ONLY_FLAG macro and related code

Location:

branches/SHM-5.0-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -80 +80 @@
   {
     m_acLayerCfg[layer].setAppEncCfg(this);
-#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
-    m_ilSampleOnlyPred[layer] = 0;
-#endif
   }
   memset( m_scalabilityMask, 0, sizeof(m_scalabilityMask) );
@@ -629 +626 @@
 #endif
   ("EnableElRapB,-use-rap-b",  m_elRapSliceBEnabled, 0, "Set ILP over base-layer I picture to B picture (default is P picture)")
-#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
-  ("IlSampleOnlyPred%d",       m_ilSampleOnlyPred, 0, MAX_LAYERS, "Set inter_layer_sample_pred_only_flag for all slices")
-#endif
 #else //SVC_EXTENSION
   ("InputFile,i",           cfg_InputFile,     string(""), "Original YUV input file name")

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

@@ -72 +72 @@
 #if AVC_SYNTAX
   Char*     m_BLSyntaxFile;                                   ///< input syntax file
-#endif
-#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
-  Int       m_ilSampleOnlyPred[ MAX_LAYERS ];
 #endif
 #if N0120_MAX_TID_REF_CFG

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

@@ -220 +220 @@
     m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : true);
 #endif
-#endif
-#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
-    m_acTEncTop[layer].setIlSampleOnlyPred( layer == 0 ? 0 : m_ilSampleOnlyPred[layer] );
 #endif
 #endif