Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...

[dcpomatic.git] / src / lib / video_content.cc

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 1fe02bae4551134e02a57873e2c1eb5ebd1dc3ed..c50d466a1f703f083a51a01d72440d0e0642d315 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -136,7 +136,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content>
        , _video_length (0)
 {
        shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
-       assert (ref);
+       DCPOMATIC_ASSERT (ref);
 
        for (size_t i = 0; i < c.size(); ++i) {
                shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c[i]);
@@ -228,9 +228,8 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
        {
                boost::mutex::scoped_lock lm (_mutex);
                _video_size = vs;
-               if (vfr) {
-                       _video_frame_rate = vfr.get ();
-               }
+               /* Default video frame rate to 24fps if the examiner doesn't know */
+               _video_frame_rate = vfr.get_value_or (24);
                _video_length = vl;
                _sample_aspect_ratio = ar;
 
@@ -241,7 +240,7 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
        }
 
        shared_ptr<const Film> film = _film.lock ();
-       assert (film);
+       DCPOMATIC_ASSERT (film);
        LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate));
        
        signal_changed (VideoContentProperty::VIDEO_SIZE);
@@ -414,7 +413,7 @@ VideoContent::video_size_after_3d_split () const
                return dcp::Size (s.width, s.height / 2);
        }
 
-       assert (false);
+       DCPOMATIC_ASSERT (false);
 }
 
 void
@@ -475,7 +474,7 @@ ContentTime
 VideoContent::dcp_time_to_content_time (DCPTime t) const
 {
        shared_ptr<const Film> film = _film.lock ();
-       assert (film);
+       DCPOMATIC_ASSERT (film);
        return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate()));
 }
 
@@ -483,7 +482,7 @@ void
 VideoContent::scale_and_crop_to_fit_width ()
 {
        shared_ptr<const Film> film = _film.lock ();
-       assert (film);
+       DCPOMATIC_ASSERT (film);
 
        set_scale (VideoContentScale (film->container ()));
 
@@ -496,7 +495,7 @@ void
 VideoContent::scale_and_crop_to_fit_height ()
 {
        shared_ptr<const Film> film = _film.lock ();
-       assert (film);
+       DCPOMATIC_ASSERT (film);
 
        set_scale (VideoContentScale (film->container ()));
 
@@ -523,7 +522,7 @@ VideoContent::set_video_frame_rate (float r)
 optional<float>
 VideoContent::fade (VideoFrame f) const
 {
-       assert (f >= 0);
+       DCPOMATIC_ASSERT (f >= 0);
        
        if (f < fade_in().frames (video_frame_rate ())) {
                return float (f) / _fade_in.frames (video_frame_rate ());
@@ -564,7 +563,7 @@ VideoContent::processing_description () const
        }
 
        shared_ptr<const Film> film = _film.lock ();
-       assert (film);
+       DCPOMATIC_ASSERT (film);
 
        dcp::Size const container_size = film->frame_size ();
        dcp::Size const scaled = scale().size (dynamic_pointer_cast<const VideoContent> (shared_from_this ()), container_size, container_size, 1);