Change how video timing is done.

[dcpomatic.git] / src / lib / player_video.cc

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index c9bc2dcde9b9e6f48f414cadcaae269cc6d1248b..b020ca1cd8172ba1cd5193c5658d42c621166171 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "content.h"
 #include "film.h"
 #include "image.h"
@@ -33,16 +34,19 @@ extern "C" {
 #include <libxml++/libxml++.h>
 #include <iostream>
 
+
 using std::cout;
 using std::dynamic_pointer_cast;
+using std::function;
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
 using std::weak_ptr;
 using boost::optional;
-using std::function;
 using dcp::Data;
 using dcp::raw_convert;
+using namespace dcpomatic;
+
 
 PlayerVideo::PlayerVideo (
        shared_ptr<const ImageProxy> in,
@@ -55,7 +59,7 @@ PlayerVideo::PlayerVideo (
        optional<ColourConversion> colour_conversion,
        VideoRange video_range,
        weak_ptr<Content> content,
-       optional<Frame> video_frame,
+       optional<ContentTime> video_time,
        bool error
        )
        : _in (in)
@@ -68,12 +72,13 @@ PlayerVideo::PlayerVideo (
        , _colour_conversion (colour_conversion)
        , _video_range (video_range)
        , _content (content)
-       , _video_frame (video_frame)
+       , _video_time(video_time)
        , _error (error)
 {
 
 }
 
+
 PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
 {
        _crop = Crop (node);
@@ -103,12 +108,14 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
        }
 }
 
+
 void
 PlayerVideo::set_text (PositionImage image)
 {
        _text = image;
 }
 
+
 shared_ptr<Image>
 PlayerVideo::image (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool fast) const
 {
@@ -191,6 +198,7 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, V
        }
 }
 
+
 void
 PlayerVideo::add_metadata (xmlpp::Node* node) const
 {
@@ -218,6 +226,7 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
        }
 }
 
+
 void
 PlayerVideo::write_to_socket (shared_ptr<Socket> socket) const
 {
@@ -227,6 +236,7 @@ PlayerVideo::write_to_socket (shared_ptr<Socket> socket) const
        }
 }
 
+
 bool
 PlayerVideo::has_j2k () const
 {
@@ -240,6 +250,7 @@ PlayerVideo::has_j2k () const
        return _crop == Crop() && _out_size == j2k->size() && _inter_size == j2k->size() && !_text && !_fade && !_colour_conversion;
 }
 
+
 shared_ptr<const dcp::Data>
 PlayerVideo::j2k () const
 {
@@ -248,12 +259,14 @@ PlayerVideo::j2k () const
        return j2k->j2k ();
 }
 
+
 Position<int>
 PlayerVideo::inter_position () const
 {
        return Position<int> ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.height) / 2);
 }
 
+
 /** @return true if this PlayerVideo is definitely the same as another, false if it is probably not */
 bool
 PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
@@ -284,8 +297,9 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
        return _in->same (other->_in);
 }
 
+
 AVPixelFormat
-PlayerVideo::force (AVPixelFormat, AVPixelFormat force_to)
+PlayerVideo::force (AVPixelFormat force_to)
 {
        return force_to;
 }
@@ -296,6 +310,7 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p)
        return p == AV_PIX_FMT_XYZ12LE ? AV_PIX_FMT_XYZ12LE : AV_PIX_FMT_RGB48LE;
 }
 
+
 void
 PlayerVideo::prepare (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, Image::Alignment alignment, bool fast, bool proxy_only)
 {
@@ -306,12 +321,14 @@ PlayerVideo::prepare (function<AVPixelFormat (AVPixelFormat)> pixel_format, Vide
        }
 }
 
+
 size_t
 PlayerVideo::memory_used () const
 {
        return _in->memory_used();
 }
 
+
 /** @return Shallow copy of this; _in and _text are shared between the original and the copy */
 shared_ptr<PlayerVideo>
 PlayerVideo::shallow_copy () const
@@ -327,11 +344,12 @@ PlayerVideo::shallow_copy () const
                _colour_conversion,
                _video_range,
                _content,
-               _video_frame,
+               _video_time,
                _error
                );
 }
 
+
 /** Re-read crop, fade, inter/out size, colour conversion and video range from our content.
  *  @return true if this was possible, false if not.
  */
@@ -339,13 +357,18 @@ bool
 PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size)
 {
        auto content = _content.lock();
-       if (!content || !_video_frame) {
+       if (!content || !_video_time) {
                return false;
        }
 
        _crop = content->video->actual_crop();
-       _fade = content->video->fade(film, _video_frame.get());
-       _inter_size = scale_for_display(content->video->scaled_size(film->frame_size()), player_video_container_size, film->frame_size());
+       _fade = content->video->fade(film, _video_time.get());
+       _inter_size = scale_for_display(
+               content->video->scaled_size(film->frame_size()),
+               player_video_container_size,
+               film->frame_size(),
+               content->video->pixel_quanta()
+               );
        _out_size = player_video_container_size;
        _colour_conversion = content->video->colour_conversion();
        _video_range = content->video->range();