Disable YUV->RGB conversion controls with non-YUV sources (#649).

8 files changed, 121 insertions, 0 deletions

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 532bad60c..f2609ed3e 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -43,6 +43,10 @@ public:
 		return _video_length;
 	}
 
+	bool yuv () const {
+		return false;
+	}
+
 	std::string name () const {
 		return _name;
 	}
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 4fd1b6fe8..719e7a2b0 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -332,3 +332,86 @@ FFmpegExaminer::bits_per_pixel () const
 {
 	return av_get_bits_per_pixel (av_pix_fmt_desc_get (video_codec_context()->pix_fmt));
 }
+
+bool
+FFmpegExaminer::yuv () const
+{
+	switch (video_codec_context()->pix_fmt) {
+	case AV_PIX_FMT_YUV420P:
+	case AV_PIX_FMT_YUYV422:
+	case AV_PIX_FMT_YUV422P:
+	case AV_PIX_FMT_YUV444P:
+	case AV_PIX_FMT_YUV410P:
+	case AV_PIX_FMT_YUV411P:
+	case AV_PIX_FMT_YUVJ420P:
+	case AV_PIX_FMT_YUVJ422P:
+	case AV_PIX_FMT_YUVJ444P:
+	case AV_PIX_FMT_UYVY422:
+	case AV_PIX_FMT_UYYVYY411:
+	case AV_PIX_FMT_NV12:
+	case AV_PIX_FMT_NV21:
+	case AV_PIX_FMT_YUV440P:
+	case AV_PIX_FMT_YUVJ440P:
+	case AV_PIX_FMT_YUVA420P:
+	case AV_PIX_FMT_YUV420P16LE:
+	case AV_PIX_FMT_YUV420P16BE:
+	case AV_PIX_FMT_YUV422P16LE:
+	case AV_PIX_FMT_YUV422P16BE:
+	case AV_PIX_FMT_YUV444P16LE:
+	case AV_PIX_FMT_YUV444P16BE:
+	case AV_PIX_FMT_YUV420P9BE:
+	case AV_PIX_FMT_YUV420P9LE:
+	case AV_PIX_FMT_YUV420P10BE:
+	case AV_PIX_FMT_YUV420P10LE:
+	case AV_PIX_FMT_YUV422P10BE:
+	case AV_PIX_FMT_YUV422P10LE:
+	case AV_PIX_FMT_YUV444P9BE:
+	case AV_PIX_FMT_YUV444P9LE:
+	case AV_PIX_FMT_YUV444P10BE:
+	case AV_PIX_FMT_YUV444P10LE:
+	case AV_PIX_FMT_YUV422P9BE:
+	case AV_PIX_FMT_YUV422P9LE:
+	case AV_PIX_FMT_YUVA422P_LIBAV:
+	case AV_PIX_FMT_YUVA444P_LIBAV:
+	case AV_PIX_FMT_YUVA420P9BE:
+	case AV_PIX_FMT_YUVA420P9LE:
+	case AV_PIX_FMT_YUVA422P9BE:
+	case AV_PIX_FMT_YUVA422P9LE:
+	case AV_PIX_FMT_YUVA444P9BE:
+	case AV_PIX_FMT_YUVA444P9LE:
+	case AV_PIX_FMT_YUVA420P10BE:
+	case AV_PIX_FMT_YUVA420P10LE:
+	case AV_PIX_FMT_YUVA422P10BE:
+	case AV_PIX_FMT_YUVA422P10LE:
+	case AV_PIX_FMT_YUVA444P10BE:
+	case AV_PIX_FMT_YUVA444P10LE:
+	case AV_PIX_FMT_YUVA420P16BE:
+	case AV_PIX_FMT_YUVA420P16LE:
+	case AV_PIX_FMT_YUVA422P16BE:
+	case AV_PIX_FMT_YUVA422P16LE:
+	case AV_PIX_FMT_YUVA444P16BE:
+	case AV_PIX_FMT_YUVA444P16LE:
+	case AV_PIX_FMT_NV16:
+	case AV_PIX_FMT_NV20LE:
+	case AV_PIX_FMT_NV20BE:
+	case AV_PIX_FMT_YVYU422:
+	case AV_PIX_FMT_YUVA444P:
+	case AV_PIX_FMT_YUVA422P:
+	case AV_PIX_FMT_YUV420P12BE:
+	case AV_PIX_FMT_YUV420P12LE:
+	case AV_PIX_FMT_YUV420P14BE:
+	case AV_PIX_FMT_YUV420P14LE:
+	case AV_PIX_FMT_YUV422P12BE:
+	case AV_PIX_FMT_YUV422P12LE:
+	case AV_PIX_FMT_YUV422P14BE:
+	case AV_PIX_FMT_YUV422P14LE:
+	case AV_PIX_FMT_YUV444P12BE:
+	case AV_PIX_FMT_YUV444P12LE:
+	case AV_PIX_FMT_YUV444P14BE:
+	case AV_PIX_FMT_YUV444P14LE:
+	case AV_PIX_FMT_YUVJ411P:
+		return true;
+	default:
+		return false;
+	}
+}
diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 27bff08b4..6e2185129 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -35,6 +35,7 @@ public:
 	dcp::Size video_size () const;
 	Frame video_length () const;
 	boost::optional<double> sample_aspect_ratio () const;
