*/
-#include "lib/film.h"
-#include "lib/dcp_content.h"
-#include "lib/ffmpeg_content.h"
#include "lib/content_factory.h"
+#include "lib/dcp_content.h"
#include "lib/dcp_content_type.h"
-#include "lib/video_content.h"
-#include "lib/referenced_reel_asset.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
#include "lib/player.h"
+#include "lib/referenced_reel_asset.h"
+#include "lib/video_content.h"
#include "test.h"
#include <dcp/cpl.h>
#include <dcp/reel.h>
#include <iostream>
-using std::list;
-using std::string;
using std::cout;
-using std::shared_ptr;
-using std::make_shared;
using std::dynamic_pointer_cast;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
using namespace dcpomatic;
make_and_verify_dcp (vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET});
/* Check that the selected reel assets are right */
- auto player = make_shared<Player>(vf, false);
+ auto player = make_shared<Player>(vf, Image::Alignment::COMPACT);
auto a = player->get_reel_assets();
BOOST_REQUIRE_EQUAL (a.size(), 4U);
auto i = a.begin();
vf->write_metadata ();
make_and_verify_dcp (vf);
}
+
+
+/** Test bug #2116 */
+BOOST_AUTO_TEST_CASE (test_vf_with_trimmed_multi_reel_dcp)
+{
+ /* Make an OV with 3 reels */
+ std::vector<std::shared_ptr<Content>> ov_content;
+ for (int i = 0; i < 3; ++i) {
+ auto c = content_factory("test/data/flat_red.png").front();
+ c->video->set_length(240);
+ ov_content.push_back(c);
+ }
+ auto ov = new_test_film2 ("test_vf_with_trimmed_multi_reel_dcp_ov", ov_content);
+ ov->set_reel_type(ReelType::BY_VIDEO_CONTENT);
+ make_and_verify_dcp (ov);
+
+ /* Make a VF with a specific arrangement */
+ auto vf_image = content_factory("test/data/flat_red.png").front();
+ auto vf_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
+ auto vf = new_test_film2 ("test_vf_with_trimmed_multi_reel_dcp_vf", { vf_image, vf_dcp });
+ vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
+ vf_dcp->set_reference_video(true);
+ vf_dcp->set_reference_audio(true);
+ vf_dcp->set_trim_start(ContentTime::from_seconds(10));
+ vf_dcp->set_position(vf, DCPTime::from_seconds(10));
+ make_and_verify_dcp (vf, { dcp::VerificationNote::Code::EXTERNAL_ASSET });
+}
+