X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=e7e88d3191e9bf2a3ecfaa0f0f8108b1cf7e4613;hp=9cd327a525ff1f0cd56c457bea9a9c5df8ea5db1;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=682c060342d96e7511d09a5b86df605771f3a907

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 9cd327a52..e7e88d319 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -1,97 +1,119 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
 #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 <dcp/dcp.h>
+#include <dcp/decrypted_kdm.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/mono_picture_asset.h>
+#include <dcp/mono_picture_asset_reader.h>
 #include <dcp/stereo_picture_asset.h>
+#include <dcp/stereo_picture_asset_reader.h>
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
 #include <dcp/reel_subtitle_asset.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_frame.h>
+#include <dcp/sound_asset_reader.h>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c)
-	: VideoDecoder (c)
-	, AudioDecoder (c)
-	, SubtitleDecoder (c)
-	, _dcp_content (c)
+DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> 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 ()));
 	}
 	DCPOMATIC_ASSERT (dcp.cpls().size() == 1);
 	_reels = dcp.cpls().front()->reels ();
+
 	_reel = _reels.begin ();
+	_offset = 0;
+	get_readers ();
 }
 
 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 ();
+	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 ((_mono_reader || _stereo_reader) && reason != PASS_REASON_SUBTITLE) {
 		shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
-		shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
-		shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
 		int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
-		if (mono) {
-			video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), frame);
+		if (_mono_reader) {
+			video->give (shared_ptr<ImageProxy> (new J2KImageProxy (_mono_reader->get_frame (entry_point + frame), asset->size())), _offset + frame);
 		} else {
-			video (
-				shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)),
-				frame
+			video->give (
+				shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)),
+				_offset + frame
 				);
 
-			video (
-				shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)),
-				frame
+			video->give (
+				shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)),
+				_offset + frame
 				);
 		}
 	}
 
-	if ((*_reel)->main_sound ()) {
+	if (_sound_reader && reason != PASS_REASON_SUBTITLE) {
 		int64_t const entry_point = (*_reel)->main_sound()->entry_point ();
-		shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->asset()->get_frame (entry_point + frame);
+		shared_ptr<const dcp::SoundFrame> sf = _sound_reader->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<AudioBuffers> data (new AudioBuffers (channels, frames));
 		for (int i = 0; i < frames; ++i) {
@@ -101,12 +123,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<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->subtitle_asset()->subtitles_during (
+		list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->asset()->subtitles_during (
 			dcp::Time (entry_point + frame, vfr, vfr),
 			dcp::Time (entry_point + frame + 1, vfr, vfr),
 			true
@@ -114,10 +136,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
 				);
@@ -128,24 +150,68 @@ DCPDecoder::pass ()
 
 	if ((*_reel)->main_picture ()) {
 		if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
-			++_reel;
+			next_reel ();
+			_next = ContentTime ();
 		}
 	}
 
 	return false;
 }
 
+void
+DCPDecoder::next_reel ()
+{
+	_offset += (*_reel)->main_picture()->duration();
+	++_reel;
+	get_readers ();
+}
+
+void
+DCPDecoder::get_readers ()
+{
+	if (_reel == _reels.end()) {
+		_mono_reader.reset ();
+		_stereo_reader.reset ();
+		_sound_reader.reset ();
+		return;
+	}
+
+	if ((*_reel)->main_picture()) {
+		shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
+		shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
+		shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
+		DCPOMATIC_ASSERT (mono || stereo);
+		if (mono) {
+			_mono_reader = mono->start_read ();
+			_stereo_reader.reset ();
+		} else {
+			_stereo_reader = stereo->start_read ();
+			_mono_reader.reset ();
+		}
+	} else {
+		_mono_reader.reset ();
+		_stereo_reader.reset ();
+	}
+
+	if ((*_reel)->main_sound()) {
+		_sound_reader = (*_reel)->main_sound()->asset()->start_read ();
+	} else {
+		_sound_reader.reset ();
+	}
+}
+
 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);
 
+	_offset = 0;
 	_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 ());
-		++_reel;
+	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 ());
+		next_reel ();
 	}
 
 	_next = t;
@@ -164,7 +230,7 @@ DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) cons
 	/* XXX: inefficient */
 
 	list<ContentTimePeriod> ctp;
-	double const vfr = _dcp_content->video_frame_rate ();
+	double const vfr = _dcp_content->active_video_frame_rate ();
 
 	BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
 		if (!r->main_subtitle ()) {
@@ -173,9 +239,9 @@ DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) cons
 
 		int64_t const entry_point = r->main_subtitle()->entry_point ();
 
-		list<dcp::SubtitleString> 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<dcp::SubtitleString> 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
 			);