Set correct video frame type when importing DCPs (part of #806).

diff --git a/ChangeLog b/ChangeLog
index 1f230c1341213003a3a1e3b1ed191fad8f910597..e564e7a8f82ab6dec1aebdda520d1f414db51587 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-14  c.hetherington  <cth@carlh.net>
+
+       * Select correct video frame type when importing DCPs (part of #806).
+
 2016-06-13  Carl Hetherington  <cth@carlh.net>
 
        * Give better error messages when subtitles fail to load.

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index b46b3dab7abdd216425865bba6bebcf1264ce907..295f33b3c4560955ecac9d2d8201945153fadc8e 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -63,6 +63,7 @@ DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
        , _reference_video (false)
        , _reference_audio (false)
        , _reference_subtitle (false)
+       , _three_d (false)
 {
        video.reset (new VideoContent (this));
        audio.reset (new AudioContent (this));
@@ -108,6 +109,7 @@ DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
                        DCPOMATIC_ASSERT (false);
                }
        }
+       _three_d = node->optional_bool_child("ThreeD").get_value_or (false);
 }
 
 void
@@ -155,11 +157,14 @@ DCPContent::examine (shared_ptr<Job> job)
                _encrypted = examiner->encrypted ();
                _kdm_valid = examiner->kdm_valid ();
                _standard = examiner->standard ();
+               _three_d = examiner->three_d ();
        }
 
        if (could_be_played != can_be_played ()) {
                signal_changed (DCPContentProperty::CAN_BE_PLAYED);
        }
+
+       video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D);
 }
 
 string
@@ -221,6 +226,7 @@ DCPContent::as_xml (xmlpp::Node* node) const
                        DCPOMATIC_ASSERT (false);
                }
        }
+       node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
 }
 
 DCPTime

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 255cfa19a1e864ae0364d0d8a6bd4db208487f00..cb92797069b28a1aaedc18df702b14240eb481b5 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -141,6 +141,7 @@ private:
        bool _reference_subtitle;
 
        boost::optional<dcp::Standard> _standard;
+       bool _three_d;
 };
 
 #endif

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index fa05f6e64f5574030b0790d01b1ea1839bb9e7f6..e3b0fb6eec2c6b09c1a64f1da76d765819a90963 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -52,6 +52,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        , _has_subtitles (false)
        , _encrypted (false)
        , _kdm_valid (false)
+       , _three_d (false)
 {
        dcp::DCP dcp (content->directory ());
        dcp.read (false, 0, true);
@@ -139,4 +140,6 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        }
 
        _standard = dcp.standard ();
+       _three_d = !reels.empty() && reels.front()->main_picture() &&
+               dynamic_pointer_cast<dcp::StereoPictureAsset> (reels.front()->main_picture()->asset());
 }

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 708d2e0ad167bbeae78dddda6b0d896463626898..6fc041cc6a9713bcf1bc0a3926a6dffda1e1c9e0 100644 (file)
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -80,6 +80,10 @@ public:
                return _standard;
        }
 
+       bool three_d () const {
+               return _three_d;
+       }
+
 private:
        boost::optional<double> _video_frame_rate;
        boost::optional<dcp::Size> _video_size;
@@ -92,4 +96,5 @@ private:
        bool _encrypted;
        bool _kdm_valid;
        boost::optional<dcp::Standard> _standard;
+       bool _three_d;
 };