Changeset 1454 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

19 Aug 2015, 04:20:49 (9 years ago)

Author:

seregin

Message:

fix inference of layer_set_idx_for_ols_minus1, ticket #84

File:

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

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

@@ -2901 +2901 @@
         numBits++;
       }
-      READ_CODE( numBits, uiCode, "layer_set_idx_for_ols_minus1");   vps->setOutputLayerSetIdx( i, uiCode + 1);
+      READ_CODE( numBits, uiCode, "layer_set_idx_for_ols_minus1");
     }
     else
     {
-      vps->setOutputLayerSetIdx( i, i );
-    }
+      uiCode = 0;
+    }
+
+    vps->setOutputLayerSetIdx( i, i < vps->getNumLayerSets() ? i : (uiCode + 1) );
 
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx(i);
@@ -3152 +3154 @@
   for( i = 1; i < vps->getNumOutputLayerSets(); i++ )
   {
-    vps->setOutputLayerSetIdx( i, i );
+    vps->setOutputLayerSetIdx( i, i < vps->getNumLayerSets() ? i : 1 );
+
     Int lsIdx = vps->getOutputLayerSetIdx(i);