+	bool yuv () const;
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
 		return _subtitle_streams;
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 376491738..73d004d7f 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -92,3 +92,13 @@ ImageExaminer::video_frame_rate () const
 	/* Don't know */
 	return optional<double> ();
 }
+
+bool
+ImageExaminer::yuv () const
+{
+	/* We never convert ImageSource from YUV to RGB (though maybe sometimes we should)
+	   so it makes sense to just say they are never YUV so the option of a conversion
+	   to RGB is not offered.
+	*/
+	return false;
+}
diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index 792c7b4eb..cd8964d0a 100644
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -31,10 +31,12 @@ public:
 	Frame video_length () const {
 		return _video_length;
 	}
+	bool yuv () const;
 
 private:
 	boost::weak_ptr<const Film> _film;
 	boost::shared_ptr<const ImageContent> _image_content;
 	boost::optional<dcp::Size> _video_size;
 	Frame _video_length;
+	bool _yuv;
 };
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 498d5b9db..78b320034 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -69,6 +69,7 @@ VideoContent::VideoContent (shared_ptr<const Film> film)
 	, _video_length (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (VideoContentScale (Ratio::from_id ("178")))
+	, _yuv (true)
 	, _fade_in (0)
 	, _fade_out (0)
 {
@@ -80,6 +81,7 @@ VideoContent::VideoContent (shared_ptr<const Film> film, DCPTime s, Frame len)
 	, _video_length (len)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (VideoContentScale (Ratio::from_id ("178")))
+	, _yuv (true)
 	, _fade_in (0)
 	, _fade_out (0)
 {
@@ -91,6 +93,7 @@ VideoContent::VideoContent (shared_ptr<const Film> film, boost::filesystem::path
 	, _video_length (0)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (VideoContentScale (Ratio::from_id ("178")))
+	, _yuv (true)
 	, _fade_in (0)
 	, _fade_out (0)
 {
@@ -124,6 +127,9 @@ VideoContent::VideoContent (shared_ptr<const Film> film, cxml::ConstNodePtr node
 	if (node->optional_node_child ("ColourConversion")) {
 		_colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version);
 	}
+
+	_yuv = node->optional_bool_child("YUV").get_value_or (true);
+
 	if (version >= 32) {
 		_fade_in = node->number_child<Frame> ("FadeIn");
 		_fade_out = node->number_child<Frame> ("FadeOut");
@@ -135,6 +141,7 @@ VideoContent::VideoContent (shared_ptr<const Film> film, cxml::ConstNodePtr node
 VideoContent::VideoContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
 	: Content (film, c)
 	, _video_length (0)
+	, _yuv (false)
 {
 	shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
 	DCPOMATIC_ASSERT (ref);
@@ -171,6 +178,10 @@ VideoContent::VideoContent (shared_ptr<const Film> film, vector<shared_ptr<Conte
 		}
 
 		_video_length += vc->video_length ();
+
+		if (vc->yuv ()) {
+			_yuv = true;
+		}
 	}
 
 	_video_size = ref->video_size ();
@@ -202,6 +213,7 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	if (_colour_conversion) {
 		_colour_conversion.get().as_xml (node->add_child("ColourConversion"));
 	}
+	node->add_child("YUV")->add_child_text (_yuv ? "1" : "0");
 	node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in));
 	node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out));
 }
@@ -222,6 +234,7 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
 	optional<double> const vfr = d->video_frame_rate ();
 	Frame vl = d->video_length ();
 	optional<double> const ar = d->sample_aspect_ratio ();
+	bool const yuv = d->yuv ();
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -229,6 +242,7 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
 		_video_frame_rate = vfr;
 		_video_length = vl;
 		_sample_aspect_ratio = ar;
+		_yuv = yuv;
 
 		/* Guess correct scale from size and sample aspect ratio */
 		_scale = VideoContentScale (
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 309fa0670..689655131 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -150,6 +150,11 @@ public:
 		return _sample_aspect_ratio;
 	}
 
+	bool yuv () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _yuv;
+	}
+
 	Frame fade_in () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _fade_in;
@@ -197,6 +202,7 @@ private:
 	    if there is one.
 	*/
 	boost::optional<double> _sample_aspect_ratio;
+	bool _yuv;
 	Frame _fade_in;
 	Frame _fade_out;
 };
diff --git a/src/lib/video_examiner.h b/src/lib/video_examiner.h
index 66d3ae5b5..3c8f71757 100644
--- a/src/lib/video_examiner.h
+++ b/src/lib/video_examiner.h
@@ -38,4 +38,5 @@ public:
 	virtual boost::optional<double> sample_aspect_ratio () const {
 		return boost::optional<double> ();
 	}
+	virtual bool yuv () const = 0;
 };