projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Emit no audio from DCPs if none is mapped
[dcpomatic.git]
/
src
/
lib
/
decoder_factory.cc
diff --git
a/src/lib/decoder_factory.cc
b/src/lib/decoder_factory.cc
index 462a80eed74049d23ccfc2dced1e89220dfc4f1a..1bda93c9477c26de99946674b5481005cc389059 100644
(file)
--- a/
src/lib/decoder_factory.cc
+++ b/
src/lib/decoder_factory.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2020
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,56
+18,86
@@
*/
*/
-#include "ffmpeg_content.h"
-#include "ffmpeg_decoder.h"
+
+#include "atmos_mxf_content.h"
+#include "atmos_mxf_decoder.h"
#include "dcp_content.h"
#include "dcp_decoder.h"
#include "dcp_content.h"
#include "dcp_decoder.h"
-#include "image_content.h"
-#include "image_decoder.h"
-#include "text_subtitle_content.h"
-#include "text_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
#include "dcp_subtitle_decoder.h"
+#include "ffmpeg_content.h"
+#include "ffmpeg_decoder.h"
+#include "image_content.h"
+#include "image_decoder.h"
+#include "string_text_file_content.h"
+#include "string_text_file_decoder.h"
+#include "timer.h"
#include "video_mxf_content.h"
#include "video_mxf_decoder.h"
#include "video_mxf_content.h"
#include "video_mxf_decoder.h"
-#include <boost/foreach.hpp>
+
+using std::dynamic_pointer_cast;
using std::list;
using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::make_shared;
+using std::shared_ptr;
+
+template <class T>
+shared_ptr<T>
+maybe_cast (shared_ptr<Decoder> d)
+{
+ if (!d) {
+ return {};
+ }
+ return dynamic_pointer_cast<T> (d);
+}
+
+/**
+ @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>
shared_ptr<Decoder>
-decoder_factory (shared_ptr<const
Content> content, shared_ptr<Log> log
)
+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);
+
auto
fc = dynamic_pointer_cast<const FFmpegContent> (content);
if (fc) {
if (fc) {
- return
shared_ptr<Decoder> (new FFmpegDecoder (fc, log)
);
+ return
make_shared<FFmpegDecoder>(film, fc, fast
);
}
}
-
shared_ptr<const DCPContent>
dc = dynamic_pointer_cast<const DCPContent> (content);
+
auto
dc = dynamic_pointer_cast<const DCPContent> (content);
if (dc) {
if (dc) {
- return shared_ptr<Decoder> (new DCPDecoder (dc, log));
+ try {
+ return make_shared<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<const ImageContent>
ic = dynamic_pointer_cast<const ImageContent> (content);
+
auto
ic = dynamic_pointer_cast<const ImageContent> (content);
if (ic) {
if (ic) {
- return
shared_ptr<Decoder> (new ImageDecoder (ic, log)
);
+ return
make_shared<ImageDecoder>(film, ic
);
}
}
-
shared_ptr<const TextSubtitleContent> rc = dynamic_pointer_cast<const TextSubtit
leContent> (content);
+
auto rc = dynamic_pointer_cast<const StringTextFi
leContent> (content);
if (rc) {
if (rc) {
- return
shared_ptr<Decoder> (new TextSubtitleDecoder (rc)
);
+ return
make_shared<StringTextFileDecoder>(film, rc
);
}
}
-
shared_ptr<const DCPSubtitleContent>
dsc = dynamic_pointer_cast<const DCPSubtitleContent> (content);
+
auto
dsc = dynamic_pointer_cast<const DCPSubtitleContent> (content);
if (dsc) {
if (dsc) {
- return
shared_ptr<Decoder> (new DCPSubtitleDecoder (dsc)
);
+ return
make_shared<DCPSubtitleDecoder>(film, dsc
);
}
}
-
shared_ptr<const VideoMXFContent>
vmc = dynamic_pointer_cast<const VideoMXFContent> (content);
+
auto
vmc = dynamic_pointer_cast<const VideoMXFContent> (content);
if (vmc) {
if (vmc) {
- return shared_ptr<Decoder> (new VideoMXFDecoder (vmc, log));
+ return make_shared<VideoMXFDecoder>(film, vmc);
+ }
+
+ auto amc = dynamic_pointer_cast<const AtmosMXFContent> (content);
+ if (amc) {
+ return make_shared<AtmosMXFDecoder>(film, amc);
}
}
- return
shared_ptr<Decoder> ()
;
+ return
{}
;
}
}