Ticket #107: ticket107.patch

Lib/TLibCommon/TypeDef.h

@@ -67 +67 @@
 #define NH_MV_FIX_TICKET_100              1 // Extra slice header bits
 #define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
 #define H_MV_ENC_DEC_TRAC_FIX             1  // by SHARP
+#define NH_MV_FIX_TICKET_107              1  // layer_set_idx_for_ols inference
 #if NH_3D
 // FIXES 
 #define NH_3D_FIX_TICKET_98               1 // Writing of depth intra skip flag

Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1618 +1618 @@
     {        
       READ_CODE( pcVPS->getLayerSetIdxForOlsMinus1Len( i ), uiCode, "layer_set_idx_for_ols_minus1[i]" ); pcVPS->setLayerSetIdxForOlsMinus1( i, uiCode ); 
     }
+#if NH_MV_FIX_TICKET_107
+    else
+    {
+      pcVPS->setLayerSetIdxForOlsMinus1( i, (pcVPS->getNumLayerSets() == 2) ? 0 : i - 1 );
+    }
+#endif
 
     if ( i > pcVPS->getVpsNumLayerSetsMinus1() || pcVPS->getDefaultOutputLayerIdc() == 2 )
     {