Changeset 963 in SHVCSoftware

Timestamp:

6 Jan 2015, 04:38:59 (10 years ago)

Author:

seregin

Message:

port R0124 (rev 954)

Location:

branches/SHM-upgrade/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -1031 +1031 @@
   READ_CODE( 6,  uiCode,  "vps_max_layers_minus1" );              pcVPS->setMaxLayers( uiCode + 1 );
 #endif
+  assert( pcVPS->getBaseLayerInternalFlag() || pcVPS->getMaxLayers() > 1 );
 #else
   READ_CODE( 6,  uiCode,  "vps_reserved_zero_6bits" );            assert(uiCode == 0);

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -818 +818 @@
 #endif
 #if SVC_EXTENSION
-  WRITE_CODE( pcVPS->getMaxLayers() - 1,            6,        "vps_max_layers_minus1" );            
+  WRITE_CODE( pcVPS->getMaxLayers() - 1,            6,        "vps_max_layers_minus1" );
+  assert( pcVPS->getBaseLayerInternalFlag() || pcVPS->getMaxLayers() > 1 );
 #else
   WRITE_CODE( 0,                                    6,        "vps_reserved_zero_6bits" );