Changeset 874 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder

Timestamp:

28 Aug 2014, 00:57:07 (10 years ago)

Author:

qualcomm

Message:

Removal of avc_base_layer_flag. This flag was in the earlier version of spec but have been replaced by two other flags vps_base_layer_internal_flag and vps_base_layer_available_flag
(MACRO: VPS_AVC_BL_FLAG_REMOVAL)

From: Hendry (fhendry@…)

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

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

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

@@ -67 +67 @@
 : m_pBitstreamFile()
 #if AVC_BASE
+#if VPS_AVC_BL_FLAG_REMOVAL
+, m_nonHEVCBaseLayerFlag(0)
+#else
 , m_avcBaseLayerFlag(0)
+#endif
 #endif
 , m_maxTidRefPresentFlag(1)
@@ -743 +747 @@
 #endif
 #if AVC_BASE
+#if VPS_AVC_BL_FLAG_REMOVAL
+  ("NonHEVCBase,-nonhevc",            m_nonHEVCBaseLayerFlag,     0, "BL is available but not internal")
+#else
   ("AvcBase,-avc",            m_avcBaseLayerFlag,     0, "avc_base_layer_flag")
+#endif
   ("InputBLFile,-ibl",        cfg_BLInputFile,     string(""), "Base layer rec YUV input file name")
 #endif
@@ -1216 +1224 @@
 #if SVC_EXTENSION
 #if AVC_BASE
+#if VPS_AVC_BL_FLAG_REMOVAL
+  if( m_nonHEVCBaseLayerFlag )
+#else
   if( m_avcBaseLayerFlag )
+#endif
   {
     *cfg_InputFile[0] = cfg_BLInputFile;
@@ -2574 +2586 @@
   
   // it can be updated after AVC BL support will be added to the WD
+#if VPS_AVC_BL_FLAG_REMOVAL
+  if( m_nonHEVCBaseLayerFlag )
+#else
   if( m_avcBaseLayerFlag )
+#endif
   {
     m_crossLayerIrapAlignFlag = false;
@@ -3561 +3577 @@
   printf("Scalable                      : %d\n", m_scalabilityMask[SCALABILITY_ID] );
 #if AVC_BASE
+#if VPS_AVC_BL_FLAG_REMOVAL
+  printf("Base layer                    : %s\n", m_nonHEVCBaseLayerFlag ? "Non-HEVC" : "HEVC");
+#else
   printf("Base layer                    : %s\n", m_avcBaseLayerFlag ? "AVC" : "HEVC");
+#endif
 #endif
 #if AUXILIARY_PICTURES

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

@@ -69 +69 @@
   Int       m_framesToBeEncoded;                              ///< number of encoded frames
 #if AVC_BASE
+#if VPS_AVC_BL_FLAG_REMOVAL
+  Int       m_nonHEVCBaseLayerFlag;                           ///< non HEVC BL
+#else
   Int       m_avcBaseLayerFlag;                               ///< avc_baselayer_flag
+#endif
 #endif
   Bool      m_maxTidRefPresentFlag; 

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

@@ -234 +234 @@
 #if REF_IDX_MFM
 #if AVC_BASE
+#if VPS_AVC_BL_FLAG_REMOVAL
+    m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : ( m_nonHEVCBaseLayerFlag ? false : true ) && m_acLayerCfg[layer].getNumMotionPredRefLayers());
+#else
     m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : ( m_avcBaseLayerFlag ? false : true ) && m_acLayerCfg[layer].getNumMotionPredRefLayers());
+#endif
 #else
     m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : ( m_acLayerCfg[layer].getNumMotionPredRefLayers() > 0 ) );
@@ -1239 +1243 @@
   UInt i = 0, dimIdLen = 0;
 #if AVC_BASE
+#if VPS_AVC_BL_FLAG_REMOVAL
+  vps->setNonHEVCBaseLayerFlag( m_nonHEVCBaseLayerFlag );
+  if ( m_nonHEVCBaseLayerFlag )
+  {
+    vps->setBaseLayerInternalFlag (false);
+  }
+#else
   vps->setAvcBaseLayerFlag(m_avcBaseLayerFlag);
+#endif
 #else
   vps->setAvcBaseLayerFlag(false);