X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=f032ee661781914759afa73baea10c0fbc3e2496;hb=334b94526f2c1271718a94fe97cfa843cf6ef7a1;hp=adeadd98a3d8fb19d826e4ce663af2ad2a84a30c;hpb=985a83ffbf251db481150221914ef74fbfe549b2;p=dcpomatic.git diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index adeadd98a..f032ee661 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,101 +17,134 @@ */ +#include "dcp_decoder.h" +#include "dcp_content.h" +#include "j2k_image_proxy.h" +#include "image.h" +#include "config.h" #include +#include #include #include -#include -#include +#include +#include #include #include +#include #include #include #include -#include "dcp_decoder.h" -#include "dcp_content.h" -#include "j2k_image_proxy.h" -#include "image.h" -#include "config.h" +#include +#include using std::list; using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; -DCPDecoder::DCPDecoder (shared_ptr c) - : VideoDecoder (c) - , AudioDecoder (c) - , SubtitleDecoder (c) +DCPDecoder::DCPDecoder (shared_ptr c, shared_ptr log, bool fast) + : VideoDecoder (c->video, log) + , AudioDecoder (c, fast) + , SubtitleDecoder (c->subtitle) , _dcp_content (c) { 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_private_key ())); + dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ())); } - assert (dcp.cpls().size() == 1); + DCPOMATIC_ASSERT (dcp.cpls().size() == 1); _reels = dcp.cpls().front()->reels (); _reel = _reels.begin (); } bool -DCPDecoder::pass () +DCPDecoder::pass (PassReason reason, bool) { if (_reel == _reels.end () || !_dcp_content->can_be_played ()) { return true; } - float const vfr = _dcp_content->video_frame_rate (); - int64_t const frame = _next.frames (vfr); - - if ((*_reel)->main_picture ()) { - shared_ptr mxf = (*_reel)->main_picture()->mxf (); - shared_ptr mono = dynamic_pointer_cast (mxf); - shared_ptr stereo = dynamic_pointer_cast (mxf); + /* 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->video->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 () && 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), mxf->size())), frame); + video (shared_ptr (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), offset + frame); } else { video ( - shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT)), - frame + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)), + offset + frame ); - + video ( - shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT)), - frame + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)), + 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()->mxf()->get_frame (entry_point + frame); + shared_ptr sf = (*_reel)->main_sound()->asset()->get_frame (entry_point + frame); uint8_t const * from = sf->data (); - int const channels = _dcp_content->audio_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) { for (int j = 0; j < channels; ++j) { - data->data()[j][i] = float (from[0] | (from[1] << 8) | (from[2] << 16)) / (1 << 23); + data->data()[j][i] = static_cast ((from[0] << 8) | (from[1] << 16) | (from[2] << 24)) / static_cast (INT_MAX - 256); from += 3; } } - audio (data, _next); + audio (_dcp_content->audio_stream(), data, ContentTime::from_frames (offset, vfr) + _next); } - /* XXX: subtitle */ + if ((*_reel)->main_subtitle ()) { + int64_t const entry_point = (*_reel)->main_subtitle()->entry_point (); + list subs = (*_reel)->main_subtitle()->asset()->subtitles_during ( + dcp::Time (entry_point + frame, vfr, vfr), + dcp::Time (entry_point + frame + 1, vfr, vfr), + true + ); + + if (!subs.empty ()) { + /* XXX: assuming that all `subs' are at the same time; maybe this is ok */ + text_subtitle ( + ContentTimePeriod ( + 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 + ); + } + } _next += ContentTime::from_frames (1, vfr); if ((*_reel)->main_picture ()) { - if (_next.frames (vfr) >= (*_reel)->main_picture()->duration()) { + if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) { ++_reel; + _next = ContentTime (); } } - + return false; } @@ -123,8 +156,8 @@ DCPDecoder::seek (ContentTime t, bool accurate) SubtitleDecoder::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->video->video_frame_rate ())) { + t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video->video_frame_rate ()); ++_reel; } @@ -133,7 +166,41 @@ DCPDecoder::seek (ContentTime t, bool accurate) list -DCPDecoder::subtitles_during (ContentTimePeriod, bool starting) const +DCPDecoder::image_subtitles_during (ContentTimePeriod, bool) const { return list (); } + +list +DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) const +{ + /* XXX: inefficient */ + + list ctp; + double const vfr = _dcp_content->video->video_frame_rate (); + + BOOST_FOREACH (shared_ptr r, _reels) { + if (!r->main_subtitle ()) { + continue; + } + + int64_t const entry_point = r->main_subtitle()->entry_point (); + + 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 + ); + + BOOST_FOREACH (dcp::SubtitleString const & s, subs) { + ctp.push_back ( + ContentTimePeriod ( + ContentTime::from_seconds (s.in().as_seconds ()), + ContentTime::from_seconds (s.out().as_seconds ()) + ) + ); + } + } + + return ctp; +}