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/atmos_decoder.cc | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/lib/atmos_decoder.cc (limited to 'src/lib/atmos_decoder.cc') diff --git a/src/lib/atmos_decoder.cc b/src/lib/atmos_decoder.cc new file mode 100644 index 000000000..4ebb07f8a --- /dev/null +++ b/src/lib/atmos_decoder.cc @@ -0,0 +1,54 @@ +/* + Copyright (C) 2020 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + + +#include "atmos_decoder.h" +#include "content.h" +#include "dcpomatic_assert.h" +#include "dcpomatic_time.h" +#include "decoder.h" +#include "film.h" + + +using boost::shared_ptr; + + +AtmosDecoder::AtmosDecoder (Decoder* parent, shared_ptr content) + : DecoderPart (parent) + , _content (content) +{ + +} + + +void +AtmosDecoder::seek () +{ + _position = boost::none; +} + + +void +AtmosDecoder::emit (shared_ptr film, shared_ptr data, Frame frame, AtmosMetadata metadata) +{ + Data (ContentAtmos(data, frame, metadata)); + /* There's no fiddling with frame rates when we are using Atmos; the DCP rate must be the same as the Atmos one */ + _position = dcpomatic::ContentTime::from_frames (frame, film->video_frame_rate()); +} -- cgit v1.2.3