From a0c931b6bfb05b56996a75bbfcf378cd44ef18e1 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 commit is mostly just for the backend. We also need a fair few checks/restrictions in the UI: - any present atmos content dictates the project frame rate - no mixed edit rates of atmos content - probably some other things I haven't thought of --- src/lib/atmos_mxf_decoder.cc | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 src/lib/atmos_mxf_decoder.cc (limited to 'src/lib/atmos_mxf_decoder.cc') diff --git a/src/lib/atmos_mxf_decoder.cc b/src/lib/atmos_mxf_decoder.cc new file mode 100644 index 000000000..3f6f4a857 --- /dev/null +++ b/src/lib/atmos_mxf_decoder.cc @@ -0,0 +1,65 @@ +/* + 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_content.h" +#include "atmos_decoder.h" +#include "atmos_mxf_content.h" +#include "atmos_mxf_decoder.h" +#include "dcpomatic_time.h" +#include +#include + +using boost::shared_ptr; + +AtmosMXFDecoder::AtmosMXFDecoder (boost::shared_ptr film, boost::shared_ptr content) + : Decoder (film) + , _content (content) +{ + atmos.reset (new AtmosDecoder(this, content)); + + shared_ptr asset (new dcp::AtmosAsset(_content->path(0))); + _reader = asset->start_read (); + _metadata = AtmosMetadata (asset); +} + + +bool +AtmosMXFDecoder::pass () +{ + double const vfr = _content->active_video_frame_rate (film()); + int64_t const frame = _next.frames_round (vfr); + + if (frame >= _content->atmos->length()) { + return true; + } + + atmos->emit (film(), _reader->get_frame(frame), frame, *_metadata); + _next += dcpomatic::ContentTime::from_frames (1, vfr); + return false; +} + + +void +AtmosMXFDecoder::seek (dcpomatic::ContentTime t, bool accurate) +{ + Decoder::seek (t, accurate); + _next = t; +} + -- cgit v1.2.3