BOOST_FOREACH.

[dcpomatic.git] / src / lib / decoder_factory.cc

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 5d758956d76071fffe172229578b6efb83ad94b8..1acef6f4fbe9326d8b50d0f59050f0489a55e6bc 100644 (file)
--- 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"
@@ -31,11 +33,10 @@
 #include "video_mxf_content.h"
 #include "video_mxf_decoder.h"
 #include "timer.h"
-#include <boost/foreach.hpp>
 
 using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
 template <class T>
 shared_ptr<T>
@@ -47,9 +48,12 @@ maybe_cast (shared_ptr<Decoder> d)
        return dynamic_pointer_cast<T> (d);
 }
 
-/** @param old_decoder A `used' decoder that has been previously made for this piece of content, or 0 */
+/**
+   @param tolerant true to proceed in the face of `survivable' errors, otherwise false.
+   @param old_decoder A `used' decoder that has been previously made for this piece of content, or 0
+*/
 shared_ptr<Decoder>
-decoder_factory (shared_ptr<const Film> film, shared_ptr<const Content> content, bool fast, shared_ptr<Decoder> old_decoder)
+decoder_factory (shared_ptr<const Film> film, shared_ptr<const Content> content, bool fast, bool tolerant, shared_ptr<Decoder> old_decoder)
 {
        shared_ptr<const FFmpegContent> fc = dynamic_pointer_cast<const FFmpegContent> (content);
        if (fc) {
@@ -59,7 +63,7 @@ decoder_factory (shared_ptr<const Film> film, shared_ptr<const Content> content,
        shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (content);
        if (dc) {
                try {
-                       return shared_ptr<Decoder> (new DCPDecoder(film, dc, fast, maybe_cast<DCPDecoder>(old_decoder)));
+                       return shared_ptr<Decoder> (new DCPDecoder(film, dc, fast, tolerant, maybe_cast<DCPDecoder>(old_decoder)));
                } catch (KDMError& e) {
                        /* This will be found and reported to the user when the content is examined */
                        return shared_ptr<Decoder>();
@@ -86,5 +90,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> ();
 }