/*
- Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2016 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 <iomanip>
-#include <libcxml/cxml.h>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
#include "video_content.h"
+#include "content.h"
#include "video_examiner.h"
#include "compose.hpp"
#include "ratio.h"
#include "frame_rate_change.h"
#include "log.h"
#include "safe_stringstream.h"
+#include "raw_convert.h"
+#include <libcxml/cxml.h>
+#include <dcp/colour_matrix.h>
+#include <libxml++/libxml++.h>
+#include <iomanip>
+#include <iostream>
#include "i18n.h"
-#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) _parent->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-int const VideoContentProperty::VIDEO_SIZE = 0;
-int const VideoContentProperty::VIDEO_FRAME_RATE = 1;
-int const VideoContentProperty::VIDEO_FRAME_TYPE = 2;
-int const VideoContentProperty::VIDEO_CROP = 3;
-int const VideoContentProperty::VIDEO_SCALE = 4;
-int const VideoContentProperty::COLOUR_CONVERSION = 5;
+int const VideoContentProperty::SIZE = 0;
+int const VideoContentProperty::FRAME_TYPE = 1;
+int const VideoContentProperty::CROP = 2;
+int const VideoContentProperty::SCALE = 3;
+int const VideoContentProperty::COLOUR_CONVERSION = 4;
+int const VideoContentProperty::FADE_IN = 5;
+int const VideoContentProperty::FADE_OUT = 6;
using std::string;
using std::setprecision;
using std::vector;
using std::min;
using std::max;
+using std::fixed;
+using std::setprecision;
+using std::list;
+using std::pair;
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
-using dcp::raw_convert;
-
-VideoContent::VideoContent (shared_ptr<const Film> f)
- : Content (f)
- , _video_length (0)
- , _video_frame_rate (0)
- , _video_frame_type (VIDEO_FRAME_TYPE_2D)
- , _scale (Config::instance()->default_scale ())
-{
- setup_default_colour_conversion ();
-}
-VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len)
- : Content (f, s)
- , _video_length (len)
- , _video_frame_rate (0)
- , _video_frame_type (VIDEO_FRAME_TYPE_2D)
- , _scale (Config::instance()->default_scale ())
+VideoContent::VideoContent (Content* parent)
+ : ContentPart (parent)
+ , _length (0)
+ , _frame_type (VIDEO_FRAME_TYPE_2D)
+ , _scale (VideoContentScale (Ratio::from_id ("178")))
+ , _yuv (true)
+ , _fade_in (0)
+ , _fade_out (0)
{
- setup_default_colour_conversion ();
+
}
-VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
- : Content (f, p)
- , _video_length (0)
- , _video_frame_rate (0)
- , _video_frame_type (VIDEO_FRAME_TYPE_2D)
- , _scale (Config::instance()->default_scale ())
+shared_ptr<VideoContent>
+VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
{
- setup_default_colour_conversion ();
+ if (!node->optional_number_child<int> ("VideoWidth")) {
+ return shared_ptr<VideoContent> ();
+ }
+
+ return shared_ptr<VideoContent> (new VideoContent (parent, node, version));
}
-VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
- : Content (f, node)
+VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version)
+ : ContentPart (parent)
{
- _video_size.width = node->number_child<int> ("VideoWidth");
- _video_size.height = node->number_child<int> ("VideoHeight");
- _video_frame_rate = node->number_child<float> ("VideoFrameRate");
+ _size.width = node->number_child<int> ("VideoWidth");
+ _size.height = node->number_child<int> ("VideoHeight");
- if (version < 32) {
- /* DCP-o-matic 1.0 branch */
- _video_length = ContentTime::from_frames (node->number_child<int64_t> ("VideoLength"), _video_frame_rate);
- } else {
- _video_length = ContentTime (node->number_child<ContentTime::Type> ("VideoLength"));
+ /* Backwards compatibility */
+ optional<double> r = node->optional_number_child<double>("VideoFrameRate");
+ if (r) {
+ _parent->set_video_frame_rate (r.get ());
}
-
- _video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
+
+ _length = node->number_child<Frame> ("VideoLength");
+ _frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
+ _sample_aspect_ratio = node->optional_number_child<double> ("SampleAspectRatio");
_crop.left = node->number_child<int> ("LeftCrop");
_crop.right = node->number_child<int> ("RightCrop");
_crop.top = node->number_child<int> ("TopCrop");
} else {
_scale = VideoContentScale (node->node_child ("Scale"));
}
-
- _colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
+
+
+ if (node->optional_node_child ("ColourConversion")) {
+ _colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version);
+ }
+
+ _yuv = node->optional_bool_child("YUV").get_value_or (true);
+
+ if (version >= 32) {
+ _fade_in = node->number_child<Frame> ("FadeIn");
+ _fade_out = node->number_child<Frame> ("FadeOut");
+ } else {
+ _fade_in = _fade_out = 0;
+ }
}
-VideoContent::VideoContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
- : Content (f, c)
- , _video_length (0)
+VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
+ : ContentPart (parent)
+ , _length (0)
+ , _yuv (false)
{
- shared_ptr<VideoContent> ref = dynamic_pointer_cast<VideoContent> (c[0]);
- assert (ref);
+ shared_ptr<VideoContent> ref = c[0]->video;
+ DCPOMATIC_ASSERT (ref);
- for (size_t i = 0; i < c.size(); ++i) {
- shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c[i]);
+ for (size_t i = 1; i < c.size(); ++i) {
- if (vc->video_size() != ref->video_size()) {
+ if (c[i]->video->size() != ref->size()) {
throw JoinError (_("Content to be joined must have the same picture size."));
}
- if (vc->video_frame_rate() != ref->video_frame_rate()) {
- throw JoinError (_("Content to be joined must have the same video frame rate."));
- }
-
- if (vc->video_frame_type() != ref->video_frame_type()) {
+ if (c[i]->video->frame_type() != ref->frame_type()) {
throw JoinError (_("Content to be joined must have the same video frame type."));
}
- if (vc->crop() != ref->crop()) {
+ if (c[i]->video->crop() != ref->crop()) {
throw JoinError (_("Content to be joined must have the same crop."));
}
- if (vc->scale() != ref->scale()) {
+ if (c[i]->video->scale() != ref->scale()) {
throw JoinError (_("Content to be joined must have the same scale setting."));
}
- if (vc->colour_conversion() != ref->colour_conversion()) {
+ if (c[i]->video->colour_conversion() != ref->colour_conversion()) {
throw JoinError (_("Content to be joined must have the same colour conversion."));
}
- _video_length += vc->video_length ();
+ if (c[i]->video->fade_in() != ref->fade_in() || c[i]->video->fade_out() != ref->fade_out()) {
+ throw JoinError (_("Content to be joined must have the same fades."));
+ }
+
+ _length += c[i]->video->length ();
+
+ if (c[i]->video->yuv ()) {
+ _yuv = true;
+ }
}
- _video_size = ref->video_size ();
- _video_frame_rate = ref->video_frame_rate ();
- _video_frame_type = ref->video_frame_type ();
+ _size = ref->size ();
+ _frame_type = ref->frame_type ();
_crop = ref->crop ();
_scale = ref->scale ();
_colour_conversion = ref->colour_conversion ();
+ _fade_in = ref->fade_in ();
+ _fade_out = ref->fade_out ();
}
void
VideoContent::as_xml (xmlpp::Node* node) const
{
boost::mutex::scoped_lock lm (_mutex);
- node->add_child("VideoLength")->add_child_text (raw_convert<string> (_video_length.get ()));
- node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_video_size.width));
- node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_video_size.height));
- node->add_child("VideoFrameRate")->add_child_text (raw_convert<string> (_video_frame_rate));
- node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_video_frame_type)));
+ node->add_child("VideoLength")->add_child_text (raw_convert<string> (_length));
+ node->add_child("VideoWidth")->add_child_text (raw_convert<string> (_size.width));
+ node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_size.height));
+ node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_frame_type)));
+ if (_sample_aspect_ratio) {
+ node->add_child("SampleAspectRatio")->add_child_text (raw_convert<string> (_sample_aspect_ratio.get ()));
+ }
_crop.as_xml (node);
_scale.as_xml (node->add_child("Scale"));
- _colour_conversion.as_xml (node->add_child("ColourConversion"));
-}
-
-void
-VideoContent::setup_default_colour_conversion ()
-{
- _colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+ if (_colour_conversion) {
+ _colour_conversion.get().as_xml (node->add_child("ColourConversion"));
+ }
+ node->add_child("YUV")->add_child_text (_yuv ? "1" : "0");
+ node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in));
+ node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out));
}
void
-VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
+VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
{
/* These examiner calls could call other content methods which take a lock on the mutex */
dcp::Size const vs = d->video_size ();
- float const vfr = d->video_frame_rate ();
- ContentTime vl = d->video_length ();
+ Frame vl = d->video_length ();
+ optional<double> const ar = d->sample_aspect_ratio ();
+ bool const yuv = d->yuv ();
{
boost::mutex::scoped_lock lm (_mutex);
- _video_size = vs;
- _video_frame_rate = vfr;
- _video_length = vl;
+ _size = vs;
+ _length = vl;
+ _sample_aspect_ratio = ar;
+ _yuv = yuv;
+
+ /* Guess correct scale from size and sample aspect ratio */
+ _scale = VideoContentScale (
+ Ratio::nearest_from_ratio (double (_size.width) * ar.get_value_or (1) / _size.height)
+ );
}
- shared_ptr<const Film> film = _film.lock ();
- assert (film);
- LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate));
-
- signal_changed (VideoContentProperty::VIDEO_SIZE);
- signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
- signal_changed (ContentProperty::LENGTH);
-}
+ LOG_GENERAL ("Video length obtained from header as %1 frames", _length);
+
+ if (d->video_frame_rate()) {
+ _parent->set_video_frame_rate (d->video_frame_rate().get());
+ }
+ _parent->signal_changed (VideoContentProperty::SIZE);
+ _parent->signal_changed (VideoContentProperty::SCALE);
+ _parent->signal_changed (ContentProperty::LENGTH);
+}
+/** @return string which includes everything about how this content looks */
string
-VideoContent::information () const
+VideoContent::identifier () const
{
- if (video_size().width == 0 || video_size().height == 0) {
- return "";
- }
-
SafeStringStream s;
+ s << crop().left
+ << "_" << crop().right
+ << "_" << crop().top
+ << "_" << crop().bottom
+ << "_" << scale().id()
+ << "_" << _fade_in
+ << "_" << _fade_out;
+
+ if (colour_conversion()) {
+ s << "_" << colour_conversion().get().identifier ();
+ }
- s << String::compose (
- _("%1x%2 pixels (%3:1)"),
- video_size().width,
- video_size().height,
- setprecision (3), video_size().ratio ()
- );
-
return s.str ();
}
-void
-VideoContent::set_left_crop (int c)
+string
+VideoContent::technical_summary () const
{
- {
- boost::mutex::scoped_lock lm (_mutex);
-
- if (_crop.left == c) {
- return;
- }
-
- _crop.left = c;
+ string s = String::compose (
+ N_("video: length %1 frames, size %2x%3"),
+ length_after_3d_combine(),
+ size().width,
+ size().height
+ );
+
+ if (sample_aspect_ratio ()) {
+ s += String::compose (N_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
}
-
- signal_changed (VideoContentProperty::VIDEO_CROP);
+
+ return s;
}
-void
-VideoContent::set_right_crop (int c)
+dcp::Size
+VideoContent::size_after_3d_split () const
{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_crop.right == c) {
- return;
- }
-
- _crop.right = c;
+ dcp::Size const s = size ();
+ switch (frame_type ()) {
+ case VIDEO_FRAME_TYPE_2D:
+ case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+ case VIDEO_FRAME_TYPE_3D_LEFT:
+ case VIDEO_FRAME_TYPE_3D_RIGHT:
+ return s;
+ case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+ return dcp::Size (s.width / 2, s.height);
+ case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+ return dcp::Size (s.width, s.height / 2);
}
-
- signal_changed (VideoContentProperty::VIDEO_CROP);
+
+ DCPOMATIC_ASSERT (false);
}
-void
-VideoContent::set_top_crop (int c)
+/** @return Video size after 3D split and crop */
+dcp::Size
+VideoContent::size_after_crop () const
{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_crop.top == c) {
- return;
- }
-
- _crop.top = c;
- }
-
- signal_changed (VideoContentProperty::VIDEO_CROP);
+ return crop().apply (size_after_3d_split ());
}
void
-VideoContent::set_bottom_crop (int c)
+VideoContent::scale_and_crop_to_fit_width ()
{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_crop.bottom == c) {
- return;
- }
-
- _crop.bottom = c;
- }
+ shared_ptr<const Film> film = _parent->film ();
+ set_scale (VideoContentScale (film->container ()));
- signal_changed (VideoContentProperty::VIDEO_CROP);
+ int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width));
+ set_left_crop (0);
+ set_right_crop (0);
+ set_top_crop (crop / 2);
+ set_bottom_crop (crop / 2);
}
void
-VideoContent::set_scale (VideoContentScale s)
+VideoContent::scale_and_crop_to_fit_height ()
{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_scale == s) {
- return;
- }
-
- _scale = s;
- }
+ shared_ptr<const Film> film = _parent->film ();
+ set_scale (VideoContentScale (film->container ()));
- signal_changed (VideoContentProperty::VIDEO_SCALE);
+ int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height));
+ set_left_crop (crop / 2);
+ set_right_crop (crop / 2);
+ set_top_crop (0);
+ set_bottom_crop (0);
}
-/** @return string which includes everything about how this content looks */
-string
-VideoContent::identifier () const
+/** @param f Frame index within the whole (untrimmed) content */
+optional<double>
+VideoContent::fade (Frame f) const
{
- SafeStringStream s;
- s << Content::identifier()
- << "_" << crop().left
- << "_" << crop().right
- << "_" << crop().top
- << "_" << crop().bottom
- << "_" << scale().id()
- << "_" << colour_conversion().identifier ();
+ DCPOMATIC_ASSERT (f >= 0);
- return s.str ();
-}
+ shared_ptr<const Film> film = _parent->film ();
-void
-VideoContent::set_video_frame_type (VideoFrameType t)
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _video_frame_type = t;
+ double const vfr = _parent->active_video_frame_rate ();
+
+ Frame const ts = _parent->trim_start().frames_round(vfr);
+ if ((f - ts) < fade_in()) {
+ return double (f - ts) / fade_in();
+ }
+
+ Frame fade_out_start = length() - _parent->trim_end().frames_round(vfr) - fade_out();
+ if (f >= fade_out_start) {
+ return 1 - double (f - fade_out_start) / fade_out();
}
- signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE);
+ return optional<double> ();
}
string
-VideoContent::technical_summary () const
+VideoContent::processing_description () const
{
- return String::compose (
- "video: length %1, size %2x%3, rate %4",
- video_length_after_3d_combine().seconds(),
- video_size().width,
- video_size().height,
- video_frame_rate()
- );
-}
+ /* stringstream is OK here as this string is just for presentation to the user */
+ SafeStringStream d;
-dcp::Size
-VideoContent::video_size_after_3d_split () const
-{
- dcp::Size const s = video_size ();
- switch (video_frame_type ()) {
- case VIDEO_FRAME_TYPE_2D:
- case VIDEO_FRAME_TYPE_3D_ALTERNATE:
- case VIDEO_FRAME_TYPE_3D_LEFT:
- case VIDEO_FRAME_TYPE_3D_RIGHT:
- return s;
- case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
- return dcp::Size (s.width / 2, s.height);
- case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
- return dcp::Size (s.width, s.height / 2);
+ if (size().width && size().height) {
+ d << String::compose (
+ _("Content video is %1x%2"),
+ size_after_3d_split().width,
+ size_after_3d_split().height
+ );
+
+
+ double ratio = size_after_3d_split().ratio ();
+
+ if (sample_aspect_ratio ()) {
+ d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1";
+ ratio *= sample_aspect_ratio().get ();
+ }
+
+ d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n";
+ }
+
+ if ((crop().left || crop().right || crop().top || crop().bottom) && size() != dcp::Size (0, 0)) {
+ dcp::Size cropped = size_after_crop ();
+ d << String::compose (
+ _("Cropped to %1x%2"),
+ cropped.width, cropped.height
+ );
+
+ d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n";
+ }
+
+ shared_ptr<const Film> film = _parent->film ();
+ dcp::Size const container_size = film->frame_size ();
+ dcp::Size const scaled = scale().size (shared_from_this(), container_size, container_size);
+
+ if (scaled != size_after_crop ()) {
+ d << String::compose (
+ _("Scaled to %1x%2"),
+ scaled.width, scaled.height
+ );
+
+ d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n";
}
- assert (false);
+ if (scaled != container_size) {
+ d << String::compose (
+ _("Padded with black to fit container %1 (%2x%3)"),
+ film->container()->nickname (),
+ container_size.width, container_size.height
+ );
+
+ d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n";
+ }
+
+ return d.str ();
}
void
-VideoContent::set_colour_conversion (ColourConversion c)
+VideoContent::add_properties (list<UserProperty>& p) const
{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _colour_conversion = c;
- }
+ p.push_back (UserProperty (_("Video"), _("Length"), raw_convert<string> (length ()), _("video frames")));
+ p.push_back (UserProperty (_("Video"), _("Size"), raw_convert<string> (size().width) + "x" + raw_convert<string> (size().height)));
+}
- signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+void
+VideoContent::set_length (Frame len)
+{
+ maybe_set (_length, len, ContentProperty::LENGTH);
}
-/** @return Video size after 3D split and crop */
-dcp::Size
-VideoContent::video_size_after_crop () const
+void
+VideoContent::set_left_crop (int c)
{
- return crop().apply (video_size_after_3d_split ());
+ maybe_set (_crop.left, c, VideoContentProperty::CROP);
}
-/** @param t A time offset from the start of this piece of content.
- * @return Corresponding time with respect to the content.
- */
-ContentTime
-VideoContent::dcp_time_to_content_time (DCPTime t) const
+void
+VideoContent::set_right_crop (int c)
{
- shared_ptr<const Film> film = _film.lock ();
- assert (film);
- return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate()));
+ maybe_set (_crop.right, c, VideoContentProperty::CROP);
}
void
-VideoContent::scale_and_crop_to_fit_width ()
+VideoContent::set_top_crop (int c)
{
- shared_ptr<const Film> film = _film.lock ();
- assert (film);
+ maybe_set (_crop.top, c, VideoContentProperty::CROP);
+}
- set_scale (VideoContentScale (film->container ()));
+void
+VideoContent::set_bottom_crop (int c)
+{
+ maybe_set (_crop.bottom, c, VideoContentProperty::CROP);
+}
- int const crop = max (0, int (video_size().height - double (film->frame_size().height) * video_size().width / film->frame_size().width));
- set_top_crop (crop / 2);
- set_bottom_crop (crop / 2);
+void
+VideoContent::set_scale (VideoContentScale s)
+{
+ maybe_set (_scale, s, VideoContentProperty::SCALE);
}
void
-VideoContent::scale_and_crop_to_fit_height ()
+VideoContent::set_frame_type (VideoFrameType t)
{
- shared_ptr<const Film> film = _film.lock ();
- assert (film);
+ maybe_set (_frame_type, t, VideoContentProperty::FRAME_TYPE);
+}
- set_scale (VideoContentScale (film->container ()));
+void
+VideoContent::unset_colour_conversion ()
+{
+ maybe_set (_colour_conversion, boost::optional<ColourConversion> (), VideoContentProperty::COLOUR_CONVERSION);
+}
- int const crop = max (0, int (video_size().width - double (film->frame_size().width) * video_size().height / film->frame_size().height));
- set_left_crop (crop / 2);
- set_right_crop (crop / 2);
+void
+VideoContent::set_colour_conversion (ColourConversion c)
+{
+ maybe_set (_colour_conversion, c, VideoContentProperty::COLOUR_CONVERSION);
}
void
-VideoContent::set_video_frame_rate (float r)
+VideoContent::set_fade_in (Frame t)
{
- {
- boost::mutex::scoped_lock lm (_mutex);
- if (_video_frame_rate == r) {
- return;
- }
-
- _video_frame_rate = r;
- }
-
- signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+ maybe_set (_fade_in, t, VideoContentProperty::FADE_IN);
}
+void
+VideoContent::set_fade_out (Frame t)
+{
+ maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT);
+}
projects / dcpomatic.git / blobdiff