diff options
| -rw-r--r-- | test/combine_test.cc | 4 | ||||
| -rw-r--r-- | test/verify_test.cc | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/combine_test.cc b/test/combine_test.cc index dd23b9ae..1ef4b882 100644 --- a/test/combine_test.cc +++ b/test/combine_test.cc @@ -343,7 +343,7 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_shared_asset) cpl->set_content_version ( dcp::ContentVersion("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11","content-version-label-text") ); - cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); + cpl->set_main_sound_configuration("51/L,C,R,LFE,-,-"); cpl->set_main_sound_sample_rate (48000); cpl->set_main_picture_stored_area (dcp::Size(1998, 1080)); cpl->set_main_picture_active_area (dcp::Size(1440, 1080)); @@ -388,7 +388,7 @@ BOOST_AUTO_TEST_CASE (combine_two_dcps_with_duplicated_asset) cpl->set_content_version ( dcp::ContentVersion("urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11","content-version-label-text") ); - cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); + cpl->set_main_sound_configuration("51/L,C,R,LFE,-,-"); cpl->set_main_sound_sample_rate (48000); cpl->set_main_picture_stored_area (dcp::Size(1998, 1080)); cpl->set_main_picture_active_area (dcp::Size(1440, 1080)); diff --git a/test/verify_test.cc b/test/verify_test.cc index 5b51db43..b6293a05 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -995,7 +995,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata) auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE); cpl->add (reel); - cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); + cpl->set_main_sound_configuration("51/L,C,R,LFE,-,-"); cpl->set_main_sound_sample_rate (48000); cpl->set_main_picture_stored_area (dcp::Size(1998, 1080)); cpl->set_main_picture_active_area (dcp::Size(1440, 1080)); @@ -1052,7 +1052,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag) reel->add (black_picture_asset(dir)); auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE); cpl->add (reel); - cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); + cpl->set_main_sound_configuration("51/L,C,R,LFE,-,-"); cpl->set_main_sound_sample_rate (48000); cpl->set_main_picture_stored_area (dcp::Size(1998, 1080)); cpl->set_main_picture_active_area (dcp::Size(1440, 1080)); @@ -1102,7 +1102,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag) reel->add (black_picture_asset(dir)); auto cpl = make_shared<dcp::CPL>("hello", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE); cpl->add (reel); - cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); + cpl->set_main_sound_configuration("51/L,C,R,LFE,-,-"); cpl->set_main_sound_sample_rate (48000); cpl->set_main_picture_stored_area (dcp::Size(1998, 1080)); cpl->set_main_picture_active_area (dcp::Size(1440, 1080)); @@ -1190,7 +1190,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3) cpl->add (reel); cpl->_additional_subtitle_languages.push_back("this-is-wrong"); cpl->_additional_subtitle_languages.push_back("andso-is-this"); - cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); + cpl->set_main_sound_configuration("51/L,C,R,LFE,-,-"); cpl->set_main_sound_sample_rate (48000); cpl->set_main_picture_stored_area (dcp::Size(1998, 1080)); cpl->set_main_picture_active_area (dcp::Size(1440, 1080)); @@ -1241,7 +1241,7 @@ check_picture_size (int width, int height, int frame_rate, bool three_d) auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE); cpl->set_annotation_text ("A Test DCP"); cpl->set_issue_date ("2012-07-17T04:45:18+00:00"); - cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); + cpl->set_main_sound_configuration("51/L,C,R,LFE,-,-"); cpl->set_main_sound_sample_rate (48000); cpl->set_main_picture_stored_area(dcp::Size(width, height)); cpl->set_main_picture_active_area(dcp::Size(width, height)); @@ -3050,7 +3050,7 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted) cpl->set_issuer ("OpenDCP 0.0.25"); cpl->set_creator ("OpenDCP 0.0.25"); cpl->set_issue_date ("2012-07-17T04:45:18+00:00"); - cpl->set_main_sound_configuration ("L,C,R,Lfe,-,-"); + cpl->set_main_sound_configuration("51/L,C,R,LFE,-,-"); cpl->set_main_sound_sample_rate (48000); cpl->set_main_picture_stored_area (dcp::Size(1998, 1080)); cpl->set_main_picture_active_area (dcp::Size(1440, 1080)); |