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

Timestamp:

6 Jun 2014, 20:36:57 (11 years ago)

Author:

seregin

Message:

remove SPS_EXTENSION

Location:

branches/SHM-6-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (3 diffs)
• TEncCavlc.h (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -639 +639 @@
   }
 
-#if SPS_EXTENSION
-  WRITE_FLAG( 1, "sps_extension_flag" );
-  if( 1 )   // if( sps_extension_flag )
+#if SVC_EXTENSION
+  WRITE_FLAG( pcSPS->getExtensionFlag() ? 1 : 0, "sps_extension_flag" );
+
+  if( pcSPS->getExtensionFlag() )
   {
 #if O0142_CONDITIONAL_SPS_EXTENSION
@@ -662 +663 @@
 #endif
 }
-#if SPS_EXTENSION
+
+#if SVC_EXTENSION
 Void TEncCavlc::codeSPSExtension( TComSPS* pcSPS )
 {
@@ -689 +691 @@
   }
 }
-#endif
+#endif //SVC_EXTENSION
+
 Void TEncCavlc::codeVPS( TComVPS* pcVPS )
 {

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.h

@@ -159 +159 @@
   Void codeDFSvlc       ( Int   iCode, const Char *pSymbolName );
 
-#if SPS_EXTENSION
+#if SVC_EXTENSION
   Void codeSPSExtension        ( TComSPS* pcSPS );
   Void codeVPSExtension        ( TComVPS* pcVPS );

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -912 +912 @@
 {
 #if SVC_EXTENSION
+  m_cSPS.setExtensionFlag( m_layerId > 0 ? true : false );
+
 #if Q0078_ADD_LAYER_SETS
   if (getNumDirectRefLayers() == 0 && getNumAddLayerSets() > 0)