swaroop: encrypt decryption private key with motherboard UUID.

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

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 9192006796aefeda43d64a7a763f7beece3e98dc..02d7a9ff68cf9b85607f81f65d7251f5cef4cdb2 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -307,7 +307,7 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 
                        AudioStreamPtr as = audio->streams().front();
                        AudioMapping m = as->mapping ();
-                       m.make_default (film->audio_processor(), first_path);
+                       m.make_default (film ? film->audio_processor() : 0, first_path);
                        as->set_mapping (m);
                }
 
@@ -415,6 +415,23 @@ FFmpegContent::full_length (shared_ptr<const Film> film) const
        return longest;
 }
 
+DCPTime
+FFmpegContent::approximate_length () const
+{
+       if (video) {
+               return DCPTime::from_frames (video->length_after_3d_combine(), 24);
+       }
+
+       DCPOMATIC_ASSERT (audio);
+
+       Frame longest = 0;
+       BOOST_FOREACH (AudioStreamPtr i, audio->streams ()) {
+               longest = max (longest, Frame(llrint(i->length())));
+       }
+
+       return DCPTime::from_frames (longest, 24);
+}
+
 void
 FFmpegContent::set_filters (vector<Filter const *> const & filters)
 {
@@ -490,7 +507,7 @@ FFmpegContent::set_default_colour_conversion ()
 void
 FFmpegContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
 {
-       Content::add_properties (p);
+       Content::add_properties (film, p);
 
        if (video) {
                video->add_properties (p);