Hand apply a484114b80f21f2f786b6142ad950f5295249673 from master;

comments.

diff --git a/TO_PORT b/TO_PORT
index 4dfb76788ca4cbac9d67de12e73e42e981f65da3..d06304abbd762bc66f67766d64468c1561977c67 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-65c5c51161a862cb77198472940b756b2d18aa87
 6b811225da349c1a0bc570b886833c31bb5744f7
 0b2c8aee63b691a08b01d9d59e810c2e6c1e6c1b
 d8bfb59816e39406beb7c815e0424c480ae74e32

diff --git a/src/lib/player.h b/src/lib/player.h
index a3b745c8e4ca69acd641cb106be7b733ca19e7da..3852965853ed5ef17a0624a04018a4409352a0f3 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -151,6 +151,7 @@ private:
        bool _have_valid_pieces;
        std::list<boost::shared_ptr<Piece> > _pieces;
 
+       /** Size of the image in the DCP (e.g. 1990x1080 for flat) */
        dcp::Size _video_container_size;
        boost::shared_ptr<Image> _black_image;
 

diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
deleted file mode 100644 (file)
index 03d4ccf..0000000
--- a/src/lib/subtitle.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "subtitle.h"
-#include "subtitle_content.h"
-#include "piece.h"
-#include "image.h"
-#include "scaler.h"
-#include "film.h"
-
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
-using boost::weak_ptr;
-
-Subtitle::Subtitle (shared_ptr<const Film> film, libdcp::Size video_container_size, weak_ptr<Piece> weak_piece, shared_ptr<Image> image, dcpomatic::Rect<double> rect, Time from, Time to)
-       : _piece (weak_piece)
-       , _in_image (image)
-       , _in_rect (rect)
-       , _in_from (from)
-       , _in_to (to)
-{
-       update (film, video_container_size);
-}
-
-void
-Subtitle::update (shared_ptr<const Film> film, libdcp::Size video_container_size)
-{
-       shared_ptr<Piece> piece = _piece.lock ();
-       if (!piece) {
-               return;
-       }
-
-       if (!_in_image) {
-               _out_image.reset ();
-               return;
-       }
-
-       shared_ptr<SubtitleContent> sc = dynamic_pointer_cast<SubtitleContent> (piece->content);
-       assert (sc);
-
-       dcpomatic::Rect<double> in_rect = _in_rect;
-       libdcp::Size scaled_size;
-
-       in_rect.x += sc->subtitle_x_offset ();
-       in_rect.y += sc->subtitle_y_offset ();
-
-       /* We will scale the subtitle up to fit _video_container_size, and also by the additional subtitle scale */
-       scaled_size.width = in_rect.width * video_container_size.width * sc->subtitle_x_scale ();
-       scaled_size.height = in_rect.height * video_container_size.height * sc->subtitle_y_scale ();
-
-       /* Then we need a corrective translation, consisting of two parts:
-        *
-        * 1.  that which is the result of the scaling of the subtitle by _video_container_size; this will be
-        *     rect.x * _video_container_size.width and rect.y * _video_container_size.height.
-        *
-        * 2.  that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be
-        *     (width_before_subtitle_scale * (1 - subtitle_x_scale) / 2) and
-        *     (height_before_subtitle_scale * (1 - subtitle_y_scale) / 2).
-        *
-        * Combining these two translations gives these expressions.
-        */
-       
-       _out_position.x = rint (video_container_size.width * (in_rect.x + (in_rect.width * (1 - sc->subtitle_x_scale ()) / 2)));
-       _out_position.y = rint (video_container_size.height * (in_rect.y + (in_rect.height * (1 - sc->subtitle_y_scale ()) / 2)));
-       
-       _out_image = _in_image->scale (
-               scaled_size,
-               Scaler::from_id ("bicubic"),
-               _in_image->pixel_format (),
-               true
-               );
-
-       /* XXX: hack */
-       Time from = _in_from;
-       Time to = _in_to;
-       shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (piece->content);
-       if (vc) {
-               from = rint (from * vc->video_frame_rate() / film->video_frame_rate());
-               to = rint (to * vc->video_frame_rate() / film->video_frame_rate());
-       }
-       
-       _out_from = from + piece->content->position ();
-       _out_to = to + piece->content->position ();
-
-       check_out_to ();
-}
-
-bool
-Subtitle::covers (Time t) const
-{
-       return _out_from <= t && t <= _out_to;
-}
-
-void
-Subtitle::check_out_to ()
-{
-       if (_stop && _out_to > _stop.get ()) {
-               _out_to = _stop.get ();
-       }
-}

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index e1485e221d70807109e3803b0493c9d8524fe974..9b2aa8ab04198f8108606474897c2445973dfc93 100644 (file)
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -34,6 +34,9 @@ SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
 
 /** Called by subclasses when an image subtitle is ready.
  *  Image may be 0 to say that there is no current subtitle.
+ *  @param rect Area expressed as a fraction of the video frame that this subtitle
+ *  is for (e.g. a width of 0.5 means the width of the subtitle is half the width
+ *  of the video frame)
  */
 void
 SubtitleDecoder::image_subtitle (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect)