Round image line sizes up to 32. Seems to help with LHS image corruption with both...

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

diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
index 0c1ac87dc76d28f6470fd624300d15d6c8db8a60..a4d88d0e05a295cffe096231dd9956a4335fa687 100644 (file)
--- a/src/lib/film_state.cc
+++ b/src/lib/film_state.cc
@@ -80,6 +80,9 @@ FilmState::write_metadata (ofstream& f) const
        f << "audio_gain " << audio_gain << "\n";
        f << "audio_delay " << audio_delay << "\n";
        f << "still_duration " << still_duration << "\n";
+       f << "with_subtitles " << with_subtitles << "\n";
+       f << "subtitle_offset " << subtitle_offset << "\n";
+       f << "subtitle_scale " << subtitle_scale << "\n";
 
        /* Cached stuff; this is information about our content; we could
           look it up each time, but that's slow.
@@ -94,6 +97,7 @@ FilmState::write_metadata (ofstream& f) const
        f << "audio_sample_rate " << audio_sample_rate << "\n";
        f << "audio_sample_format " << audio_sample_format_to_string (audio_sample_format) << "\n";
        f << "content_digest " << content_digest << "\n";
+       f << "has_subtitles " << has_subtitles << "\n";
 }
 
 /** Read state from a key / value pair.
@@ -142,6 +146,12 @@ FilmState::read_metadata (string k, string v)
                audio_delay = atoi (v.c_str ());
        } else if (k == "still_duration") {
                still_duration = atoi (v.c_str ());
+       } else if (k == "with_subtitles") {
+               with_subtitles = (v == "1");
+       } else if (k == "subtitle_offset") {
+               subtitle_offset = atoi (v.c_str ());
+       } else if (k == "subtitle_scale") {
+               subtitle_scale = atof (v.c_str ());
        }
        
        /* Cached stuff */
@@ -165,6 +175,8 @@ FilmState::read_metadata (string k, string v)
                audio_sample_format = audio_sample_format_from_string (v);
        } else if (k == "content_digest") {
                content_digest = v;
+       } else if (k == "has_subtitles") {
+               has_subtitles = (v == "1");
        }
 }
 
@@ -184,10 +196,22 @@ FilmState::thumb_file (int n) const
  */
 string
 FilmState::thumb_file_for_frame (int n) const
+{
+       return thumb_base_for_frame(n) + ".png";
+}
+
+string
+FilmState::thumb_base (int n) const
+{
+       return thumb_base_for_frame (thumb_frame (n));
+}
+
+string
+FilmState::thumb_base_for_frame (int n) const
 {
        stringstream s;
        s.width (8);
-       s << setfill('0') << n << ".tiff";
+       s << setfill('0') << n;
        
        filesystem::path p;
        p /= dir ("thumbs");
@@ -283,19 +307,27 @@ FilmState::bytes_per_sample () const
 int
 FilmState::target_sample_rate () const
 {
+       /* Resample to a DCI-approved sample rate */
        double t = dcp_audio_sample_rate (audio_sample_rate);
+
+       /* Compensate for the fact that video will be rounded to the
+          nearest integer number of frames per second.
+       */
        if (rint (frames_per_second) != frames_per_second) {
-               if (fabs (frames_per_second - 23.976) < 1e-6) {
-                       /* 24fps drop-frame ie 24 * 1000 / 1001 frames per second;
-                          hence we need to resample the audio to dcp_audio_sample_rate * 1000 / 1001
-                          so that when we play it back at dcp_audio_sample_rate it is sped up
-                          by the same amount that the video is
-                       */
-                       t *= double(1000) / 1001;
-               } else {
-                       throw EncodeError ("unknown fractional frame rate");
-               }
+               t *= frames_per_second / rint (frames_per_second);
        }
 
        return rint (t);
 }
+
+int
+FilmState::dcp_length () const
+{
+       if (dcp_frames) {
+               return dcp_frames;
+       }
+
+       return length;
+}
+
+