Changeset 1454 in SHVCSoftware


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1442 r1454  
    29012901        numBits++;
    29022902      }
    2903       READ_CODE( numBits, uiCode, "layer_set_idx_for_ols_minus1");   vps->setOutputLayerSetIdx( i, uiCode + 1);
     2903      READ_CODE( numBits, uiCode, "layer_set_idx_for_ols_minus1");
    29042904    }
    29052905    else
    29062906    {
    2907       vps->setOutputLayerSetIdx( i, i );
    2908     }
     2907      uiCode = 0;
     2908    }
     2909
     2910    vps->setOutputLayerSetIdx( i, i < vps->getNumLayerSets() ? i : (uiCode + 1) );
    29092911
    29102912    Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx(i);
     
    31523154  for( i = 1; i < vps->getNumOutputLayerSets(); i++ )
    31533155  {
    3154     vps->setOutputLayerSetIdx( i, i );
     3156    vps->setOutputLayerSetIdx( i, i < vps->getNumLayerSets() ? i : 1 );
     3157
    31553158    Int lsIdx = vps->getOutputLayerSetIdx(i);
    31563159
Note: See TracChangeset for help on using the changeset viewer.