X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=d4e814624de8c949a9cd790de392fa536a4986ba;hb=249ae25148213a2ab5d76980133182e7f2521524;hp=a59e9669d62de990b6f4b9359476ee17bededcb4;hpb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index a59e9669d..d4e814624 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -30,10 +30,8 @@ #include "exceptions.h" #include "frame_rate_change.h" #include "log.h" -#include "safe_stringstream.h" -#include "raw_convert.h" +#include #include -#include #include #include #include @@ -63,6 +61,7 @@ using std::pair; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; +using dcp::raw_convert; VideoContent::VideoContent (Content* parent) : ContentPart (parent) @@ -141,7 +140,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); } @@ -243,10 +241,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); @@ -264,20 +266,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 @@ -376,11 +383,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 @@ -390,21 +397,24 @@ 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 = _parent->film (); @@ -412,42 +422,44 @@ VideoContent::processing_description () const 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)"), - film->container()->nickname (), + d += String::compose ( + _("\nPadded with black to fit container %1 (%2x%3)"), + film->container()->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; } if (_parent->video_frame_rate()) { double const vfr = _parent->video_frame_rate().get (); - d << _("Content frame rate"); - d << " " << fixed << setprecision(4) << vfr << "\n"; + 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.str (); + return d; } void VideoContent::add_properties (list& p) const { - p.push_back (UserProperty (UserProperty::VIDEO, _("Length"), raw_convert (length ()), _("video frames"))); - p.push_back (UserProperty (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"), String::compose ("%1x%2", size().width, size().height))); } void @@ -515,3 +527,28 @@ VideoContent::set_fade_out (Frame t) { maybe_set (_fade_out, t, VideoContentProperty::FADE_OUT); } + +void +VideoContent::take_settings_from (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; +} + +void +VideoContent::modify_position (DCPTime& pos) const +{ + pos = pos.ceil (_parent->film()->video_frame_rate()); +} + +void +VideoContent::modify_trim_start (ContentTime& trim) const +{ + if (_parent->video_frame_rate()) { + trim = trim.ceil (_parent->video_frame_rate().get()); + } +}