Basics of allowing video parts of FFmpegContent to be disabled (#1355 and others).

3 files changed, 36 insertions, 11 deletions

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index c52723da3..cbde534c3 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -80,7 +80,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> film, shared_ptr<const FFmp
 	, Decoder (film)
 	, _have_current_subtitle (false)
 {
-	if (c->video) {
+	if (c->video && c->video->use()) {
 		video.reset (new VideoDecoder (this, c));
 		_pts_offset = pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->active_video_frame_rate(film));
 		/* It doesn't matter what size or pixel format this is, it just needs to be black */
@@ -185,7 +185,7 @@ FFmpegDecoder::pass ()
 	int const si = _packet.stream_index;
 	shared_ptr<const FFmpegContent> fc = _ffmpeg_content;
 
-	if (_video_stream && si == _video_stream.get() && !video->ignore()) {
+	if (_video_stream && si == _video_stream.get() && video && !video->ignore()) {
 		decode_video_packet ();
 	} else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index(_format_context, si) && !only_text()->ignore()) {
 		decode_subtitle_packet ();
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 4eda7d967..685336367 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -39,14 +39,15 @@
 
 #include "i18n.h"
 
-int const VideoContentProperty::SIZE	  = 0;
-int const VideoContentProperty::FRAME_TYPE  = 1;
-int const VideoContentProperty::CROP	  = 2;
-int const VideoContentProperty::SCALE	  = 3;
-int const VideoContentProperty::COLOUR_CONVERSION = 4;
-int const VideoContentProperty::FADE_IN     = 5;
-int const VideoContentProperty::FADE_OUT    = 6;
-int const VideoContentProperty::RANGE       = 7;
+int const VideoContentProperty::USE               = 0;
+int const VideoContentProperty::SIZE              = 1;
+int const VideoContentProperty::FRAME_TYPE        = 2;
+int const VideoContentProperty::CROP              = 3;
+int const VideoContentProperty::SCALE	          = 4;
+int const VideoContentProperty::COLOUR_CONVERSION = 5;
+int const VideoContentProperty::FADE_IN           = 6;
+int const VideoContentProperty::FADE_OUT          = 7;
+int const VideoContentProperty::RANGE             = 8;
 
 using std::string;
 using std::setprecision;
@@ -66,6 +67,7 @@ using namespace dcpomatic;
 
 VideoContent::VideoContent (Content* parent)
 	: ContentPart (parent)
+	, _use (true)
 	, _length (0)
 	, _frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (VideoContentScale (Ratio::from_id ("178")))
@@ -99,6 +101,7 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 		_parent->set_video_frame_rate (r.get ());
 	}
 
+	_use = node->optional_bool_child("Use").get_value_or(true);
 	_length = node->number_child<Frame> ("VideoLength");
 
 	if (version <= 34) {
@@ -171,6 +174,10 @@ VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
 
 	for (size_t i = 1; i < c.size(); ++i) {
 
+		if (c[i]->video->use() != ref->use()) {
+			throw JoinError (_("Content to be joined must have all its video used or not used."));
+		}
+
 		if (c[i]->video->size() != ref->size()) {
 			throw JoinError (_("Content to be joined must have the same picture size."));
 		}
@@ -202,6 +209,7 @@ VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
 		}
 	}
 
+	_use = ref->use ();
 	_size = ref->size ();
 	_frame_type = ref->frame_type ();
 	_crop = ref->crop ();
@@ -216,6 +224,7 @@ void
 VideoContent::as_xml (xmlpp::Node* node) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
+	node->add_child("Use")->add_child_text (_use ? "1" : "0");
 	node->add_child("VideoLength")->add_child_text (raw_convert<string> (_length));
 	node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_size.width));
 	node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_size.height));
@@ -280,7 +289,8 @@ VideoContent::identifier () const
 {
 	char buffer[256];
 	snprintf (
-		buffer, sizeof(buffer), "%d_%d_%d_%d_%s_%" PRId64 "_%" PRId64 "_%d",
+		buffer, sizeof(buffer), "%d_%d_%d_%d_%d_%s_%" PRId64 "_%" PRId64 "_%d",
+		(_use ? 1 : 0),
 		crop().left,
 		crop().right,
 		crop().top,
@@ -545,6 +555,12 @@ VideoContent::set_range (VideoRange r)
 }
 
 void
+VideoContent::set_use (bool u)
+{
+	maybe_set (_use, u, VideoContentProperty::USE);
+}
+
+void
 VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 {
 	if (c->_colour_conversion) {
@@ -552,6 +568,7 @@ VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 	} else {
 		unset_colour_conversion ();
 	}
+	set_use (c->_use);
 	set_frame_type (c->_frame_type);
 	set_left_crop (c->_crop.left);
 	set_right_crop (c->_crop.right);
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index f5fb6c9ac..6386754de 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -39,6 +39,7 @@ class Content;
 class VideoContentProperty
 {
 public:
+	static int const USE;
 	static int const SIZE;
 	static int const FRAME_TYPE;
 	static int const CROP;
@@ -94,6 +95,7 @@ public:
 	void set_fade_out (Frame);
 
 	void set_range (VideoRange);
+	void set_use (bool);
 
 	VideoFrameType frame_type () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -161,6 +163,11 @@ public:
 		return _range;
 	}
 
+	bool use () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _use;
+	}
+
 	dcp::Size size_after_3d_split () const;
 	dcp::Size size_after_crop () const;
 
@@ -191,6 +198,7 @@ private:
 	VideoContent (Content* parent, cxml::ConstNodePtr, int);
 	void setup_default_colour_conversion ();
 
+	bool _use;
 	Frame _length;
 	boost::optional<ColourConversion> _colour_conversion;
 	dcp::Size _size;