Merge.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 8bb7f3700ec6a54c51f54ff02e5a13b16ee5606c..a5147f42ece1a450ec946681f659ab8435793eb5 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -23,6 +21,7 @@
 #include "subtitle.h"
 #include "film.h"
 #include "image.h"
+#include "ratio.h"
 
 #include "i18n.h"
 
@@ -33,7 +32,7 @@ VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoCont
        : Decoder (f)
        , _next_video (0)
        , _video_content (c)
-       , _frame_rate_conversion (c->video_frame_rate(), f->dcp_frame_rate())
+       , _frame_rate_conversion (c->video_frame_rate(), f->dcp_video_frame_rate())
        , _odd (false)
 {
 
@@ -52,18 +51,48 @@ VideoDecoder::video (shared_ptr<Image> image, bool same, Time t)
                return;
        }
 
+       image->crop (_video_content->crop(), true);
+
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
+       
+       libdcp::Size const container_size = film->container()->size (film->full_frame ());
+       libdcp::Size const image_size = _video_content->ratio()->size (container_size);
+       
+       shared_ptr<Image> out = image->scale_and_convert_to_rgb (image_size, film->scaler(), true);
+
        shared_ptr<Subtitle> sub;
        if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
                sub = _timed_subtitle->subtitle ();
        }
 
-       Video (image, same, sub, t);
+       if (sub) {
+               dcpomatic::Rect const tx = subtitle_transformed_area (
+                       float (image_size.width) / video_size().width,
+                       float (image_size.height) / video_size().height,
+                       sub->area(), film->subtitle_offset(), film->subtitle_scale()
+                       );
+
+               shared_ptr<Image> im = sub->image()->scale (tx.size(), film->scaler(), true);
+               out->alpha_blend (im, tx.position());
+       }
+
+       if (image_size != container_size) {
+               assert (image_size.width <= container_size.width);
+               assert (image_size.height <= container_size.height);
+               shared_ptr<Image> im (new SimpleImage (PIX_FMT_RGB24, container_size, true));
+               im->make_black ();
+               im->copy (out, Position ((container_size.width - image_size.width) / 2, (container_size.height - image_size.height) / 2));
+               out = im;
+       }
+               
+       Video (out, same, t);
 
        if (_frame_rate_conversion.repeat) {
-               Video (image, true, sub, t + _film->video_frames_to_time (1));
-               _next_video = t + _film->video_frames_to_time (2);
+               Video (image, true, t + film->video_frames_to_time (1));
+               _next_video = t + film->video_frames_to_time (2);
        } else {
-               _next_video = t + _film->video_frames_to_time (1);
+               _next_video = t + film->video_frames_to_time (1);
        }
 
        _odd = !_odd;
@@ -83,3 +112,12 @@ VideoDecoder::subtitle (shared_ptr<TimedSubtitle> s)
                _timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
        }
 }
+
+bool
+VideoDecoder::video_done () const
+{
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
+       
+       return (_video_content->length() - _next_video) < film->video_frames_to_time (1);
+}