Changeset 227 in SHVCSoftware

Timestamp:

22 May 2013, 22:34:22 (12 years ago)

Author:

qualcomm

Message:

Move scaled reference layer offsets to SPS extension.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-2.1-dev/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

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

@@ -732 +732 @@
   }
 
+  READ_FLAG( uiCode, "sps_extension_flag");
+  if (uiCode)
+  {
+#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 )
+{
+  // more syntax elements to be parsed here
 #if SCALED_REF_LAYER_OFFSETS
   if( pcSPS->getLayerId() > 0 )
@@ -743 +766 @@
   }
 #endif
-
-  READ_FLAG( uiCode, "sps_extension_flag");
-  if (uiCode)
-  {
-#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

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

@@ -560 +560 @@
       codeVUI(pcSPS->getVuiParameters(), pcSPS);
   }
+
+#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 )
+{
+  // more syntax elements to be written here
 #if SCALED_REF_LAYER_OFFSETS
   if( pcSPS->getLayerId() > 0 )
@@ -570 +586 @@
   }
 #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