X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=fe35b0df3e800415b097691e59d8bc90e8d315e5;hb=b042118121a27027b94d380ea4788e03ed1a9944;hp=4f1b08016ae7c438da59e10a9204d284408abe2f;hpb=b81241ce69a689629307832f802ac4faa6ed885f;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 4f1b08016..fe35b0df3 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -30,17 +30,15 @@ #include "exceptions.h" #include "frame_rate_change.h" #include "log.h" +#include "dcpomatic_log.h" #include #include -#include #include #include #include #include "i18n.h" -#define LOG_GENERAL(...) _parent->film()->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); - int const VideoContentProperty::SIZE = 0; int const VideoContentProperty::FRAME_TYPE = 1; int const VideoContentProperty::CROP = 2; @@ -141,7 +139,6 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio _scale = VideoContentScale (node->node_child ("Scale")); } - if (node->optional_node_child ("ColourConversion")) { _colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version); } @@ -236,6 +233,10 @@ VideoContent::take_from_examiner (shared_ptr d) optional const ar = d->sample_aspect_ratio (); bool const yuv = d->yuv (); + ChangeSignaller cc1 (_parent, VideoContentProperty::SIZE); + ChangeSignaller cc2 (_parent, VideoContentProperty::SCALE); + ChangeSignaller cc3 (_parent, ContentProperty::LENGTH); + { boost::mutex::scoped_lock lm (_mutex); _size = vs; @@ -243,10 +244,14 @@ VideoContent::take_from_examiner (shared_ptr d) _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) - ); + if (Config::instance()->default_scale_to ()) { + _scale = VideoContentScale (Config::instance()->default_scale_to ()); + } else { + /* 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) + ); + } } LOG_GENERAL ("Video length obtained from header as %1 frames", _length); @@ -254,10 +259,6 @@ VideoContent::take_from_examiner (shared_ptr d) 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 */ @@ -330,10 +331,9 @@ VideoContent::size_after_crop () const } void -VideoContent::scale_and_crop_to_fit_width () +VideoContent::scale_and_crop_to_fit_width (shared_ptr film) { - shared_ptr film = _parent->film (); - set_scale (VideoContentScale (film->container ())); + set_scale (VideoContentScale(film->container())); int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width)); set_left_crop (0); @@ -343,10 +343,9 @@ VideoContent::scale_and_crop_to_fit_width () } void -VideoContent::scale_and_crop_to_fit_height () +VideoContent::scale_and_crop_to_fit_height (shared_ptr film) { - shared_ptr film = _parent->film (); - set_scale (VideoContentScale (film->container ())); + set_scale (VideoContentScale(film->container())); int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height)); set_left_crop (crop / 2); @@ -355,15 +354,15 @@ VideoContent::scale_and_crop_to_fit_height () 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 -VideoContent::fade (Frame f) const +VideoContent::fade (shared_ptr film, Frame f) const { DCPOMATIC_ASSERT (f >= 0); - shared_ptr film = _parent->film (); - - double const vfr = _parent->active_video_frame_rate (); + double const vfr = _parent->active_video_frame_rate(film); Frame const ts = _parent->trim_start().frames_round(vfr); if ((f - ts) < fade_in()) { @@ -379,7 +378,7 @@ VideoContent::fade (Frame f) const } string -VideoContent::processing_description () const +VideoContent::processing_description (shared_ptr film) const { string d; char buffer[256]; @@ -407,47 +406,46 @@ VideoContent::processing_description () const 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"), + _("\nCropped to %1x%2"), cropped.width, cropped.height ); - snprintf (buffer, sizeof(buffer), " (%.2f:1)\n", cropped.ratio()); + snprintf (buffer, sizeof(buffer), " (%.2f:1)", cropped.ratio()); d += buffer; } - shared_ptr 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"), + _("\nScaled to %1x%2"), scaled.width, scaled.height ); - snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), scaled.ratio()); + snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), scaled.ratio()); d += buffer; } if (scaled != container_size) { d += String::compose ( - _("Padded with black to fit container %1 (%2x%3)"), - film->container()->nickname (), + _("\nPadded with black to fit container %1 (%2x%3)"), + film->container()->container_nickname (), container_size.width, container_size.height ); - snprintf (buffer, sizeof(buffer), _(" (%.2f:1)\n"), container_size.ratio()); + snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), container_size.ratio()); d += buffer; } if (_parent->video_frame_rate()) { double const vfr = _parent->video_frame_rate().get (); - snprintf (buffer, sizeof(buffer), _("Content frame rate %.4f\n"), vfr); + snprintf (buffer, sizeof(buffer), _("\nContent frame rate %.4f\n"), vfr); d += buffer; FrameRateChange frc (vfr, film->video_frame_rate ()); - d += frc.description () + "\n"; + d += frc.description (); } return d; @@ -457,7 +455,7 @@ void VideoContent::add_properties (list& p) const { p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), length (), _("video frames"))); - p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), size().width + "x" + size().height)); + p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), String::compose ("%1x%2", size().width, size().height))); } void @@ -525,3 +523,35 @@ VideoContent::set_fade_out (Frame t) { maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT); } + +void +VideoContent::take_settings_from (shared_ptr c) +{ + if (c->_colour_conversion) { + set_colour_conversion (c->_colour_conversion.get()); + } else { + unset_colour_conversion (); + } + set_frame_type (c->_frame_type); + set_left_crop (c->_crop.left); + set_right_crop (c->_crop.right); + set_top_crop (c->_crop.top); + set_bottom_crop (c->_crop.bottom); + set_scale (c->_scale); + set_fade_in (c->_fade_in); + set_fade_out (c->_fade_out); +} + +void +VideoContent::modify_position (shared_ptr film, DCPTime& pos) const +{ + pos = pos.round (film->video_frame_rate()); +} + +void +VideoContent::modify_trim_start (ContentTime& trim) const +{ + if (_parent->video_frame_rate()) { + trim = trim.round (_parent->video_frame_rate().get()); + } +}