Allow + in DCP names for ISDCF RU rating strings.

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

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 10d405961ad4af041128e72a9a3e39a6ee57fa0c..16c20a536f2b363be981046f9b42a845b5d83639 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -69,7 +69,6 @@ ReelWriter::ReelWriter (
        , _period (period)
        , _last_written_video_frame (-1)
        , _last_written_eyes (EYES_RIGHT)
-       , _total_written_audio_frames (0)
        , _reel_index (reel_index)
        , _reel_count (reel_count)
        , _content_summary (content_summary)
@@ -79,10 +78,12 @@ ReelWriter::ReelWriter (
           it into the DCP later.
        */
 
+       dcp::Standard const standard = _film->interop() ? dcp::INTEROP : dcp::SMPTE;
+
        if (_film->three_d ()) {
-               _picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1)));
+               _picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard));
        } else {
-               _picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1)));
+               _picture_asset.reset (new   dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard));
        }
 
        _picture_asset->set_size (_film->frame_size ());
@@ -101,13 +102,12 @@ ReelWriter::ReelWriter (
 
        _picture_asset_writer = _picture_asset->start_write (
                _film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period),
-               _film->interop() ? dcp::INTEROP : dcp::SMPTE,
                _first_nonexistant_frame > 0
                );
 
        if (_film->audio_channels ()) {
                _sound_asset.reset (
-                       new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ())
+                       new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels (), standard)
                        );
 
                if (_film->encrypted ()) {
@@ -120,8 +120,7 @@ ReelWriter::ReelWriter (
                   of the DCP directory until the last minute.
                */
                _sound_asset_writer = _sound_asset->start_write (
-                       _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
-                       _film->interop() ? dcp::INTEROP : dcp::SMPTE
+                       _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary)
                        );
        }
 }
@@ -135,17 +134,6 @@ ReelWriter::write_frame_info (Frame frame, Eyes eyes, dcp::FrameInfo info) const
 
        bool const read = boost::filesystem::exists (info_file);
 
-#ifdef DCPOMATIC_WINDOWS
-       if (read) {
-               LOG_GENERAL (
-                       "Checked %1 (which exists) length is %2 perms are %3",
-                       info_file, boost::filesystem::file_size (info_file), int(boost::filesystem::status(info_file).permissions())
-                       );
-       } else {
-               LOG_GENERAL ("Checked %1 (which does not exist)", info_file);
-       }
-#endif
-
        if (read) {
                file = fopen_boost (info_file, "r+b");
        } else {
@@ -459,10 +447,12 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
                } else {
 
                        /* All our assets should be the same length; use the picture asset length here
-                          as a reference to set the subtitle one.
+                          as a reference to set the subtitle one.  We'll use the duration rather than
+                          the intrinsic duration; we don't care if the picture asset has been trimmed, we're
+                          just interested in its presentation length.
                        */
                        dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(_subtitle_asset)->set_intrinsic_duration (
-                               reel_picture_asset->intrinsic_duration ()
+                               reel_picture_asset->duration ()
                                );
 
                        _subtitle_asset->write (
@@ -474,7 +464,7 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
                        new dcp::ReelSubtitleAsset (
                                _subtitle_asset,
                                dcp::Fraction (_film->video_frame_rate(), 1),
-                               reel_picture_asset->intrinsic_duration (),
+                               reel_picture_asset->duration(),
                                0
                                )
                        );
@@ -493,7 +483,12 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
        }
 
        if (reel_subtitle_asset) {
-               DCPOMATIC_ASSERT (reel_subtitle_asset->duration() == period_duration);
+               if (reel_subtitle_asset->duration() != period_duration) {
+                       throw ProgrammingError (
+                               __FILE__, __LINE__,
+                               String::compose ("%1 vs %2", reel_subtitle_asset->duration(), period_duration)
+                               );
+               }
                reel->add (reel_subtitle_asset);
        }
 
@@ -526,11 +521,8 @@ ReelWriter::write (shared_ptr<const AudioBuffers> audio)
                return;
        }
 
-       if (audio) {
-               _sound_asset_writer->write (audio->data(), audio->frames());
-       }
-
-       _total_written_audio_frames += audio->frames ();
+       DCPOMATIC_ASSERT (audio);
+       _sound_asset_writer->write (audio->data(), audio->frames());
 }
 
 void