Changeset 226 in SHVCSoftware for branches/SHM-2.1-dev/source

Timestamp:

22 May 2013, 22:24:23 (12 years ago)

Author:

qualcomm

Message:

Define sps_extension() syntax structure (MACRO: SPS_EXTENSION)

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-2.1-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibDecoder/TDecCAVLC.h (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.h (modified) (1 diff)

branches/SHM-2.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -44 +44 @@
 
 #if SVC_EXTENSION
+#define SPS_EXTENSION                    1      ///< Define sps_extension() syntax structure
 #define SCALED_REF_LAYER_OFFSETS         1      ///< M0309: Signal scaled reference layer offsets in SPS
 #define MAX_LAYERS                       2      ///< max number of layers the codec is supposed to handle

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -747 +747 @@
   if (uiCode)
   {
-    while ( xMoreRbspData() )
-    {
-      READ_FLAG( uiCode, "sps_extension_data_flag");
-    }
-  }
-}
-
+#if SPS_EXTENSION
+    parseSPSExtension( pcSPS );
+    READ_FLAG( uiCode, "sps_extension2_flag");
+    if(uiCode)
+    {
+#endif
+      while ( xMoreRbspData() )
+      {
+        READ_FLAG( uiCode, "sps_extension_data_flag");
+      }
+#if SPS_EXTENSION
+    }
+#endif
+  }
+}
+
+#if SPS_EXTENSION
+Void TDecCavlc::parseSPSExtension( TComSPS* pcSPS )
+{
+  // syntax elements to be parsed here
+}
+#endif
 Void TDecCavlc::parseVPS(TComVPS* pcVPS)
 {

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -80 +80 @@
   Void  parseSPS            ( TComSPS* pcSPS );
 #endif
+#if SPS_EXTENSION
+  Void parseSPSExtension    ( TComSPS* pcSPS );
+#endif
   Void  parsePPS            ( TComPPS* pcPPS);
   Void  parseVUI            ( TComVUI* pcVUI, TComSPS* pcSPS );

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

@@ -571 +571 @@
 #endif
 
+#if SPS_EXTENSION
+  WRITE_FLAG( 1, "sps_extension_flag" );
+  if( 1 )   // if( sps_extension_flag )
+  {
+    codeSPSExtension( pcSPS );
+    WRITE_FLAG( 0, "sps_extension2_flag" );
+  }
+#else
   WRITE_FLAG( 0, "sps_extension_flag" );
-}
-
+#endif
+}
+#if SPS_EXTENSION
+Void TEncCavlc::codeSPSExtension( TComSPS* pcSPS )
+{
+  // syntax elements to be written here
+}
+#endif
 Void TEncCavlc::codeVPS( TComVPS* pcVPS )
 {

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

@@ -89 +89 @@
   Void  codeVUI                 ( TComVUI *pcVUI, TComSPS* pcSPS );
   Void  codeSPS                 ( TComSPS* pcSPS );
+#if SPS_EXTENSION
+  Void codeSPSExtension         ( TComSPS* pcSPS );
+#endif
   Void  codePPS                 ( TComPPS* pcPPS );
   Void  codeSliceHeader         ( TComSlice* pcSlice );