Read UTF8 string lengths correctly when checking closed captions (part of #1446).

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

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 2b494dc9233259afdf2f73e30c1c015777b311ed..02d7a9ff68cf9b85607f81f65d7251f5cef4cdb2 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -45,8 +45,6 @@ extern "C" {
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) dcpomatic_log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-
 using std::string;
 using std::vector;
 using std::list;
@@ -309,7 +307,7 @@ FFmpegContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 
                        AudioStreamPtr as = audio->streams().front();
                        AudioMapping m = as->mapping ();
-                       film->make_audio_mapping_default (m, first_path);
+                       m.make_default (film ? film->audio_processor() : 0, first_path);
                        as->set_mapping (m);
                }
 
@@ -402,7 +400,7 @@ operator!= (FFmpegStream const & a, FFmpegStream const & b)
 DCPTime
 FFmpegContent::full_length (shared_ptr<const Film> film) const
 {
-       FrameRateChange const frc (active_video_frame_rate(film), film->video_frame_rate());
+       FrameRateChange const frc (film, shared_from_this());
        if (video) {
                return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
        }
@@ -417,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)
 {
@@ -492,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);