Changeset 109 in SHVCSoftware

Timestamp:

3 Apr 2013, 01:05:45 (12 years ago)

Author:

qualcomm

Message:

Function structure for VPS extension (MACRO: VPS_EXTNS)

Added VPS extension flag and function structure for VPS extension.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/HM-10.0-dev-SHM/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/HM-10.0-dev-SHM/source/Lib/TLibCommon/TypeDef.h

@@ -45 +45 @@
 #if SVC_EXTENSION
 #define VPS_RENAME                       1      ///< Rename variables max_layer_id and num_layer_sets_minus1 in VPS
+#define VPS_EXTNS                        1      ///< Include function structure for VPS extensions
 #define MAX_LAYERS                       2      ///< max number of layers the codec is supposed to handle
 

branches/HM-10.0-dev-SHM/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -815 +815 @@
   if (uiCode)
   {
+#if VPS_EXTNS
+    parseVPSExtension(pcVPS);
+    READ_FLAG( uiCode, "vps_entension2_flag" );
+    if(uiCode)
+    {
+      while ( xMoreRbspData() )
+      {
+        READ_FLAG( uiCode, "vps_extension_data_flag");
+      }
+    }
+#else
     while ( xMoreRbspData() )
     {
       READ_FLAG( uiCode, "vps_extension_data_flag");
     }
+#endif
   }
   
   return;
 }
+
+#if VPS_EXTNS
+Void TDecCavlc::parseVPSExtension(TComVPS *vps)
+{  
+  // ... More syntax elements to be parsed here
+
+  // ... More syntax elements to be parsed here
+}
+#endif
 
 Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager)

branches/HM-10.0-dev-SHM/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -81 +81 @@
   Void  parseQtRootCbf      ( UInt uiAbsPartIdx, UInt& uiQtRootCbf );
   Void  parseVPS            ( TComVPS* pcVPS );
+#if VPS_EXTNS
+  Void  parseVPSExtension   ( TComVPS* pcVPS );
+#endif
   Void  parseSPS            ( TComSPS* pcSPS );
   Void  parsePPS            ( TComPPS* pcPPS);

branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -649 +649 @@
   }
 #endif
+#if !VPS_EXTNS
   WRITE_FLAG( 0,                     "vps_extension_flag" );
-  
+#else
+  WRITE_FLAG( 1,                     "vps_extension_flag" );
+  codeVPSExtension(pcVPS);
+  WRITE_FLAG( 0,                     "vps_extension2_flag" );   // Flag value of 1 reserved
+#endif  
   //future extensions here..
   
   return;
 }
+
+#if VPS_EXTNS
+Void TEncCavlc::codeVPSExtension (TComVPS *vps)
+{
+  // ... More syntax elements to be written here
+
+  // ... More syntax elements to be written here
+}
+#endif
 
 Void TEncCavlc::codeSliceHeader         ( TComSlice* pcSlice )

branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncCavlc.h

@@ -89 +89 @@
   UInt  getCoeffCost          ()                { return  m_uiCoeffCost;  }
   Void  codeVPS                 ( TComVPS* pcVPS );
+#if VPS_EXTNS
+  Void  codeVPSExtension        ( TComVPS* pcVPS );
+#endif
   Void  codeVUI                 ( TComVUI *pcVUI, TComSPS* pcSPS );
   Void  codeSPS                 ( TComSPS* pcSPS );