X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fffmpeg_decoder.cc;h=df6b7416b35a2fc521846ed91ec490e6faaef45d;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=14c2e63e27ca11f75b737557bceb094ee02f3ab8;hpb=0758d834992f0adb8aa8d4d9908a64ce8708f05c;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 14c2e63e2..df6b7416b 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-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/>.
 
 */
 
@@ -36,9 +37,9 @@
 #include "raw_image_proxy.h"
 #include "video_decoder.h"
 #include "film.h"
-#include "md5_digester.h"
 #include "audio_decoder.h"
 #include "compose.hpp"
+#include "subtitle_content.h"
 #include <dcp/subtitle_string.h>
 #include <sub/ssa_reader.h>
 #include <sub/subtitle.h>
@@ -111,10 +112,12 @@ FFmpegDecoder::flush ()
 
 	/* XXX: should we reset _packet.data and size after each *_decode_* call? */
 
-	while (decode_video_packet ()) {}
+	while (video && decode_video_packet ()) {}
 
-	decode_audio_packet ();
-	audio->flush ();
+	if (audio) {
+		decode_audio_packet ();
+		audio->flush ();
+	}
 }
 
 bool
@@ -226,7 +229,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr<FFmpegAudioStream> stream) const
 		int sample = 0;
 		int channel = 0;
 		for (int i = 0; i < total_samples; ++i) {
-			audio->data(channel)[sample] = static_cast<float>(*p++) / (1 << 31);
+			audio->data(channel)[sample] = static_cast<float>(*p++) / 2147483648;
 
 			++channel;
 			if (channel == stream->channels()) {
@@ -242,7 +245,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr<FFmpegAudioStream> stream) const
 		int32_t** p = reinterpret_cast<int32_t **> (_frame->data);
 		for (int i = 0; i < stream->channels(); ++i) {
 			for (int j = 0; j < frames; ++j) {
-				audio->data(i)[j] = static_cast<float>(p[i][j]) / (1 << 31);
+				audio->data(i)[j] = static_cast<float>(p[i][j]) / 2147483648;
 			}
 		}
 	}
@@ -300,9 +303,17 @@ FFmpegDecoder::bytes_per_audio_sample (shared_ptr<FFmpegAudioStream> stream) con
 void
 FFmpegDecoder::seek (ContentTime time, bool accurate)
 {
-	video->seek (time, accurate);
-	audio->seek (time, accurate);
-	subtitle->seek (time, accurate);
+	if (video) {
+		video->seek (time, accurate);
+	}
+
+	if (audio) {
+		audio->seek (time, accurate);
+	}
+
+	if (subtitle) {
+		subtitle->seek (time, accurate);
+	}
 
 	/* If we are doing an `accurate' seek, we need to use pre-roll, as
 	   we don't really know what the seek will give us.
@@ -602,54 +613,8 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
 
 	sub::RawSubtitle base;
 	list<sub::RawSubtitle> raw = sub::SSAReader::parse_line (base, bits[9]);
-	list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (raw);
 
-	/* XXX: lots of this is copied from TextSubtitle; there should probably be some sharing */
-
-	/* Highest line index in this subtitle */
-	int highest = 0;
-	BOOST_FOREACH (sub::Subtitle i, subs) {
-		BOOST_FOREACH (sub::Line j, i.lines) {
-			DCPOMATIC_ASSERT (j.vertical_position.reference && j.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE);
-			DCPOMATIC_ASSERT (j.vertical_position.line);
-			highest = max (highest, j.vertical_position.line.get());
-		}
+	BOOST_FOREACH (sub::Subtitle const & i, sub::collect<list<sub::Subtitle> > (raw)) {
+		subtitle->give_text (period, i);
 	}
-
-	list<dcp::SubtitleString> ss;
-
-	BOOST_FOREACH (sub::Subtitle i, sub::collect<list<sub::Subtitle> > (sub::SSAReader::parse_line (base, bits[9]))) {
-		BOOST_FOREACH (sub::Line j, i.lines) {
-			BOOST_FOREACH (sub::Block k, j.blocks) {
-				ss.push_back (
-					dcp::SubtitleString (
-						boost::optional<string> (),
-						k.italic,
-						k.bold,
-						dcp::Colour (255, 255, 255),
-						/* 48pt is 1/22nd of the screen height */
-						48,
-						1,
-						dcp::Time (i.from.seconds(), 1000),
-						dcp::Time (i.to.seconds(), 1000),
-						0,
-						dcp::HALIGN_CENTER,
-						/* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
-						   of the screen a bit to a pleasing degree.
-						*/
-						1.015 - ((1 + highest - j.vertical_position.line.get()) * 1.5 / 22),
-						dcp::VALIGN_TOP,
-						dcp::DIRECTION_LTR,
-						k.text,
-						static_cast<dcp::Effect> (0),
-						dcp::Colour (255, 255, 255),
-						dcp::Time (),
-						dcp::Time ()
-						)
-					);
-			}
-		}
-	}
-
-	subtitle->give_text (period, ss);
 }