diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-26 18:41:41 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-26 18:41:41 +0000 |
| commit | 2e93ca3670e5581b5523f60130b38594de10d6c3 (patch) | |
| tree | 6ed18ed07bccf77b2d172ef7681fce981956815f /test/dcp_test.cc | |
| parent | 9ed550de7b98ca2f8467dd134a9c0ad7f1868f23 (diff) | |
| parent | 447cc7ddec5ace7bb47df35192ef02e7c19bf9b3 (diff) | |
Merge master; MXF subtitle stuff not included.
Diffstat (limited to 'test/dcp_test.cc')
| -rw-r--r-- | test/dcp_test.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/dcp_test.cc b/test/dcp_test.cc index 07defce0..1736cb60 100644 --- a/test/dcp_test.cc +++ b/test/dcp_test.cc @@ -52,16 +52,16 @@ BOOST_AUTO_TEST_CASE (dcp_test) mxf_meta.product_version = "0.0.25"; /* We're making build/test/foo */ - boost::filesystem::remove_all ("build/test/foo"); - boost::filesystem::create_directories ("build/test/foo"); - dcp::DCP d ("build/test/foo"); + boost::filesystem::remove_all ("build/test/DCP/foo"); + boost::filesystem::create_directories ("build/test/DCP/foo"); + dcp::DCP d ("build/test/DCP/foo"); shared_ptr<dcp::CPL> cpl (new dcp::CPL ("A Test DCP", dcp::FEATURE)); cpl->set_content_version_id ("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); cpl->set_content_version_label_text ("81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00"); shared_ptr<dcp::MonoPictureMXF> mp (new dcp::MonoPictureMXF (dcp::Fraction (24, 1))); mp->set_metadata (mxf_meta); - shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/foo/video.mxf", dcp::SMPTE, false); + shared_ptr<dcp::PictureMXFWriter> picture_writer = mp->start_write ("build/test/DCP/foo/video.mxf", dcp::SMPTE, false); dcp::File j2c ("test/data/32x32_red_square.j2c"); for (int i = 0; i < 24; ++i) { picture_writer->write (j2c.data (), j2c.size ()); @@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (dcp_test) shared_ptr<dcp::SoundMXF> ms (new dcp::SoundMXF (dcp::Fraction (24, 1), 48000, 1)); ms->set_metadata (mxf_meta); - shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/foo/audio.mxf", dcp::SMPTE); + shared_ptr<dcp::SoundMXFWriter> sound_writer = ms->start_write ("build/test/DCP/foo/audio.mxf", dcp::SMPTE); SF_INFO info; info.format = 0; @@ -103,5 +103,5 @@ BOOST_AUTO_TEST_CASE (dcp_test) d.write_xml (dcp::SMPTE, xml_meta); - /* build/test/foo is checked against test/ref/DCP/foo by run-tests.sh */ + /* build/test/DCP/foo is checked against test/ref/DCP/foo by run-tests.sh */ } |