X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=9e9473935d82810f88ca4a8bf445230504780629;hb=59e769023c392c332331567a1aea94660002c463;hp=f97e324bb4bb5d521467c0fcdd8a837e73299f7b;hpb=c88a8a6ec6b396dc90d40a4843160d616a45db76;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index f97e324bb..9e9473935 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;
@@ -106,11 +106,11 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, vector<boost::shared_ptr
 	, SubtitleContent (f, c)
 {
 	shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
-	assert (ref);
+	DCPOMATIC_ASSERT (ref);
 
 	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."));
 		}
 
@@ -169,20 +169,15 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
 	Content::examine (job);
 
-	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this ()));
+	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
 	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 ()));
+	DCPOMATIC_ASSERT (film);
 
 	{
 		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);
@@ -234,21 +228,6 @@ FFmpegContent::technical_summary () const
 			);
 }
 
-string
-FFmpegContent::information () const
-{
-	if (video_length() == ContentTime (0) || video_frame_rate() == 0) {
-		return "";
-	}
-	
-	stringstream 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 ();
-
-	return s.str ();
-}
-
 void
 FFmpegContent::set_subtitle_stream (shared_ptr<FFmpegSubtitleStream> s)
 {
@@ -290,7 +269,7 @@ FFmpegContent::audio_channels () const
 		return 0;
 	}
 
-	return _audio_stream->channels;
+	return _audio_stream->channels ();
 }
 
 int
@@ -302,7 +281,7 @@ FFmpegContent::audio_frame_rate () const
 		return 0;
 	}
 
-	return _audio_stream->frame_rate;
+	return _audio_stream->frame_rate ();
 }
 
 bool
@@ -321,7 +300,7 @@ DCPTime
 FFmpegContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	DCPOMATIC_ASSERT (film);
 	return DCPTime (video_length_after_3d_combine(), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
 }
 
@@ -334,7 +313,7 @@ FFmpegContent::audio_mapping () const
 		return AudioMapping ();
 	}
 
-	return _audio_stream->mapping;
+	return _audio_stream->mapping ();
 }
 
 void
@@ -351,14 +330,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();
 
@@ -388,7 +367,7 @@ FFmpegContent::audio_analysis_path () const
 	*/
 
 	boost::filesystem::path p = film->audio_analysis_dir ();
-	string name = digest ();
+	string name = digest();
 	if (audio_stream ()) {
 		name += "_" + audio_stream()->identifier ();
 	}
@@ -397,7 +376,7 @@ FFmpegContent::audio_analysis_path () const
 }
 
 list<ContentTimePeriod>
-FFmpegContent::subtitles_during (ContentTimePeriod period) const
+FFmpegContent::subtitles_during (ContentTimePeriod period, bool starting) const
 {
 	list<ContentTimePeriod> d;
 	
@@ -408,10 +387,16 @@ FFmpegContent::subtitles_during (ContentTimePeriod period) const
 
 	/* XXX: inefficient */
 	for (vector<ContentTimePeriod>::const_iterator i = stream->periods.begin(); i != stream->periods.end(); ++i) {
-		if (period.overlaps (*i)) {
+		if ((starting && period.contains (i->from)) || (!starting && period.overlaps (*i))) {
 			d.push_back (*i);
 		}
 	}
 
 	return d;
 }
+
+bool
+FFmpegContent::has_subtitles () const
+{
+	return !subtitle_streams().empty ();
+}