X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=fe35b0df3e800415b097691e59d8bc90e8d315e5;hb=4285355ff2bec853924647f0523d121860fe64e3;hp=0dba555251465b1b77ed5af9326f3b0246c52a5e;hpb=bd5e8b83a3a18787241982efdae809d4db21f65d;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 0dba55525..fe35b0df3 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington This file is part of DCP-o-matic. @@ -30,6 +30,7 @@ #include "exceptions.h" #include "frame_rate_change.h" #include "log.h" +#include "dcpomatic_log.h" #include #include #include @@ -38,8 +39,6 @@ #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; @@ -154,6 +153,56 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio } } +VideoContent::VideoContent (Content* parent, vector > c) + : ContentPart (parent) + , _length (0) + , _yuv (false) +{ + shared_ptr ref = c[0]->video; + DCPOMATIC_ASSERT (ref); + + for (size_t i = 1; i < c.size(); ++i) { + + if (c[i]->video->size() != ref->size()) { + throw JoinError (_("Content to be joined must have the same picture size.")); + } + + if (c[i]->video->frame_type() != ref->frame_type()) { + throw JoinError (_("Content to be joined must have the same video frame type.")); + } + + if (c[i]->video->crop() != ref->crop()) { + throw JoinError (_("Content to be joined must have the same crop.")); + } + + if (c[i]->video->scale() != ref->scale()) { + throw JoinError (_("Content to be joined must have the same scale setting.")); + } + + if (c[i]->video->colour_conversion() != ref->colour_conversion()) { + throw JoinError (_("Content to be joined must have the same colour conversion.")); + } + + 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; + } + } + + _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 { @@ -184,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; @@ -206,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 */ @@ -282,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); @@ -295,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); @@ -307,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()) { @@ -331,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]; @@ -367,7 +414,6 @@ VideoContent::processing_description () const 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); @@ -497,9 +543,9 @@ VideoContent::take_settings_from (shared_ptr c) } void -VideoContent::modify_position (DCPTime& pos) const +VideoContent::modify_position (shared_ptr film, DCPTime& pos) const { - pos = pos.round (_parent->film()->video_frame_rate()); + pos = pos.round (film->video_frame_rate()); } void