Changeset 1025 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

7 Feb 2015, 08:33:38 (10 years ago)

Author:

seregin

Message:

fix for the ticket #61

File:

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

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

@@ -342 +342 @@
 #else
   READ_FLAG( uiCode, "pps_extension_present_flag");
+  UInt ppsExtension6bits = 0;
 #endif
 
@@ -467 +468 @@
     READ_FLAG( uiCode, "pps_multilayer_extension_flag" );
     assert(uiCode == 1);
+#if SVC_EXTENSION
+    READ_CODE(6, ppsExtension6bits, "pps_extension_6bits");
+#else
     READ_CODE(6, uiCode, "pps_extension_6bits");
     assert(uiCode == 0);
+#endif
 
     READ_FLAG( uiCode, "poc_reset_info_present_flag" );
@@ -558 +563 @@
 #endif
   }
+
+#if SVC_EXTENSION
+  if( ppsExtension6bits )
+  {
+    while( xMoreRbspData() )
+    {
+      READ_FLAG( uiCode, "pps_extension_data_flag" );
+    }
+  }
+#endif
 #endif
 
@@ -1114 +1129 @@
 #if SVC_EXTENSION
   pcSPS->setExtensionFlag( uiCode ? true : false );
+  UInt spsExtension6bits = 0;
 
   if( pcSPS->getExtensionFlag() )
@@ -1147 +1163 @@
     READ_FLAG( uiCode, "sps_multilayer_extension_flag" );
     assert(uiCode == 1);
-    READ_CODE(6, uiCode, "sps_extension_6bits");
-    assert(uiCode == 0);
+    READ_CODE(6, spsExtension6bits, "sps_extension_6bits");
     parseSPSExtension( pcSPS );
   }
 #endif
+  if( spsExtension6bits )
+  {
+    while( xMoreRbspData() )
+    {
+      READ_FLAG( uiCode, "sps_extension_data_flag" );
+    }
+  }
 #else
   if (uiCode)