diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-06-19 13:30:02 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-06-19 15:07:30 +0200 |
| commit | ca981c8cfa23111e92be329f1c2dfbe3a07b4247 (patch) | |
| tree | 2a0ceab2864691f910c9c7d70127542868f9f8e5 /src/lib/decoder_factory.cc | |
| parent | cabe0934c60fb6e74bf4c3023bdcb5c68753e5d9 (diff) | |
Make Atmos content work more like other content. Now its MXFsv2.15.82
are re-written, meaning that they can be encrypted.
This (along with the libdcp update) also fixes assorted Atmos bugs.
Diffstat (limited to 'src/lib/decoder_factory.cc')
| -rw-r--r-- | src/lib/decoder_factory.cc | 9 |
1 files changed, 8 insertions, 1 deletions
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 <cth@carlh.net> + Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net> 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<const Film> film, shared_ptr<const Content> content, return shared_ptr<Decoder> (new VideoMXFDecoder(film, vmc)); } + shared_ptr<const AtmosMXFContent> amc = dynamic_pointer_cast<const AtmosMXFContent> (content); + if (amc) { + return shared_ptr<Decoder> (new AtmosMXFDecoder(film, amc)); + } + return shared_ptr<Decoder> (); } |