Changeset 674 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibDecoder

Timestamp:

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

Author:

seregin

Message:

add a check for vps_extension_flag

File:

• branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

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;