X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=1c3285d2dcac223a1156e9df79e7087c735a65a4;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=bf016ef877bb11990bccf83a01821459cecb5a71;hpb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;p=dcpomatic.git diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index bf016ef87..1c3285d2d 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,40 +17,43 @@ */ +#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, shared_ptr log) +DCPDecoder::DCPDecoder (shared_ptr c, bool fast) : VideoDecoder (c) - , AudioDecoder (c) + , AudioDecoder (c, fast) , SubtitleDecoder (c) - , _log (log) , _dcp_content (c) { dcp::DCP dcp (c->directory ()); dcp.read (); 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 (); } @@ -62,24 +65,24 @@ DCPDecoder::pass () return true; } - float const vfr = _dcp_content->video_frame_rate (); - int64_t const frame = _next.frames (vfr); - + double const vfr = _dcp_content->video_frame_rate (); + int64_t const frame = _next.frames_round (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); + 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(), _log)), frame); + video (shared_ptr (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), frame); } else { video ( - shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT, _log)), + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)), frame ); - + video ( - shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT, _log)), + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)), frame ); } @@ -87,32 +90,50 @@ DCPDecoder::pass () if ((*_reel)->main_sound ()) { 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, _next); } - /* XXX: subtitle */ + if ((*_reel)->main_subtitle ()) { + int64_t const entry_point = (*_reel)->main_subtitle()->entry_point (); + list subs = (*_reel)->main_subtitle()->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_seconds (subs.front().in().as_seconds ()), + 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; } } - + return false; } @@ -134,7 +155,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_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()->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), + 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; +}