From a35149d821d03a08fa8d37a8cc8b956357549901 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 3 Sep 2020 12:06:49 +0200 Subject: [PATCH] Accept missing MainSoundConfiguration and MainSoundSampleRate, for better or for worse. --- src/cpl.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/cpl.cc b/src/cpl.cc index 8285f87e..494f53be 100644 --- a/src/cpl.cc +++ b/src/cpl.cc @@ -247,13 +247,15 @@ CPL::read_composition_metadata_asset (cxml::ConstNodePtr node) _luminance = Luminance (lum); } - _main_sound_configuration = node->string_child("MainSoundConfiguration"); + _main_sound_configuration = node->optional_string_child("MainSoundConfiguration"); - string sr = node->string_child("MainSoundSampleRate"); - vector sr_bits; - boost::split (sr_bits, sr, boost::is_any_of(" ")); - DCP_ASSERT (sr_bits.size() == 2); - _main_sound_sample_rate = raw_convert(sr_bits[0]); + optional sr = node->optional_string_child("MainSoundSampleRate"); + if (sr) { + vector sr_bits; + boost::split (sr_bits, *sr, boost::is_any_of(" ")); + DCP_ASSERT (sr_bits.size() == 2); + _main_sound_sample_rate = raw_convert(sr_bits[0]); + } _main_picture_stored_area = dcp::Size ( node->node_child("MainPictureStoredArea")->number_child("Width"), -- 2.30.2