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

Timestamp:

10 Apr 2014, 02:39:09 (11 years ago)

Author:

seregin

Message:

fix encoder setting for rep_format_idx_present_flag and add check for vps_num_rep_formats_minus1

File:

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

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

@@ -1438 +1438 @@
   READ_UVLC( uiCode, "vps_num_rep_formats_minus1" );
   vps->setVpsNumRepFormats( uiCode + 1 );
+
+  // The value of vps_num_rep_formats_minus1 shall be in the range of 0 to 255, inclusive.
+  assert( vps->getVpsNumRepFormats() > 0 && vps->getVpsNumRepFormats() <= 256 );
+
   for(i = 0; i < vps->getVpsNumRepFormats(); i++)
   {
@@ -1454 +1458 @@
   else
   {
+    // When not present, the value of rep_format_idx_present_flag is inferred to be equal to 0
     vps->setRepFormatIdxPresentFlag( false );
   }
+
   if( vps->getRepFormatIdxPresentFlag() )
   {