/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic 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,
+ DCP-o-matic 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.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "video_content_scale.h"
#include "video_content.h"
#include "ratio.h"
-#include "safe_stringstream.h"
#include "util.h"
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/optional.hpp>
+#include <iostream>
#include "i18n.h"
string
VideoContentScale::id () const
{
- SafeStringStream s;
-
if (_ratio) {
- s << _ratio->id ();
- } else {
- s << (_scale ? "S1" : "S0");
+ return _ratio->id ();
}
-
- return s.str ();
+
+ return (_scale ? "S1" : "S0");
}
string
VideoContentScale::name () const
{
if (_ratio) {
- return _ratio->nickname ();
+ return _ratio->image_nickname ();
}
if (_scale) {
return _("No scale");
}
-VideoContentScale
-VideoContentScale::from_id (string id)
-{
- Ratio const * r = Ratio::from_id (id);
- if (r) {
- return VideoContentScale (r);
- }
-
- if (id == "S0") {
- return VideoContentScale (false);
- }
-
- return VideoContentScale (true);
-}
-
/** @param display_container Size of the container that we are displaying this content in.
* @param film_container The size of the film's image.
+ * @return Size, in pixels that the VideoContent's image should be scaled to (taking into account its pixel aspect ratio)
*/
dcp::Size
-VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container, int round) const
+VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container) const
{
/* Work out the size of the content if it were put inside film_container */
- dcp::Size video_size_after_crop = c->video_size_after_crop ();
-
+ dcp::Size video_size_after_crop = c->size_after_crop();
+ video_size_after_crop.width *= c->sample_aspect_ratio().get_value_or(1);
+
dcp::Size size;
if (_ratio) {
/* Stretch to fit the requested ratio */
- size = fit_ratio_within (_ratio->ratio (), film_container, round);
+ size = fit_ratio_within (_ratio->ratio (), film_container);
} else if (_scale || video_size_after_crop.width > film_container.width || video_size_after_crop.height > film_container.height) {
/* Scale, preserving aspect ratio; this is either if we have been asked to scale with no stretch
or if the unscaled content is too big for film_container.
*/
- size = fit_ratio_within (video_size_after_crop.ratio(), film_container, round);
+ size = fit_ratio_within (video_size_after_crop.ratio(), film_container);
} else {
/* No stretch nor scale */
size = video_size_after_crop;
float (display_container.width) / film_container.width,
float (display_container.height) / film_container.height
);
-
- size.width = rint (size.width * scale);
- size.height = rint (size.height * scale);
+
+ size.width = lrintf (size.width * scale);
+ size.height = lrintf (size.height * scale);
}
return size;