diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-30 13:16:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-30 13:16:52 +0000 |
| commit | 0fa016885370f0cf5b240deb48766894d8404e83 (patch) | |
| tree | cd249fe152d3fd3dde57900136d00bc80b30139b /src/lib | |
| parent | 637a2a90d3e11306959a989ff511e0af103b2ad0 (diff) | |
Make it possible to do more stuff when there is missing DCP content in a project.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_content.cc | 13 | ||||
| -rw-r--r-- | src/lib/player.cc | 12 |
2 files changed, 21 insertions, 4 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 747216f3c..c072dfa3d 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -42,6 +42,7 @@ using std::distance; using std::pair; using std::list; using boost::shared_ptr; +using boost::scoped_ptr; using boost::optional; int const DCPContentProperty::CAN_BE_PLAYED = 600; @@ -255,12 +256,20 @@ list<DCPTimePeriod> DCPContent::reels () const { list<DCPTimePeriod> p; - DCPDecoder decoder (shared_from_this(), false); + scoped_ptr<DCPDecoder> decoder; + try { + decoder.reset (new DCPDecoder (shared_from_this(), false)); + } catch (...) { + /* Could not load the DCP; guess reels */ + list<DCPTimePeriod> p; + p.push_back (DCPTimePeriod (position(), end())); + return p; + } shared_ptr<const Film> film = _film.lock (); DCPOMATIC_ASSERT (film); DCPTime from = position (); - BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder.reels()) { + BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder->reels()) { DCPTime const to = from + DCPTime::from_frames (i->main_picture()->duration(), film->video_frame_rate()); p.push_back (DCPTimePeriod (from, to)); from = to; diff --git a/src/lib/player.cc b/src/lib/player.cc index b8eadf793..3ae95cf52 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -74,6 +74,7 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +using boost::scoped_ptr; Player::Player (shared_ptr<const Film> film, shared_ptr<const Playlist> playlist) : _film (film) @@ -752,9 +753,16 @@ Player::get_reel_assets () if (!j) { continue; } - DCPDecoder decoder (j, false); + + scoped_ptr<DCPDecoder> decoder; + try { + decoder.reset (new DCPDecoder (j, false)); + } catch (...) { + return a; + } + int64_t offset = 0; - BOOST_FOREACH (shared_ptr<dcp::Reel> k, decoder.reels()) { + BOOST_FOREACH (shared_ptr<dcp::Reel> k, decoder->reels()) { DCPTime const from = i->position() + DCPTime::from_frames (offset, _film->video_frame_rate()); if (j->reference_video ()) { a.push_back ( |