X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=420c6a7bee712161c28ff0d165cd9dd689374074;hp=2bdf6a8e98547840c268a6ff748fdb81ae3e24c8;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=f26af8112b03b5233eb5239defd11a7428b705ad diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 2bdf6a8e9..420c6a7be 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -1,25 +1,30 @@ /* - Copyright (C) 2014-2015 Carl Hetherington + Copyright (C) 2014-2016 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 . */ #include "dcp_decoder.h" #include "dcp_content.h" +#include "audio_content.h" +#include "video_decoder.h" +#include "audio_decoder.h" #include "j2k_image_proxy.h" +#include "subtitle_decoder.h" #include "image.h" #include "config.h" #include @@ -35,20 +40,30 @@ #include #include #include +#include using std::list; using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; -DCPDecoder::DCPDecoder (shared_ptr c, bool fast) - : VideoDecoder (c) - , AudioDecoder (c, fast) - , SubtitleDecoder (c) - , _dcp_content (c) +DCPDecoder::DCPDecoder (shared_ptr c, shared_ptr log, bool fast) + : _dcp_content (c) { + video.reset (new VideoDecoder (this, c, log)); + audio.reset (new AudioDecoder (this, c->audio, fast, log)); + + subtitle.reset ( + new SubtitleDecoder ( + this, + c->subtitle, + bind (&DCPDecoder::image_subtitles_during, this, _1, _2), + bind (&DCPDecoder::text_subtitles_during, this, _1, _2) + ) + ); + dcp::DCP dcp (c->directory ()); - dcp.read (); + dcp.read (false, 0, true); if (c->kdm ()) { dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ())); } @@ -58,41 +73,51 @@ DCPDecoder::DCPDecoder (shared_ptr c, bool fast) } bool -DCPDecoder::pass () +DCPDecoder::pass (PassReason reason, bool) { if (_reel == _reels.end () || !_dcp_content->can_be_played ()) { return true; } - double const vfr = _dcp_content->video_frame_rate (); + /* Offset of the start of the current reel from the start of the content in frames */ + int offset = 0; + list >::const_iterator i = _reels.begin(); + while (i != _reel) { + offset += (*i)->main_picture()->duration (); + ++i; + } + + double const vfr = _dcp_content->active_video_frame_rate (); + + /* Frame within the (played part of the) reel that is coming up next */ int64_t const frame = _next.frames_round (vfr); - if ((*_reel)->main_picture ()) { + if ((*_reel)->main_picture () && reason != PASS_REASON_SUBTITLE) { shared_ptr asset = (*_reel)->main_picture()->asset (); shared_ptr mono = dynamic_pointer_cast (asset); shared_ptr stereo = dynamic_pointer_cast (asset); int64_t const entry_point = (*_reel)->main_picture()->entry_point (); if (mono) { - video (shared_ptr (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), frame); + video->give (shared_ptr (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), offset + frame); } else { - video ( + video->give ( shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)), - frame + offset + frame ); - video ( + video->give ( shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)), - frame + offset + frame ); } } - if ((*_reel)->main_sound ()) { + if ((*_reel)->main_sound () && reason != PASS_REASON_SUBTITLE) { int64_t const entry_point = (*_reel)->main_sound()->entry_point (); shared_ptr sf = (*_reel)->main_sound()->asset()->get_frame (entry_point + frame); uint8_t const * from = sf->data (); - int const channels = _dcp_content->audio_stream()->channels (); + int const channels = _dcp_content->audio->stream()->channels (); int const frames = sf->size() / (3 * channels); shared_ptr data (new AudioBuffers (channels, frames)); for (int i = 0; i < frames; ++i) { @@ -102,12 +127,12 @@ DCPDecoder::pass () } } - audio (_dcp_content->audio_stream(), data, _next); + audio->give (_dcp_content->audio->stream(), data, ContentTime::from_frames (offset, vfr) + _next); } if ((*_reel)->main_subtitle ()) { int64_t const entry_point = (*_reel)->main_subtitle()->entry_point (); - list subs = (*_reel)->main_subtitle()->subtitle_asset()->subtitles_during ( + list subs = (*_reel)->main_subtitle()->asset()->subtitles_during ( dcp::Time (entry_point + frame, vfr, vfr), dcp::Time (entry_point + frame + 1, vfr, vfr), true @@ -115,10 +140,10 @@ DCPDecoder::pass () if (!subs.empty ()) { /* XXX: assuming that all `subs' are at the same time; maybe this is ok */ - text_subtitle ( + subtitle->give_text ( ContentTimePeriod ( - ContentTime::from_seconds (subs.front().in().as_seconds ()), - ContentTime::from_seconds (subs.front().out().as_seconds ()) + ContentTime::from_frames (offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().in().as_seconds ()), + ContentTime::from_frames (offset - entry_point, vfr) + ContentTime::from_seconds (subs.front().out().as_seconds ()) ), subs ); @@ -130,6 +155,7 @@ DCPDecoder::pass () if ((*_reel)->main_picture ()) { if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) { ++_reel; + _next = ContentTime (); } } @@ -139,13 +165,13 @@ DCPDecoder::pass () void DCPDecoder::seek (ContentTime t, bool accurate) { - VideoDecoder::seek (t, accurate); - AudioDecoder::seek (t, accurate); - SubtitleDecoder::seek (t, accurate); + video->seek (t, accurate); + audio->seek (t, accurate); + subtitle->seek (t, accurate); _reel = _reels.begin (); - while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video_frame_rate ())) { - t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video_frame_rate ()); + while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) { + t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ()); ++_reel; } @@ -165,7 +191,7 @@ DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) cons /* XXX: inefficient */ list ctp; - double const vfr = _dcp_content->video_frame_rate (); + double const vfr = _dcp_content->active_video_frame_rate (); BOOST_FOREACH (shared_ptr r, _reels) { if (!r->main_subtitle ()) { @@ -174,9 +200,9 @@ DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) cons int64_t const entry_point = r->main_subtitle()->entry_point (); - list subs = r->main_subtitle()->subtitle_asset()->subtitles_during ( - dcp::Time (period.from.seconds ()) - dcp::Time (entry_point, vfr, vfr), - dcp::Time (period.to.seconds ()) - dcp::Time (entry_point, vfr, vfr), + list subs = r->main_subtitle()->asset()->subtitles_during ( + dcp::Time (period.from.seconds(), 1000) - dcp::Time (entry_point, vfr, vfr), + dcp::Time (period.to.seconds(), 1000) - dcp::Time (entry_point, vfr, vfr), starting );