+2019-01-05 Carl Hetherington <cth@carlh.net>
+
+ * Fix strange behaviour with single-frame fades.
+
2018-12-29 Carl Hetherington <cth@carlh.net>
* Updated fr_FR translation from Thierry Journet.
PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
{
if (_crop != other->_crop ||
- _fade.get_value_or(0) != other->_fade.get_value_or(0) ||
+ _fade != other->_fade ||
_inter_size != other->_inter_size ||
_out_size != other->_out_size ||
_eyes != other->_eyes ||
set_bottom_crop (0);
}
-/** @param f Frame index within the whole (untrimmed) content */
+/** @param f Frame index within the whole (untrimmed) content.
+ * @return Fade factor (between 0 and 1) or unset if there is no fade.
+ */
optional<double>
VideoContent::fade (shared_ptr<const Film> film, Frame f) const
{
--- /dev/null
+/*
+ Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+
+ 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.
+
+ 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 DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "test.h"
+#include "lib/film.h"
+#include "lib/content_factory.h"
+#include "lib/content.h"
+#include "lib/video_content.h"
+#include <boost/test/unit_test.hpp>
+
+using std::string;
+using std::list;
+using boost::shared_ptr;
+
+BOOST_AUTO_TEST_CASE (image_content_fade_test)
+{
+ shared_ptr<Film> film = new_test_film2 ("image_content_fade_test");
+ shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
+ film->examine_and_add_content (content);
+ wait_for_jobs ();
+
+ content->video->set_fade_in (1);
+ film->make_dcp ();
+ wait_for_jobs ();
+
+ check_dcp ("test/data/image_content_fade_test", film->dir(film->dcp_name()));
+}