projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make subtitle asset filename obey custom settings (#2260).
[dcpomatic.git]
/
src
/
lib
/
video_mxf_decoder.h
diff --git
a/src/lib/video_mxf_decoder.h
b/src/lib/video_mxf_decoder.h
index 0432ad885e0ad9554bfd3082b94979a32050836c..774e269c6d5da15275e1ccf61259f4ad1f510fa3 100644
(file)
--- a/
src/lib/video_mxf_decoder.h
+++ b/
src/lib/video_mxf_decoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,21
+18,31
@@
*/
*/
+
#include "decoder.h"
#include "decoder.h"
+#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/stereo_picture_asset_reader.h>
+
class VideoMXFContent;
class Log;
class VideoMXFContent;
class Log;
+
class VideoMXFDecoder : public Decoder
{
public:
class VideoMXFDecoder : public Decoder
{
public:
- VideoMXFDecoder (boost::shared_ptr<const VideoMXFContent>, boost::shared_ptr<Log> log);
+ VideoMXFDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const VideoMXFContent>);
+
+ bool pass () override;
+ void seek (dcpomatic::ContentTime t, bool accurate) override;
private:
private:
- bool pass (PassReason, bool accurate);
- void seek (ContentTime t, bool accurate);
-
boost
::shared_ptr<const VideoMXFContent> _content;
+
std
::shared_ptr<const VideoMXFContent> _content;
/** Time of next thing to return from pass */
/** Time of next thing to return from pass */
- ContentTime _next;
+ dcpomatic::ContentTime _next;
+
+ std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+ std::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+ dcp::Size _size;
};
};