Merge pull request #191 from K-os/fix_general_timing_hrd_parsing

Fix general_timing_hrd_parameters parsing
fraunhoferhhi · Aug 6, 2024 · f8ba8fd · f8ba8fd
2 parents c53b6b0 + 4d72695
commit f8ba8fd
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/source/Lib/DecoderLib/HLSyntaxReader.cpp b/source/Lib/DecoderLib/HLSyntaxReader.cpp
@@ -1205,7 +1205,7 @@ void HLSyntaxReader::parseGeneralHrdParameters( GeneralHrdParams *hrd )
  hrd->setGeneralNalHrdParamsPresentFlag( general_nal_hrd_params_present_flag );
 
  X_READ_FLAG( general_vcl_hrd_params_present_flag );
- hrd->setGeneralVclHrdParamsPresentFlag( general_nal_hrd_params_present_flag );
+ hrd->setGeneralVclHrdParamsPresentFlag( general_vcl_hrd_params_present_flag );
 
  if( general_nal_hrd_params_present_flag || general_vcl_hrd_params_present_flag )
  {
@@ -1275,9 +1275,11 @@ void HLSyntaxReader::parseOlsHrdParameters( GeneralHrdParams * generalHrd, std::
  hrd.setLowDelayHrdFlag( low_delay_hrd_flag );
  }
 
- for( int nalOrVcl = 0; nalOrVcl < 2; nalOrVcl++ )
+ using NalOrVcl = enum { NAL = 0, VCL = 1 };
+ for( NalOrVcl nalOrVcl: { NAL, VCL } )
  {
- if( ( nalOrVcl == 0 && generalHrd->getGeneralNalHrdParamsPresentFlag() ) || ( nalOrVcl == 1 && generalHrd->getGeneralVclHrdParamsPresentFlag() ) )
+ if( ( nalOrVcl == NAL && generalHrd->getGeneralNalHrdParamsPresentFlag() ) || //
+ ( nalOrVcl == VCL && generalHrd->getGeneralVclHrdParamsPresentFlag() ) )
  {
  for( int j = 0; j <= generalHrd->getHrdCpbCntMinus1(); j++ )
  {
@@ -2256,7 +2258,7 @@ void HLSyntaxReader::parseSPS( SPS* sps, const ParameterSetManager* parameterSet
  }
 
  uint32_t firstSubLayer = sps->getSubLayerParametersPresentFlag() ? 0 : sps_max_sublayers_minus1;
- parseOlsHrdParameters( sps->getGeneralHrdParameters(), sps->getOlsHrdParameters(), firstSubLayer, sps->getMaxTLayers() - 1 );
+ parseOlsHrdParameters( sps->getGeneralHrdParameters(), sps->getOlsHrdParameters(), firstSubLayer, sps_max_sublayers_minus1 );
  }
  }