From ca981c8cfa23111e92be329f1c2dfbe3a07b4247 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Jun 2020 13:30:02 +0200 Subject: Make Atmos content work more like other content. Now its MXFs are re-written, meaning that they can be encrypted. This (along with the libdcp update) also fixes assorted Atmos bugs. --- src/lib/writer.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/lib/writer.cc') diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 8682437b3..7d1088276 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -97,6 +97,7 @@ Writer::Writer (shared_ptr film, weak_ptr j) BOOST_FOREACH (DCPTextTrack i, _film->closed_caption_tracks()) { _caption_reels[i] = _reels.begin (); } + _atmos_reel = _reels.begin (); /* Check that the signer is OK */ string reason; @@ -303,6 +304,19 @@ Writer::write (shared_ptr audio, DCPTime const time) } +void +Writer::write (shared_ptr atmos, DCPTime time, AtmosMetadata metadata) +{ + if (_atmos_reel->period().to == time) { + ++_atmos_reel; + DCPOMATIC_ASSERT (_atmos_reel != _reels.end()); + } + + /* We assume that we get a video frame's worth of data here */ + _atmos_reel->write (atmos, metadata); +} + + /** Caller must hold a lock on _state_mutex */ bool Writer::have_sequenced_image_at_queue_head () -- cgit v1.2.3