Supporters update.

[dcpomatic.git] / src / lib / dcp_decoder.h

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 12e37104e599b76f7e272d212bef9fdfb1683b7d..2c0cd8f413ad7612ceeeae3e122694a9bf6d2bf2 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,59 +18,95 @@
 
 */
 
+
 /** @file  src/dcp_decoder.h
  *  @brief A decoder of existing DCPs.
  */
 
+
+#include "atmos_metadata.h"
 #include "decoder.h"
+#include "font_id_allocator.h"
+#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/sound_asset_reader.h>
+#include <dcp/subtitle_asset.h>
+
 
 namespace dcp {
        class Reel;
-       class MonoPictureAssetReader;
-       class StereoPictureAssetReader;
-       class SoundAssetReader;
 }
 
 class DCPContent;
 class Log;
 struct dcp_subtitle_within_dcp_test;
 
+
 class DCPDecoder : public Decoder
 {
 public:
-       DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log);
-
-       std::list<boost::shared_ptr<dcp::Reel> > reels () const {
+       DCPDecoder (
+               std::shared_ptr<const Film> film,
+               std::shared_ptr<const DCPContent> content,
+               bool fast,
+               bool tolerant,
+               std::shared_ptr<DCPDecoder> old
+               );
+
+       std::vector<std::shared_ptr<dcp::Reel>> reels () const {
                return _reels;
        }
 
-       void set_decode_referenced ();
+       void set_decode_referenced (bool r);
+       void set_forced_reduction (boost::optional<int> reduction);
+
+       bool pass () override;
+       void seek (dcpomatic::ContentTime t, bool accurate) override;
+
+       std::string lazy_digest () const {
+               return _lazy_digest;
+       }
+
+       dcpomatic::ContentTime position () const override;
 
 private:
        friend struct dcp_subtitle_within_dcp_test;
 
-       bool pass (PassReason, bool accurate);
-       void seek (ContentTime t, bool accurate);
        void next_reel ();
        void get_readers ();
+       void pass_texts (dcpomatic::ContentTime next, dcp::Size size);
+       void pass_texts (
+               dcpomatic::ContentTime next,
+               std::shared_ptr<dcp::SubtitleAsset> asset,
+               bool reference,
+               int64_t entry_point,
+               std::shared_ptr<TextDecoder> decoder,
+               dcp::Size size
+               );
+       std::string calculate_lazy_digest (std::shared_ptr<const DCPContent>) const;
+
+       std::shared_ptr<const DCPContent> _dcp_content;
 
-       std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
-       std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-
-       boost::shared_ptr<const DCPContent> _dcp_content;
        /** Time of next thing to return from pass relative to the start of _reel */
-       ContentTime _next;
-       std::list<boost::shared_ptr<dcp::Reel> > _reels;
+       dcpomatic::ContentTime _next;
+       std::vector<std::shared_ptr<dcp::Reel>> _reels;
 
-       std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
+       std::vector<std::shared_ptr<dcp::Reel>>::iterator _reel;
        /** Offset of _reel from the start of the content in frames */
-       int64_t _offset;
+       int64_t _offset = 0;
        /** Reader for current mono picture asset, if applicable */
-       boost::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+       std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
        /** Reader for current stereo picture asset, if applicable */
-       boost::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+       std::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
        /** Reader for current sound asset, if applicable */
-       boost::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+       std::shared_ptr<dcp::SoundAssetReader> _sound_reader;
+       std::shared_ptr<dcp::AtmosAssetReader> _atmos_reader;
+       boost::optional<AtmosMetadata> _atmos_metadata;
+
+       bool _decode_referenced = false;
+       boost::optional<int> _forced_reduction;
+
+       std::string _lazy_digest;
 
-       bool _decode_referenced;
+       FontIDAllocator _font_id_allocator;
 };