fixup! WIP: allow Piece to take multiple content/decoder.

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

diff --git a/src/lib/piece.h b/src/lib/piece.h
index 527f65c62e9bb247a55b0faf43ece509f12be109..a2718d4283ca187031fa72d6f64059f0bc7a6425 100644 (file)
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -24,30 +24,50 @@
 
 
 #include "audio_stream.h"
-#include "content_video.h"
 #include "dcpomatic_time.h"
+#include "font_data.h"
 #include "frame_rate_change.h"
+#include "piece_atmos.h"
+#include "piece_audio.h"
+#include "piece_text.h"
+#include "piece_video.h"
 #include "types.h"
+#include <boost/signals2.hpp>
 #include <map>
 
 
 class Content;
 class Decoder;
 class PlayerVideo;
+class Resampler;
+struct check_reuse_old_data_test;
 struct overlap_video_test1;
+struct player_time_calculation_test2;
 
 
 class Piece
 {
 public:
-       Piece (std::shared_ptr<Content> c, std::shared_ptr<Decoder> d, FrameRateChange f);
+       struct Pair {
+               Pair (std::shared_ptr<Content> c, std::shared_ptr<Decoder> d)
+                       : content(c)
+                       , decoder(d)
+               {}
+
+               std::shared_ptr<Content> content;
+               std::shared_ptr<Decoder> decoder;
+       };
+
+       Piece (
+               std::weak_ptr<const Film> film,
+               std::vector<Pair> content,
+               FrameRateChange frc,
+               bool fast
+             );
 
        void update_pull_to (dcpomatic::DCPTime& pull_to) const;
-       void set_last_push_end (AudioStreamPtr stream, dcpomatic::DCPTime last_push_end);
+       void set_last_push_end (int stream, dcpomatic::DCPTime last_push_end);
 
-       dcpomatic::DCPTime content_video_to_dcp (Frame f) const;
-       dcpomatic::DCPTime resampled_audio_to_dcp (Frame f, std::shared_ptr<const Film> film) const;
-       dcpomatic::ContentTime dcp_to_content_time (dcpomatic::DCPTime t, std::shared_ptr<const Film> film) const;
        boost::optional<dcpomatic::DCPTime> content_time_to_dcp (std::shared_ptr<const Content> content, dcpomatic::ContentTime t) const;
 
        void pass ();
@@ -60,28 +80,75 @@ public:
        }
 
        dcpomatic::DCPTime position () const;
-       dcpomatic::DCPTime end (std::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime end () const;
+       dcpomatic::DCPTimePeriod period () const;
 
-       std::shared_ptr<PlayerVideo> player_video (ContentVideo video, std::shared_ptr<const Film> film, dcp::Size container_size) const;
+       std::shared_ptr<PlayerVideo> player_video (PieceVideo video, dcp::Size container_size) const;
 
-       int resampled_audio_frame_rate (std::shared_ptr<const Film> film) const;
+       int resampled_audio_frame_rate () const;
        double audio_gain () const;
        bool reference_dcp_audio () const;
 
        std::shared_ptr<Decoder> decoder_for (std::shared_ptr<Content> content) const;
 
-       dcpomatic::DCPTime decoder_position () const;
+       void seek (dcpomatic::DCPTime time, bool accurate);
+       boost::optional<dcpomatic::DCPTime> decoder_before(boost::optional<dcpomatic::DCPTime> time);
+       std::vector<dcpomatic::FontData> fonts () const;
 
-       std::shared_ptr<Decoder> decoder;
-       boost::optional<dcpomatic::DCPTimePeriod> ignore_video;
-       bool done = false;
+       void set_ignore_video (boost::optional<dcpomatic::DCPTimePeriod> period) {
+               _ignore_video = period;
+       }
+
+       boost::signals2::signal<void (PieceVideo)> Video;
+       boost::signals2::signal<void (PieceAudio)> Audio;
+       boost::signals2::signal<void (PieceBitmapTextStart)> BitmapTextStart;
+       boost::signals2::signal<void (PieceStringTextStart)> StringTextStart;
+       boost::signals2::signal<void (PieceTextStop)> TextStop;
+       boost::signals2::signal<void (PieceAtmos)> Atmos;
 
 private:
        friend struct overlap_video_test1;
+       friend struct check_reuse_old_data_test;
+       friend struct player_time_calculation_test2;
+
+       void video (std::shared_ptr<const Content> content, std::shared_ptr<const ImageProxy> image, Frame frame, Eyes eyes, Part part);
+       void audio (std::shared_ptr<const Content> content, std::shared_ptr<AudioStream> stream, std::shared_ptr<const AudioBuffers> audio, Frame frame);
+       void bitmap_start (std::weak_ptr<const Content> content, std::weak_ptr<const TextContent> text, dcpomatic::ContentTime time, std::shared_ptr<Image> image, dcpomatic::Rect<double> area);
+       void string_start (std::weak_ptr<const Content> content, std::weak_ptr<const TextContent> text, dcpomatic::ContentTime time, std::list<dcp::SubtitleString> subs);
+       void stop (std::weak_ptr<const Content> content, std::weak_ptr<const TextContent> text, dcpomatic::ContentTime time);
+       void atmos (std::shared_ptr<const dcp::AtmosFrame> data, Frame frame, AtmosMetadata metadata);
+
+       void flush ();
+       bool done () const;
+
+       dcpomatic::DCPTime content_video_to_dcp (std::shared_ptr<const Content> content, Frame f) const;
+       dcpomatic::ContentTime dcp_to_content_time (std::shared_ptr<const Content> content, dcpomatic::DCPTime t) const;
+       dcpomatic::DCPTime resampled_audio_to_dcp (Frame f) const;
+
+       Pair representative () const {
+               return _content.front();
+       };
 
-       std::shared_ptr<Content> _content;
+       std::weak_ptr<const Film> _film;
+       std::vector<Pair> _content;
        FrameRateChange _frc;
-       std::map<AudioStreamPtr, dcpomatic::DCPTime> _stream_last_push_end;
+       bool _fast = false;
+       boost::optional<dcpomatic::DCPTimePeriod> _ignore_video;
+
+       struct Stream
+       {
+               Stream (dcpomatic::DCPTime lpe, AudioMapping m)
+                       : last_push_end(lpe)
+                       , mapping(m)
+               {}
+
+               dcpomatic::DCPTime last_push_end;
+               std::shared_ptr<Resampler> resampler;
+               Frame position = 0;
+               AudioMapping mapping;
+       };
+
+       std::vector<Stream> _audio_streams;
 };