X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.cc;h=76ee663ff14e3bdec4689c546eebaba12e566c84;hb=8a7c6c1b3f8c25613019ff074d5b0c266f4e964c;hp=b2b67e5656c13e1a3d928b43a5f92e1e19b939c7;hpb=ca436a8e96e02f982790d4168ac3dfe1d589451c;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index b2b67e565..76ee663ff 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -119,22 +119,50 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr no
 
 }
 
-FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_ptr<Content> > c)
+FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
 	: Content (film, c)
 {
-	/* XXX: this should look at c to decide which of video/audio/subtitle
-	   get created.
-	*/
-	video.reset (new VideoContent (this, c));
-	audio.reset (new AudioContent (this, c));
-	subtitle.reset (new SubtitleContent (this, c));
+	vector<shared_ptr<Content> >::const_iterator i = c.begin ();
+
+	bool need_video = false;
+	bool need_audio = false;
+	bool need_subtitle = false;
+
+	if (i != c.end ()) {
+		need_video = static_cast<bool> ((*i)->video);
+		need_audio = static_cast<bool> ((*i)->audio);
+		need_subtitle = static_cast<bool> ((*i)->subtitle);
+	}
+
+	while (i != c.end ()) {
+		if (need_video != static_cast<bool> ((*i)->video)) {
+			throw JoinError (_("Content to be joined must all have or not have video"));
+		}
+		if (need_audio != static_cast<bool> ((*i)->audio)) {
+			throw JoinError (_("Content to be joined must all have or not have audio"));
+		}
+		if (need_subtitle != static_cast<bool> ((*i)->subtitle)) {
+			throw JoinError (_("Content to be joined must all have or not have subtitles"));
+		}
+		++i;
+	}
+
+	if (need_video) {
+		video.reset (new VideoContent (this, c));
+	}
+	if (need_audio) {
+		audio.reset (new AudioContent (this, c));
+	}
+	if (need_subtitle) {
+		subtitle.reset (new SubtitleContent (this, c));
+	}
 
 	shared_ptr<FFmpegContent> ref = dynamic_pointer_cast<FFmpegContent> (c[0]);
 	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->subtitle && fc->subtitle->use() && *(fc->_subtitle_stream.get()) != *(ref->_subtitle_stream.get())) {
 			throw JoinError (_("Content to be joined must use the same subtitle stream."));
 		}
 	}
@@ -218,6 +246,8 @@ FFmpegContent::examine (shared_ptr<Job> job)
 		set_default_colour_conversion ();
 	}
 
+	boost::filesystem::path first_path = path (0);
+
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 
@@ -239,7 +269,7 @@ FFmpegContent::examine (shared_ptr<Job> job)
 
 			AudioStreamPtr as = audio->streams().front();
 			AudioMapping m = as->mapping ();
-			film()->make_audio_mapping_default (m);
+			film()->make_audio_mapping_default (m, first_path);
 			as->set_mapping (m);
 		}
 
@@ -513,10 +543,11 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
 			_("BT2020 for a 10-bit system"),
 			_("BT2020 for a 12-bit system"),
 			_("SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"),
-			_("SMPTE ST 428-1")
+			_("SMPTE ST 428-1"),
+			_("ARIB STD-B67 ('Hybrid log-gamma')")
 		};
 
-		DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 18);
+		DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 19);
 		p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc]));
 
 		char const * spaces[] = {