diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-14 17:39:32 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-20 11:20:25 +0000 |
| commit | 3f630fb8334238ab8a58fbe1a0f513ae2c00de80 (patch) | |
| tree | 4b773b91029d6374bfd4f2194053d3e249d597cd /test/dcp_to_stl_binary_test.cc | |
| parent | 49cafda01b3e07c47e3b20dd5ee91e1426446aea (diff) | |
Simplify time representation; better in-tree DCP subtitle parser.
Diffstat (limited to 'test/dcp_to_stl_binary_test.cc')
| -rw-r--r-- | test/dcp_to_stl_binary_test.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/dcp_to_stl_binary_test.cc b/test/dcp_to_stl_binary_test.cc index 8ac377b..6199c69 100644 --- a/test/dcp_to_stl_binary_test.cc +++ b/test/dcp_to_stl_binary_test.cc @@ -18,7 +18,8 @@ */ #include "test.h" -#include "dcp_reader.h" +#include "interop_dcp_reader.h" +#include "smpte_dcp_reader.h" #include "stl_binary_writer.h" #include "collect.h" #include <boost/test/unit_test.hpp> @@ -35,7 +36,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test1) boost::filesystem::path p = private_test / "fd586c30-6d38-48f2-8241-27359acf184c_sub.xml"; sub::write_stl_binary ( - sub::collect<list<sub::Subtitle> > (sub::DCPReader(p, true).subtitles ()), + sub::collect<list<sub::Subtitle> > (sub::InteropDCPReader(p).subtitles ()), 25, sub::LANGUAGE_FRENCH, "", "", @@ -62,7 +63,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test2) boost::filesystem::path p = private_test / "93e8a6bf-499e-4d36-9350-a9bfa2e6758a_sub.xml"; sub::write_stl_binary ( - sub::collect<list<sub::Subtitle> > (sub::DCPReader(p, true).subtitles ()), + sub::collect<list<sub::Subtitle> > (sub::InteropDCPReader(p).subtitles ()), 25, sub::LANGUAGE_FRENCH, "", "", @@ -89,7 +90,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test3) boost::filesystem::path p = private_test / "Paddington_FTR_Subs_DE-FR_24fps_R1.xml"; sub::write_stl_binary ( - sub::collect<list<sub::Subtitle> > (sub::DCPReader(p, true).subtitles ()), + sub::collect<list<sub::Subtitle> > (sub::InteropDCPReader(p).subtitles ()), 25, sub::LANGUAGE_FRENCH, "", "", @@ -111,7 +112,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test3) BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test4) { sub::write_stl_binary ( - sub::collect<list<sub::Subtitle> > (sub::DCPReader("test/data/test1.xml", true).subtitles ()), + sub::collect<list<sub::Subtitle> > (sub::InteropDCPReader("test/data/test1.xml").subtitles ()), 25, sub::LANGUAGE_FRENCH, "", "", @@ -133,7 +134,7 @@ BOOST_AUTO_TEST_CASE (dcp_to_stl_binary_test5) boost::filesystem::path p = private_test / "065d39ff-6723-4dbf-a94f-849cde82f5e1_sub.mxf"; sub::write_stl_binary ( - sub::collect<list<sub::Subtitle> > (sub::DCPReader(p, false).subtitles ()), + sub::collect<list<sub::Subtitle> > (sub::SMPTEDCPReader(p, true).subtitles ()), 25, sub::LANGUAGE_FRENCH, "", "", |