diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-08 12:45:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-12-08 12:45:33 +0100 |
| commit | fdb43b413996d13651895640a31fac319573431d (patch) | |
| tree | ed6e7bfc28dda9bb190f6655502098a9edb0c9b0 | |
| parent | fec5d308e853b1218a983623129ac01597263f5c (diff) | |
Recognise dbox2 channel ID used by SMPTE example.v1.8.113
| -rw-r--r-- | src/types.cc | 2 | ||||
| -rw-r--r-- | test/read_dcp_test.cc | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/types.cc b/src/types.cc index 899d5c25..572d3bdb 100644 --- a/src/types.cc +++ b/src/types.cc @@ -563,7 +563,7 @@ dcp::mca_id_to_channel (string id) return Channel::BSL; } else if (id == "rrs" || id == "rsr") { return Channel::BSR; - } else if (id == "dbox" || id == "mtn") { + } else if (id == "dbox" || id == "dbox2" || id == "mtn") { return Channel::MOTION_DATA; } else if (id == "sync" || id == "fsksync") { return Channel::SYNC_SIGNAL; diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc index d014bb8e..cd82bfe6 100644 --- a/test/read_dcp_test.cc +++ b/test/read_dcp_test.cc @@ -36,6 +36,7 @@ #include "dcp.h" #include "cpl.h" #include "stream_operators.h" +#include "test.h" using std::list; using std::shared_ptr; @@ -71,3 +72,12 @@ BOOST_AUTO_TEST_CASE (read_dcp_test2) BOOST_REQUIRE (d.standard()); BOOST_CHECK_EQUAL (d.standard(), dcp::Standard::INTEROP); } + + +/** Read a DCP that previously gave: Unrecognised channel ID 'dbox2' */ +BOOST_AUTO_TEST_CASE(read_dcp_test3) +{ + dcp::DCP d(private_test / "data/SMPTE_TST-1-Bv21_S_EN-EN-CCAP_US_51-HI-VI_2K_ISDCF_20170110_DTB_SMPTE_OV"); + d.read(); +} + |