X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Frecover_test.cc;h=f9ef8793e8129fb6a1f0ee373fa3e016e83ac0ce;hp=d76c2f716b96bebd3d8ace8dc41dc6bebb09418d;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=4cf7ff9cc2e4a03b12932edfdab0964002bff81f diff --git a/test/recover_test.cc b/test/recover_test.cc index d76c2f716..f9ef8793e 100644 --- a/test/recover_test.cc +++ b/test/recover_test.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -21,13 +22,17 @@ * @brief Test recovery of a DCP transcode after a crash. */ -#include -#include +#include "test.h" #include "lib/film.h" #include "lib/dcp_content_type.h" #include "lib/image_content.h" +#include "lib/ffmpeg_content.h" +#include "lib/video_content.h" #include "lib/ratio.h" -#include "test.h" +#include +#include +#include +#include using std::cout; using std::string; @@ -41,38 +46,69 @@ note (dcp::NoteType t, string n) } } -BOOST_AUTO_TEST_CASE (recover_test) +BOOST_AUTO_TEST_CASE (recover_test_2d) { - shared_ptr film = new_test_film ("recover_test"); + shared_ptr film = new_test_film ("recover_test_2d"); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); + film->set_container (Ratio::from_id ("185")); + film->set_name ("recover_test"); + + shared_ptr content (new FFmpegContent (film, "test/data/count300bd24.m2ts")); + film->examine_and_add_content (content); + wait_for_jobs (); + + film->make_dcp (); + wait_for_jobs (); + + boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_bf7d9a3ad543b4f048be97e8df309918_24_100000000_P_S_0_1200000.mxf"; + boost::filesystem::copy_file ( + video, + "build/test/recover_test_2d/original.mxf" + ); + + boost::filesystem::resize_file (video, 2 * 1024 * 1024); + + film->make_dcp (); + wait_for_jobs (); + + shared_ptr A (new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf")); + shared_ptr B (new dcp::MonoPictureAsset (video)); + + dcp::EqualityOptions eq; + BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2))); +} + +BOOST_AUTO_TEST_CASE (recover_test_3d) +{ + shared_ptr film = new_test_film ("recover_test_3d"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_container (Ratio::from_id ("185")); film->set_name ("recover_test"); film->set_three_d (true); shared_ptr content (new ImageContent (film, "test/data/3d_test")); - content->set_video_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT); + content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT); film->examine_and_add_content (content); wait_for_jobs (); film->make_dcp (); wait_for_jobs (); - boost::filesystem::path const video = "build/test/recover_test/video/185_2K_40c62abb30c0c1185678d71d58674459_24_100000000_P_S_3D.mxf"; + boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D_0_96000.mxf"; boost::filesystem::copy_file ( video, - "build/test/recover_test/original.mxf" + "build/test/recover_test_3d/original.mxf" ); - + boost::filesystem::resize_file (video, 2 * 1024 * 1024); film->make_dcp (); wait_for_jobs (); - shared_ptr A (new dcp::StereoPictureMXF ("build/test/recover_test/original.mxf")); - shared_ptr B (new dcp::StereoPictureMXF (video)); + shared_ptr A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf")); + shared_ptr B (new dcp::StereoPictureAsset (video)); dcp::EqualityOptions eq; - eq.mxf_filenames_can_differ = true; BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2))); }