X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=ed14026087beacc25ac4e71df52f58bb97417df1;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=ff5a4cb17a1a976e1a0106e509da3777c4195309;hpb=19f94521139aac13ef8fb4eaa55855b2ada307b4;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index ff5a4cb17..ed1402608 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2016 Carl Hetherington - 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 . */ @@ -29,8 +30,7 @@ #include "exceptions.h" #include "frame_rate_change.h" #include "log.h" -#include "safe_stringstream.h" -#include "raw_convert.h" +#include #include #include #include @@ -39,7 +39,7 @@ #include "i18n.h" -#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); +#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; @@ -62,9 +62,10 @@ using std::pair; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; +using dcp::raw_convert; -VideoContent::VideoContent (Content* parent, shared_ptr film) - : ContentPart (parent, film) +VideoContent::VideoContent (Content* parent) + : ContentPart (parent) , _length (0) , _frame_type (VIDEO_FRAME_TYPE_2D) , _scale (VideoContentScale (Ratio::from_id ("178"))) @@ -75,8 +76,18 @@ VideoContent::VideoContent (Content* parent, shared_ptr film) } -VideoContent::VideoContent (Content* parent, shared_ptr film, cxml::ConstNodePtr node, int version) - : ContentPart (parent, film) +shared_ptr +VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) +{ + if (!node->optional_number_child ("VideoWidth")) { + return shared_ptr (); + } + + return shared_ptr (new VideoContent (parent, node, version)); +} + +VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version) + : ContentPart (parent) { _size.width = node->number_child ("VideoWidth"); _size.height = node->number_child ("VideoHeight"); @@ -88,7 +99,33 @@ VideoContent::VideoContent (Content* parent, shared_ptr film, cxml:: } _length = node->number_child ("VideoLength"); - _frame_type = static_cast (node->number_child ("VideoFrameType")); + + if (version <= 34) { + /* Snapshot of the VideoFrameType enum at version 34 */ + switch (node->number_child ("VideoFrameType")) { + case 0: + _frame_type = VIDEO_FRAME_TYPE_2D; + break; + case 1: + _frame_type = VIDEO_FRAME_TYPE_3D_LEFT_RIGHT; + break; + case 2: + _frame_type = VIDEO_FRAME_TYPE_3D_TOP_BOTTOM; + break; + case 3: + _frame_type = VIDEO_FRAME_TYPE_3D_ALTERNATE; + break; + case 4: + _frame_type = VIDEO_FRAME_TYPE_3D_LEFT; + break; + case 5: + _frame_type = VIDEO_FRAME_TYPE_3D_RIGHT; + break; + } + } else { + _frame_type = string_to_video_frame_type (node->string_child ("VideoFrameType")); + } + _sample_aspect_ratio = node->optional_number_child ("SampleAspectRatio"); _crop.left = node->number_child ("LeftCrop"); _crop.right = node->number_child ("RightCrop"); @@ -119,8 +156,8 @@ VideoContent::VideoContent (Content* parent, shared_ptr film, cxml:: } } -VideoContent::VideoContent (Content* parent, shared_ptr film, vector > c) - : ContentPart (parent, film) +VideoContent::VideoContent (Content* parent, vector > c) + : ContentPart (parent) , _length (0) , _yuv (false) { @@ -176,7 +213,7 @@ VideoContent::as_xml (xmlpp::Node* node) const node->add_child("VideoLength")->add_child_text (raw_convert (_length)); node->add_child("VideoWidth")->add_child_text (raw_convert (_size.width)); node->add_child("VideoHeight")->add_child_text (raw_convert (_size.height)); - node->add_child("VideoFrameType")->add_child_text (raw_convert (static_cast (_frame_type))); + node->add_child("VideoFrameType")->add_child_text (video_frame_type_to_string (_frame_type)); if (_sample_aspect_ratio) { node->add_child("SampleAspectRatio")->add_child_text (raw_convert (_sample_aspect_ratio.get ())); } @@ -212,8 +249,6 @@ VideoContent::take_from_examiner (shared_ptr d) ); } - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); LOG_GENERAL ("Video length obtained from header as %1 frames", _length); if (d->video_frame_rate()) { @@ -229,20 +264,25 @@ VideoContent::take_from_examiner (shared_ptr d) string VideoContent::identifier () const { - SafeStringStream s; - s << crop().left - << "_" << crop().right - << "_" << crop().top - << "_" << crop().bottom - << "_" << scale().id() - << "_" << _fade_in - << "_" << _fade_out; + char buffer[256]; + snprintf ( + buffer, sizeof(buffer), "%d_%d_%d_%d_%s_%" PRId64 "_%" PRId64, + crop().left, + crop().right, + crop().top, + crop().bottom, + scale().id().c_str(), + _fade_in, + _fade_out + ); + + string s (buffer); if (colour_conversion()) { - s << "_" << colour_conversion().get().identifier (); + s += "_" + colour_conversion().get().identifier (); } - return s.str (); + return s; } string @@ -268,6 +308,7 @@ VideoContent::size_after_3d_split () const dcp::Size const s = size (); switch (frame_type ()) { case VIDEO_FRAME_TYPE_2D: + case VIDEO_FRAME_TYPE_3D: case VIDEO_FRAME_TYPE_3D_ALTERNATE: case VIDEO_FRAME_TYPE_3D_LEFT: case VIDEO_FRAME_TYPE_3D_RIGHT: @@ -291,8 +332,7 @@ VideoContent::size_after_crop () const void VideoContent::scale_and_crop_to_fit_width () { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + shared_ptr film = _parent->film (); set_scale (VideoContentScale (film->container ())); int const crop = max (0, int (size().height - double (film->frame_size().height) * size().width / film->frame_size().width)); @@ -305,8 +345,7 @@ VideoContent::scale_and_crop_to_fit_width () void VideoContent::scale_and_crop_to_fit_height () { - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + shared_ptr film = _parent->film (); set_scale (VideoContentScale (film->container ())); int const crop = max (0, int (size().width - double (film->frame_size().width) * size().height / film->frame_size().height)); @@ -322,8 +361,7 @@ VideoContent::fade (Frame f) const { DCPOMATIC_ASSERT (f >= 0); - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + shared_ptr film = _parent->film (); double const vfr = _parent->active_video_frame_rate (); @@ -343,11 +381,11 @@ VideoContent::fade (Frame f) const string VideoContent::processing_description () const { - /* stringstream is OK here as this string is just for presentation to the user */ - SafeStringStream d; + string d; + char buffer[256]; if (size().width && size().height) { - d << String::compose ( + d += String::compose ( _("Content video is %1x%2"), size_after_3d_split().width, size_after_3d_split().height @@ -357,55 +395,69 @@ VideoContent::processing_description () const double ratio = size_after_3d_split().ratio (); if (sample_aspect_ratio ()) { - d << ", " << _("pixel aspect ratio") << " " << fixed << setprecision(2) << sample_aspect_ratio().get () << ":1"; + snprintf (buffer, sizeof(buffer), _(", pixel aspect ratio %.2f:1"), sample_aspect_ratio().get()); + d += buffer; ratio *= sample_aspect_ratio().get (); } - d << "\n" << _("Display aspect ratio") << " " << fixed << setprecision(2) << ratio << ":1\n"; + snprintf (buffer, sizeof(buffer), _("\nDisplay aspect ratio %.2f:1"), ratio); + d += buffer; } 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"), + d += String::compose ( + _("\nCropped to %1x%2"), cropped.width, cropped.height ); - d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n"; + snprintf (buffer, sizeof(buffer), " (%.2f:1)", cropped.ratio()); + d += buffer; } - shared_ptr film = _film.lock (); - DCPOMATIC_ASSERT (film); + 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"), + d += String::compose ( + _("\nScaled to %1x%2"), scaled.width, scaled.height ); - d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; + 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)"), + d += String::compose ( + _("\nPadded 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"; + snprintf (buffer, sizeof(buffer), _(" (%.2f:1)"), container_size.ratio()); + d += buffer; } - return d.str (); + if (_parent->video_frame_rate()) { + double const vfr = _parent->video_frame_rate().get (); + + snprintf (buffer, sizeof(buffer), _("\nContent frame rate %.4f\n"), vfr); + d += buffer; + + FrameRateChange frc (vfr, film->video_frame_rate ()); + d += frc.description (); + } + + return d; } void VideoContent::add_properties (list& p) const { - p.push_back (UserProperty (_("Video"), _("Length"), raw_convert (length ()), _("video frames"))); - p.push_back (UserProperty (_("Video"), _("Size"), raw_convert (size().width) + "x" + raw_convert (size().height))); + p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), length (), _("video frames"))); + p.push_back (UserProperty (UserProperty::VIDEO, _("Size"), size().width + "x" + size().height)); } void @@ -473,3 +525,14 @@ VideoContent::set_fade_out (Frame t) { maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT); } + +void +VideoContent::use_template (shared_ptr c) +{ + _colour_conversion = c->_colour_conversion; + _frame_type = c->_frame_type; + _crop = c->_crop; + _scale = c->_scale; + _fade_in = c->_fade_in; + _fade_out = c->_fade_out; +}