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/decoder_factory.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib/decoder_factory.cc') diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc index 2ded95fef..12e3f3ddd 100644 --- a/src/lib/decoder_factory.cc +++ b/src/lib/decoder_factory.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2019 Carl Hetherington + Copyright (C) 2016-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,8 @@ */ +#include "atmos_mxf_content.h" +#include "atmos_mxf_decoder.h" #include "ffmpeg_content.h" #include "ffmpeg_decoder.h" #include "dcp_content.h" @@ -89,5 +91,10 @@ decoder_factory (shared_ptr film, shared_ptr content, return shared_ptr (new VideoMXFDecoder(film, vmc)); } + shared_ptr amc = dynamic_pointer_cast (content); + if (amc) { + return shared_ptr (new AtmosMXFDecoder(film, amc)); + } + return shared_ptr (); } -- cgit v1.2.3