X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=1c0bc5a60d045f758a17cf1948decf3dc1aa71c5;hb=4a4725e41bf4070969223f9c40885063c50e61d0;hp=442ee703c01204d8e805fef786bde33dfee4ae3e;hpb=8041bb9729662176eeb8d78ce4dac9dfb6896557;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 442ee703c..1c0bc5a60 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -56,56 +56,57 @@ using std::max; using std::stringstream; using std::fixed; using std::setprecision; +using std::list; +using std::pair; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -VideoContent::VideoContent (shared_ptr f) - : Content (f) +VideoContent::VideoContent (shared_ptr film) + : Content (film) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) , _scale (VideoContentScale (Ratio::from_id ("178"))) + , _fade_in (0) + , _fade_out (0) { set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, DCPTime s, ContentTime len) - : Content (f, s) +VideoContent::VideoContent (shared_ptr film, DCPTime s, Frame len) + : Content (film, s) , _video_length (len) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) , _scale (VideoContentScale (Ratio::from_id ("178"))) + , _fade_in (0) + , _fade_out (0) { set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) - : Content (f, p) +VideoContent::VideoContent (shared_ptr film, boost::filesystem::path p) + : Content (film, p) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) , _scale (VideoContentScale (Ratio::from_id ("178"))) + , _fade_in (0) + , _fade_out (0) { set_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, int version) - : Content (f, node) +VideoContent::VideoContent (shared_ptr film, cxml::ConstNodePtr node, int version) + : Content (film, node) { _video_size.width = node->number_child ("VideoWidth"); _video_size.height = node->number_child ("VideoHeight"); - _video_frame_rate = node->number_child ("VideoFrameRate"); - - if (version < 32) { - /* DCP-o-matic 1.0 branch */ - _video_length = ContentTime::from_frames (node->number_child ("VideoLength"), _video_frame_rate); - } else { - _video_length = ContentTime (node->number_child ("VideoLength")); - } - + _video_frame_rate = node->number_child ("VideoFrameRate"); + _video_length = node->number_child ("VideoLength"); _video_frame_type = static_cast (node->number_child ("VideoFrameType")); - _sample_aspect_ratio = node->optional_number_child ("SampleAspectRatio"); + _sample_aspect_ratio = node->optional_number_child ("SampleAspectRatio"); _crop.left = node->number_child ("LeftCrop"); _crop.right = node->number_child ("RightCrop"); _crop.top = node->number_child ("TopCrop"); @@ -120,18 +121,20 @@ VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, i _scale = VideoContentScale (node->node_child ("Scale")); } - + if (node->optional_node_child ("ColourConversion")) { _colour_conversion = ColourConversion (node->node_child ("ColourConversion"), version); } if (version >= 32) { - _fade_in = ContentTime (node->number_child ("FadeIn")); - _fade_out = ContentTime (node->number_child ("FadeOut")); + _fade_in = node->number_child ("FadeIn"); + _fade_out = node->number_child ("FadeOut"); + } else { + _fade_in = _fade_out = 0; } } -VideoContent::VideoContent (shared_ptr f, vector > c) - : Content (f, c) +VideoContent::VideoContent (shared_ptr film, vector > c) + : Content (film, c) , _video_length (0) { shared_ptr ref = dynamic_pointer_cast (c[0]); @@ -167,7 +170,7 @@ VideoContent::VideoContent (shared_ptr f, vector if (vc->fade_in() != ref->fade_in() || vc->fade_out() != ref->fade_out()) { throw JoinError (_("Content to be joined must have the same fades.")); } - + _video_length += vc->video_length (); } @@ -185,7 +188,7 @@ void VideoContent::as_xml (xmlpp::Node* node) const { boost::mutex::scoped_lock lm (_mutex); - node->add_child("VideoLength")->add_child_text (raw_convert (_video_length.get ())); + node->add_child("VideoLength")->add_child_text (raw_convert (_video_length)); node->add_child("VideoWidth")->add_child_text (raw_convert (_video_size.width)); node->add_child("VideoHeight")->add_child_text (raw_convert (_video_size.height)); node->add_child("VideoFrameRate")->add_child_text (raw_convert (_video_frame_rate)); @@ -198,15 +201,16 @@ VideoContent::as_xml (xmlpp::Node* node) const if (_colour_conversion) { _colour_conversion.get().as_xml (node->add_child("ColourConversion")); } - node->add_child("FadeIn")->add_child_text (raw_convert (_fade_in.get ())); - node->add_child("FadeOut")->add_child_text (raw_convert (_fade_out.get ())); + node->add_child("FadeIn")->add_child_text (raw_convert (_fade_in)); + node->add_child("FadeOut")->add_child_text (raw_convert (_fade_out)); } void VideoContent::set_default_colour_conversion () { + /* If there's no better offer we'll use Rec. 709 */ boost::mutex::scoped_lock lm (_mutex); - _colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz ()); + _colour_conversion = PresetColourConversion::from_id ("rec709").conversion; } void @@ -214,9 +218,9 @@ VideoContent::take_from_video_examiner (shared_ptr d) { /* These examiner calls could call other content methods which take a lock on the mutex */ dcp::Size const vs = d->video_size (); - optional const vfr = d->video_frame_rate (); - ContentTime vl = d->video_length (); - optional const ar = d->sample_aspect_ratio (); + optional const vfr = d->video_frame_rate (); + Frame vl = d->video_length (); + optional const ar = d->sample_aspect_ratio (); { boost::mutex::scoped_lock lm (_mutex); @@ -228,14 +232,16 @@ VideoContent::take_from_video_examiner (shared_ptr d) /* Guess correct scale from size and sample aspect ratio */ _scale = VideoContentScale ( - Ratio::nearest_from_ratio (float (_video_size.width) * ar.get_value_or (1) / _video_size.height) + Ratio::nearest_from_ratio (double (_video_size.width) * ar.get_value_or (1) / _video_size.height) ); } shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate)); - + LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length); + + set_default_colour_conversion (); + signal_changed (VideoContentProperty::VIDEO_SIZE); signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); signal_changed (VideoContentProperty::VIDEO_SCALE); @@ -247,14 +253,14 @@ VideoContent::set_left_crop (int c) { { boost::mutex::scoped_lock lm (_mutex); - + if (_crop.left == c) { return; } - + _crop.left = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -266,10 +272,10 @@ VideoContent::set_right_crop (int c) if (_crop.right == c) { return; } - + _crop.right = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -281,10 +287,10 @@ VideoContent::set_top_crop (int c) if (_crop.top == c) { return; } - + _crop.top = c; } - + signal_changed (VideoContentProperty::VIDEO_CROP); } @@ -296,7 +302,7 @@ VideoContent::set_bottom_crop (int c) if (_crop.bottom == c) { return; } - + _crop.bottom = c; } @@ -328,7 +334,9 @@ VideoContent::identifier () const << "_" << crop().right << "_" << crop().top << "_" << crop().bottom - << "_" << scale().id(); + << "_" << scale().id() + << "_" << _fade_in + << "_" << _fade_out; if (colour_conversion()) { s << "_" << colour_conversion().get().identifier (); @@ -352,8 +360,8 @@ string VideoContent::technical_summary () const { string s = String::compose ( - N_("video: length %1, size %2x%3, rate %4"), - video_length_after_3d_combine().seconds(), + N_("video: length %1 frames, size %2x%3, rate %4"), + video_length_after_3d_combine(), video_size().width, video_size().height, video_frame_rate() @@ -410,7 +418,7 @@ VideoContent::set_colour_conversion (ColourConversion c) } void -VideoContent::set_fade_in (ContentTime t) +VideoContent::set_fade_in (Frame t) { { boost::mutex::scoped_lock lm (_mutex); @@ -421,7 +429,7 @@ VideoContent::set_fade_in (ContentTime t) } void -VideoContent::set_fade_out (ContentTime t) +VideoContent::set_fade_out (Frame t) { { boost::mutex::scoped_lock lm (_mutex); @@ -465,35 +473,35 @@ VideoContent::scale_and_crop_to_fit_height () } void -VideoContent::set_video_frame_rate (float r) +VideoContent::set_video_frame_rate (double r) { { boost::mutex::scoped_lock lm (_mutex); if (_video_frame_rate == r) { return; } - + _video_frame_rate = r; } - + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } -optional -VideoContent::fade (VideoFrame f) const +optional +VideoContent::fade (Frame f) const { DCPOMATIC_ASSERT (f >= 0); - - if (f < fade_in().frames (video_frame_rate ())) { - return float (f) / _fade_in.frames (video_frame_rate ()); + + if (f < fade_in()) { + return double (f) / fade_in(); } - VideoFrame fade_out_start = ContentTime (video_length() - fade_out()).frames (video_frame_rate ()); + Frame fade_out_start = video_length() - fade_out(); if (f >= fade_out_start) { - return 1 - float (f - fade_out_start) / fade_out().frames (video_frame_rate ()); + return 1 - double (f - fade_out_start) / fade_out(); } - return optional (); + return optional (); } string @@ -510,7 +518,7 @@ VideoContent::processing_description () const ); - float ratio = video_size_after_3d_split().ratio (); + double ratio = video_size_after_3d_split().ratio (); if (sample_aspect_ratio ()) { d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1"; @@ -544,10 +552,11 @@ VideoContent::processing_description () const d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; } - + if (scaled != container_size) { d << String::compose ( - _("Padded with black to %1x%2"), + _("Padded with black to fit container %1 (%2x%3)"), + film->container()->nickname (), container_size.width, container_size.height ); @@ -556,10 +565,17 @@ VideoContent::processing_description () const d << _("Content frame rate"); d << " " << fixed << setprecision(4) << video_frame_rate() << "\n"; - + FrameRateChange frc (video_frame_rate(), film->video_frame_rate ()); d << frc.description () << "\n"; return d.str (); } +void +VideoContent::add_properties (list >& p) const +{ + p.push_back (make_pair (_("Video length"), raw_convert (video_length ()) + " " + _("video frames"))); + p.push_back (make_pair (_("Video size"), raw_convert (video_size().width) + "x" + raw_convert (video_size().height))); + p.push_back (make_pair (_("Video frame rate"), raw_convert (video_frame_rate()) + " " + _("frames per second"))); +}