X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=a186db48eaecff51d6f0f1b6fa59f508378ab5ed;hb=c008066160d85b9ec9e5485375d7baaa5d27bda2;hp=a12f45a30f81d20d6af73fb97e0b62f805a54a54;hpb=f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index a12f45a30..a186db48e 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -34,13 +34,13 @@ extern "C" {
 #include "log.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
 #define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 
 using std::string;
-using std::stringstream;
 using std::vector;
 using std::list;
 using std::cout;
@@ -110,7 +110,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, vector<boost::shared_ptr
 
 	for (size_t i = 0; i < c.size(); ++i) {
 		shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (c[i]);
-		if (fc->subtitle_use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
+		if (fc->use_subtitles() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
 			throw JoinError (_("Content to be joined must use the same subtitle stream."));
 		}
 
@@ -163,26 +163,21 @@ FFmpegContent::as_xml (xmlpp::Node* node) const
 }
 
 void
-FFmpegContent::examine (shared_ptr<Job> job)
+FFmpegContent::examine (shared_ptr<Job> job, bool calculate_digest)
 {
 	job->set_progress_unknown ();
 
-	Content::examine (job);
+	Content::examine (job, calculate_digest);
 
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
 	take_from_video_examiner (examiner);
 
-	ContentTime video_length = examiner->video_length ();
-
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
-	LOG_GENERAL ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ()));
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 
-		_video_length = video_length;
-
 		_subtitle_streams = examiner->subtitle_streams ();
 		if (!_subtitle_streams.empty ()) {
 			_subtitle_stream = _subtitle_streams.front ();
@@ -196,7 +191,6 @@ FFmpegContent::examine (shared_ptr<Job> job)
 		_first_video = examiner->first_video ();
 	}
 
-	signal_changed (ContentProperty::LENGTH);
 	signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
 	signal_changed (FFmpegContentProperty::SUBTITLE_STREAM);
 	signal_changed (FFmpegContentProperty::AUDIO_STREAMS);
@@ -241,7 +235,7 @@ FFmpegContent::information () const
 		return "";
 	}
 	
-	stringstream s;
+	SafeStringStream s;
 	
 	s << String::compose (_("%1 frames; %2 frames per second"), video_length_after_3d_combine().frames (video_frame_rate()), video_frame_rate()) << "\n";
 	s << VideoContent::information ();
@@ -290,7 +284,7 @@ FFmpegContent::audio_channels () const
 		return 0;
 	}
 
-	return _audio_stream->channels;
+	return _audio_stream->channels ();
 }
 
 int
@@ -302,7 +296,7 @@ FFmpegContent::audio_frame_rate () const
 		return 0;
 	}
 
-	return _audio_stream->frame_rate;
+	return _audio_stream->frame_rate ();
 }
 
 bool
@@ -334,7 +328,7 @@ FFmpegContent::audio_mapping () const
 		return AudioMapping ();
 	}
 
-	return _audio_stream->mapping;
+	return _audio_stream->mapping ();
 }
 
 void
@@ -351,14 +345,14 @@ FFmpegContent::set_filters (vector<Filter const *> const & filters)
 void
 FFmpegContent::set_audio_mapping (AudioMapping m)
 {
-	audio_stream()->mapping = m;
+	audio_stream()->set_mapping (m);
 	AudioContent::set_audio_mapping (m);
 }
 
 string
 FFmpegContent::identifier () const
 {
-	stringstream s;
+	SafeStringStream s;
 
 	s << VideoContent::identifier();
 
@@ -396,20 +390,28 @@ FFmpegContent::audio_analysis_path () const
 	return p;
 }
 
-bool
-FFmpegContent::has_subtitle_during (ContentTimePeriod period) const
+list<ContentTimePeriod>
+FFmpegContent::subtitles_during (ContentTimePeriod period, bool starting) const
 {
+	list<ContentTimePeriod> d;
+	
 	shared_ptr<FFmpegSubtitleStream> stream = subtitle_stream ();
 	if (!stream) {
-		return false;
+		return d;
 	}
 
 	/* XXX: inefficient */
 	for (vector<ContentTimePeriod>::const_iterator i = stream->periods.begin(); i != stream->periods.end(); ++i) {
-		if (i->from <= period.to && i->to >= period.from) {
-			return true;
+		if ((starting && period.contains (i->from)) || (!starting && period.overlaps (*i))) {
+			d.push_back (*i);
 		}
 	}
 
-	return false;
+	return d;
+}
+
+bool
+FFmpegContent::has_subtitles () const
+{
+	return !subtitle_streams().empty ();
 }