Merge master.

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

diff --git a/src/lib/player.h b/src/lib/player.h
index 62ba89e6c6e783c2603a390f41d43d1583c079af..a96c93404e171276b7a00e0e3fdb44cb048bfba2 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -32,6 +32,7 @@
 #include "content_subtitle.h"
 #include "position_image.h"
 #include "piece.h"
+#include "content_video.h"
 
 class Job;
 class Film;
@@ -39,9 +40,11 @@ class Playlist;
 class AudioContent;
 class Piece;
 class Image;
-class DCPVideo;
 class Decoder;
-
+class Resampler;
+class PlayerVideoFrame;
+class ImageProxy;
+ 
 class PlayerStatistics
 {
 public:
@@ -74,28 +77,6 @@ public:
        void dump (boost::shared_ptr<Log>) const;
 };
 
-/** A wrapper for an Image which contains some pending operations; these may
- *  not be necessary if the receiver of the PlayerImage throws it away.
- */
-class PlayerImage
-{
-public:
-       PlayerImage (boost::shared_ptr<const Image>, Crop, dcp::Size, dcp::Size, Scaler const *);
-
-       void set_subtitle (boost::shared_ptr<const Image>, Position<int>);
-       
-       boost::shared_ptr<Image> image ();
-       
-private:
-       boost::shared_ptr<const Image> _in;
-       Crop _crop;
-       dcp::Size _inter_size;
-       dcp::Size _out_size;
-       Scaler const * _scaler;
-       boost::shared_ptr<const Image> _subtitle_image;
-       Position<int> _subtitle_position;
-};
-
 /** @class Player
  *  @brief A class which can `play' a Playlist.
  */
@@ -104,7 +85,7 @@ class Player : public boost::enable_shared_from_this<Player>, public boost::nonc
 public:
        Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>);
 
-       boost::shared_ptr<DCPVideo> get_video (DCPTime time, bool accurate);
+       std::list<boost::shared_ptr<PlayerVideoFrame> > get_video (DCPTime time, bool accurate);
        boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate);
 
        void set_video_container_size (dcp::Size);
@@ -126,6 +107,7 @@ public:
 private:
        friend class PlayerWrapper;
        friend class Piece;
+       friend class player_overlaps_test;
 
        void setup_pieces ();
        void playlist_changed ();
@@ -134,21 +116,37 @@ private:
        void film_changed (Film::Property);
        std::list<PositionImage> process_content_image_subtitles (
                boost::shared_ptr<SubtitleContent>, std::list<boost::shared_ptr<ContentImageSubtitle> >
-               );
-       std::list<PositionImage> process_content_text_subtitles (std::list<boost::shared_ptr<ContentTextSubtitle> >);
+               ) const;
+       std::list<PositionImage> process_content_text_subtitles (std::list<boost::shared_ptr<ContentTextSubtitle> >) const;
        void update_subtitle_from_text ();
        VideoFrame dcp_to_content_video (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        AudioFrame dcp_to_content_audio (boost::shared_ptr<const Piece> piece, DCPTime t) const;
        ContentTime dcp_to_content_subtitle (boost::shared_ptr<const Piece> piece, DCPTime t) const;
-       boost::shared_ptr<DCPVideo> black_dcp_video (DCPTime) const;
-
+       boost::shared_ptr<PlayerVideoFrame> black_player_video_frame () const;
+       boost::shared_ptr<PlayerVideoFrame> content_to_player_video_frame (
+               boost::shared_ptr<VideoContent> content,
+               ContentVideo content_video,
+               std::list<boost::shared_ptr<Piece> > subs,
+               DCPTime time,
+               dcp::Size image_size
+               ) const;
+
+       /** @return Pieces of content type C that overlap a specified time range in the DCP */
        template<class C>
        std::list<boost::shared_ptr<Piece> >
-       overlaps (DCPTime t)
+       overlaps (DCPTime from, DCPTime to)
        {
+               if (!_have_valid_pieces) {
+                       setup_pieces ();
+               }
+
                std::list<boost::shared_ptr<Piece> > overlaps;
                for (typename std::list<boost::shared_ptr<Piece> >::const_iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
-                       if (boost::dynamic_pointer_cast<C> ((*i)->content) && (*i)->content->position() <= t && t < (*i)->content->end()) {
+                       if (!boost::dynamic_pointer_cast<C> ((*i)->content)) {
+                               continue;
+                       }
+
+                       if ((*i)->content->position() <= to && (*i)->content->end() >= from) {
                                overlaps.push_back (*i);
                        }
                }