diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-25 02:48:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-25 02:48:32 +0100 |
| commit | 8167d04e4dde6297ad936dca5dc691818a4dae41 (patch) | |
| tree | 37aac64d82949ac0086d40259ccd06e35e728597 /src/lib/video_content.cc | |
| parent | d8b6ee12af54a37433e96238bdca29171d6e0eb6 (diff) | |
11b5bf6229b8713dffde89a777cd5181335136f6 from master; default colour conversions depending on type and resolution
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 442ee703c..891ccecd8 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -205,8 +205,9 @@ VideoContent::as_xml (xmlpp::Node* node) const void VideoContent::set_default_colour_conversion () { + /* If there's no better offer we'll use Rec. 709 */ boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ()); + _colour_conversion = PresetColourConversion::from_id ("rec709").conversion; } void @@ -235,6 +236,8 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d) shared_ptr<const Film> film = _film.lock (); DCPOMATIC_ASSERT (film); LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate)); + + set_default_colour_conversion (); signal_changed (VideoContentProperty::VIDEO_SIZE); signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); @@ -562,4 +565,3 @@ VideoContent::processing_description () const return d.str (); } - |