Changeset 228 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib

Timestamp:

23 May 2013, 00:07:32 (12 years ago)

Author:

qualcomm

Message:

Condition signaling of scaled reference layer offsets (MACRO: SCALED_REF_LAYER_OFFSET_FLAG)

Condition signaling of scaled reference layer offsets on scaled_ref_layer_offset_flag.

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)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -45 +45 @@
 #if SVC_EXTENSION
 #define SPS_EXTENSION                    1      ///< Define sps_extension() syntax structure
+#define SCALED_REF_LAYER_OFFSET_FLAG     1      ///< M0309: Signal scaled reference layer offsets in SPS
 #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

@@ -754 +754 @@
 Void TDecCavlc::parseSPSExtension( TComSPS* pcSPS )
 {
+  UInt uiCode;
   // more syntax elements to be parsed here
 #if SCALED_REF_LAYER_OFFSETS
+#if SCALED_REF_LAYER_OFFSET_FLAG
+  READ_FLAG( uiCode, "scaled_ref_layer_offset_present_flag" );
+  if( uiCode )
+#else
   if( pcSPS->getLayerId() > 0 )
+#endif
   {
     Int iCode;

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

@@ -577 +577 @@
   // more syntax elements to be written here
 #if SCALED_REF_LAYER_OFFSETS
+#if SCALED_REF_LAYER_OFFSET_FLAG
+  WRITE_FLAG( pcSPS->getLayerId() > 0, "scaled_ref_layer_offset_present_flag" );
   if( pcSPS->getLayerId() > 0 )
+#else
+  if( pcSPS->getLayerId() > 0 )
+#endif
   {
     Window scaledWindow = pcSPS->getScaledRefLayerWindow();