Changeset 674 in SHVCSoftware for branches/SHM-6-dev

Timestamp:

14 Apr 2014, 18:56:22 (11 years ago)

Author:

seregin

Message:

add a check for vps_extension_flag

Location:

branches/SHM-6-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/SHM-6-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -989 +989 @@
   vps->setMaxLayerId(m_numLayers - 1);    // Set max-layer ID
 
+  vps->setVpsExtensionFlag( m_numLayers > 1 ? true : false );
+
   vps->setNumLayerSets(m_numLayers);
   for(Int setId = 1; setId < vps->getNumLayerSets(); setId++)

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

@@ -977 +977 @@
     }
   }
+
+#if VPS_EXTNS
   READ_FLAG( uiCode,  "vps_extension_flag" );      pcVPS->setVpsExtensionFlag( uiCode ? true : false );
 
+  // When MaxLayersMinus1 is greater than 0, vps_extension_flag shall be equal to 1.
+  if( pcVPS->getMaxLayers() > 1 )
+  {
+    assert( pcVPS->getVpsExtensionFlag() == true );
+  }
+
   if( pcVPS->getVpsExtensionFlag()  )
   {
-#if VPS_EXTNS
     while ( m_pcBitstream->getNumBitsRead() % 8 != 0 )
     {
@@ -995 +1002 @@
       }
     }
-#else
-    while ( xMoreRbspData() )
-    {
-      READ_FLAG( uiCode, "vps_extension_data_flag");
-    }
-#endif
   }
   else
@@ -1007 +1008 @@
     defaultVPSExtension(pcVPS);    
   }
+#else
+  READ_FLAG( uiCode,  "vps_extension_flag" );
+  if (uiCode)
+  {
+    while ( xMoreRbspData() )
+    {
+      READ_FLAG( uiCode, "vps_extension_data_flag");
+    }
+  }
+#endif
 
   return;

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

@@ -777 +777 @@
     }
   }
-#if !VPS_EXTNS
-  WRITE_FLAG( 0,                     "vps_extension_flag" );
-#else
-  pcVPS->setVpsExtensionFlag(true);
+#if VPS_EXTNS
+  // When MaxLayersMinus1 is greater than 0, vps_extension_flag shall be equal to 1.
+  if( pcVPS->getMaxLayers() > 1 )
+  {
+    assert( pcVPS->getVpsExtensionFlag() == true );
+  }
+
   WRITE_FLAG( pcVPS->getVpsExtensionFlag() ? 1 : 0,                     "vps_extension_flag" );
 
@@ -799 +802 @@
     WRITE_FLAG( 0,                     "vps_extension2_flag" );   // Flag value of 1 reserved
   }
+#else
+  WRITE_FLAG( 0,                     "vps_extension_flag" );
 #endif  
   //future extensions here..