projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use make_shared<>.
[dcpomatic.git]
/
test
/
recover_test.cc
diff --git
a/test/recover_test.cc
b/test/recover_test.cc
index 1e0460155626d3d8f8544d0aada540f4cfbc5a0b..83e83d88d84b5fc0b690f7897ceabb4c5ce93904 100644
(file)
--- a/
test/recover_test.cc
+++ b/
test/recover_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
*/
@@
-26,15
+27,18
@@
#include "lib/dcp_content_type.h"
#include "lib/image_content.h"
#include "lib/ffmpeg_content.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 <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_asset.h>
#include <boost/test/unit_test.hpp>
#include "lib/ratio.h"
#include <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_asset.h>
#include <boost/test/unit_test.hpp>
+#include <boost/make_shared.hpp>
#include <iostream>
using std::cout;
using std::string;
using boost::shared_ptr;
#include <iostream>
using std::cout;
using std::string;
using boost::shared_ptr;
+using boost::make_shared;
static void
note (dcp::NoteType t, string n)
static void
note (dcp::NoteType t, string n)
@@
-51,27
+55,26
@@
BOOST_AUTO_TEST_CASE (recover_test_2d)
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
film->set_container (Ratio::from_id ("185"));
film->set_name ("recover_test");
- shared_ptr<FFmpegContent> content
(new FFmpegContent (film, "test/data/count300bd24.m2ts")
);
+ shared_ptr<FFmpegContent> content
= make_shared<FFmpegContent> (film, "test/data/count300bd24.m2ts"
);
film->examine_and_add_content (content);
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
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_d2b23c22cff43b0247c7108dcd32323c_24_100000000_P_S_0_1200000.mxf";
-
+ 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::copy_file (
video,
"build/test/recover_test_2d/original.mxf"
);
- boost::filesystem::resize_file (video,
16
* 1024 * 1024);
+ boost::filesystem::resize_file (video,
2
* 1024 * 1024);
film->make_dcp ();
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
- shared_ptr<dcp::MonoPictureAsset> A
(new dcp::MonoPictureAsset ("build/test/recover_test_2d/original.mxf")
);
- shared_ptr<dcp::MonoPictureAsset> B
(new dcp::MonoPictureAsset (video)
);
+ shared_ptr<dcp::MonoPictureAsset> A
= make_shared<dcp::MonoPictureAsset> ("build/test/recover_test_2d/original.mxf"
);
+ shared_ptr<dcp::MonoPictureAsset> B
= make_shared<dcp::MonoPictureAsset> (video
);
dcp::EqualityOptions eq;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
dcp::EqualityOptions eq;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
@@
-85,8
+88,8
@@
BOOST_AUTO_TEST_CASE (recover_test_3d)
film->set_name ("recover_test");
film->set_three_d (true);
film->set_name ("recover_test");
film->set_three_d (true);
- shared_ptr<ImageContent> content
(new ImageContent (film, "test/data/3d_test")
);
- content->
set_video
_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
+ shared_ptr<ImageContent> content
= make_shared<ImageContent> (film, "test/data/3d_test"
);
+ content->
video->set
_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
film->examine_and_add_content (content);
wait_for_jobs ();
film->examine_and_add_content (content);
wait_for_jobs ();
@@
-105,8
+108,8
@@
BOOST_AUTO_TEST_CASE (recover_test_3d)
film->make_dcp ();
wait_for_jobs ();
film->make_dcp ();
wait_for_jobs ();
- shared_ptr<dcp::StereoPictureAsset> A
(new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf")
);
- shared_ptr<dcp::StereoPictureAsset> B
(new dcp::StereoPictureAsset (video)
);
+ shared_ptr<dcp::StereoPictureAsset> A
= make_shared<dcp::StereoPictureAsset> ("build/test/recover_test_3d/original.mxf"
);
+ shared_ptr<dcp::StereoPictureAsset> B
= make_shared<dcp::StereoPictureAsset> (video
);
dcp::EqualityOptions eq;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));
dcp::EqualityOptions eq;
BOOST_CHECK (A->equals (B, eq, boost::bind (¬e, _1, _2)));