X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=9822d77634c659a583de5314a4904032da104ec4;hb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a;hp=5864342a265c0fc873c302490acb3191f8f251bd;hpb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 5864342a2..9822d7763 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include "video_content.h" #include "video_examiner.h" #include "compose.hpp" @@ -29,9 +30,14 @@ #include "util.h" #include "film.h" #include "exceptions.h" +#include "frame_rate_change.h" +#include "log.h" +#include "safe_stringstream.h" #include "i18n.h" +#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); + int const VideoContentProperty::VIDEO_SIZE = 0; int const VideoContentProperty::VIDEO_FRAME_RATE = 1; int const VideoContentProperty::VIDEO_FRAME_TYPE = 2; @@ -40,14 +46,15 @@ int const VideoContentProperty::VIDEO_SCALE = 4; int const VideoContentProperty::COLOUR_CONVERSION = 5; using std::string; -using std::stringstream; using std::setprecision; using std::cout; using std::vector; +using std::min; +using std::max; using boost::shared_ptr; -using boost::lexical_cast; using boost::optional; using boost::dynamic_pointer_cast; +using dcp::raw_convert; vector VideoContentScale::_scales; @@ -56,7 +63,7 @@ VideoContent::VideoContent (shared_ptr f) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Ratio::from_id ("185")) + , _scale (Config::instance()->default_scale ()) { setup_default_colour_conversion (); } @@ -66,7 +73,7 @@ VideoContent::VideoContent (shared_ptr f, DCPTime s, ContentTime len , _video_length (len) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Ratio::from_id ("185")) + , _scale (Config::instance()->default_scale ()) { setup_default_colour_conversion (); } @@ -76,18 +83,25 @@ VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Ratio::from_id ("185")) + , _scale (Config::instance()->default_scale ()) { setup_default_colour_conversion (); } -VideoContent::VideoContent (shared_ptr f, shared_ptr node, int version) +VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, int version) : Content (f, node) { - _video_length = ContentTime (node->number_child ("VideoLength")); _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_type = static_cast (node->number_child ("VideoFrameType")); _crop.left = node->number_child ("LeftCrop"); _crop.right = node->number_child ("RightCrop"); @@ -155,15 +169,12 @@ void VideoContent::as_xml (xmlpp::Node* node) const { boost::mutex::scoped_lock lm (_mutex); - node->add_child("VideoLength")->add_child_text (lexical_cast (_video_length.get ())); - node->add_child("VideoWidth")->add_child_text (lexical_cast (_video_size.width)); - node->add_child("VideoHeight")->add_child_text (lexical_cast (_video_size.height)); - node->add_child("VideoFrameRate")->add_child_text (lexical_cast (_video_frame_rate)); - node->add_child("VideoFrameType")->add_child_text (lexical_cast (static_cast (_video_frame_type))); - node->add_child("LeftCrop")->add_child_text (boost::lexical_cast (_crop.left)); - node->add_child("RightCrop")->add_child_text (boost::lexical_cast (_crop.right)); - node->add_child("TopCrop")->add_child_text (boost::lexical_cast (_crop.top)); - node->add_child("BottomCrop")->add_child_text (boost::lexical_cast (_crop.bottom)); + node->add_child("VideoLength")->add_child_text (raw_convert (_video_length.get ())); + 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)); + node->add_child("VideoFrameType")->add_child_text (raw_convert (static_cast (_video_frame_type))); + _crop.as_xml (node); _scale.as_xml (node->add_child("Scale")); _colour_conversion.as_xml (node->add_child("ColourConversion")); } @@ -180,15 +191,22 @@ 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 (); float const vfr = d->video_frame_rate (); - + ContentTime vl = d->video_length (); + { boost::mutex::scoped_lock lm (_mutex); _video_size = vs; _video_frame_rate = vfr; + _video_length = vl; } + + shared_ptr film = _film.lock (); + assert (film); + LOG_GENERAL ("Video length obtained from header as %1 frames", _video_length.frames (_video_frame_rate)); signal_changed (VideoContentProperty::VIDEO_SIZE); signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); + signal_changed (ContentProperty::LENGTH); } @@ -199,7 +217,7 @@ VideoContent::information () const return ""; } - stringstream s; + SafeStringStream s; s << String::compose ( _("%1x%2 pixels (%3:1)"), @@ -291,7 +309,7 @@ VideoContent::set_scale (VideoContentScale s) string VideoContent::identifier () const { - stringstream s; + SafeStringStream s; s << Content::identifier() << "_" << crop().left << "_" << crop().right @@ -333,6 +351,8 @@ VideoContent::video_size_after_3d_split () const switch (video_frame_type ()) { case VIDEO_FRAME_TYPE_2D: case VIDEO_FRAME_TYPE_3D_ALTERNATE: + case VIDEO_FRAME_TYPE_3D_LEFT: + case VIDEO_FRAME_TYPE_3D_RIGHT: return s; case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: return dcp::Size (s.width / 2, s.height); @@ -372,6 +392,47 @@ VideoContent::dcp_time_to_content_time (DCPTime t) const return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate())); } +void +VideoContent::scale_and_crop_to_fit_width () +{ + shared_ptr film = _film.lock (); + assert (film); + + set_scale (VideoContentScale (film->container ())); + + int const crop = max (0, int (video_size().height - double (film->frame_size().height) * video_size().width / film->frame_size().width)); + set_top_crop (crop / 2); + set_bottom_crop (crop / 2); +} + +void +VideoContent::scale_and_crop_to_fit_height () +{ + shared_ptr film = _film.lock (); + assert (film); + + set_scale (VideoContentScale (film->container ())); + + int const crop = max (0, int (video_size().width - double (film->frame_size().width) * video_size().height / film->frame_size().height)); + set_left_crop (crop / 2); + set_right_crop (crop / 2); +} + +void +VideoContent::set_video_frame_rate (float r) +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_video_frame_rate == r) { + return; + } + + _video_frame_rate = r; + } + + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); +} + VideoContentScale::VideoContentScale (Ratio const * r) : _ratio (r) , _scale (true) @@ -393,7 +454,7 @@ VideoContentScale::VideoContentScale (bool scale) } -VideoContentScale::VideoContentScale (shared_ptr node) +VideoContentScale::VideoContentScale (cxml::NodePtr node) : _ratio (0) , _scale (true) { @@ -418,10 +479,10 @@ VideoContentScale::as_xml (xmlpp::Node* node) const string VideoContentScale::id () const { - stringstream s; + SafeStringStream s; if (_ratio) { - s << _ratio->id () << "_"; + s << _ratio->id (); } else { s << (_scale ? "S1" : "S0"); } @@ -443,29 +504,44 @@ VideoContentScale::name () const return _("No scale"); } +VideoContentScale +VideoContentScale::from_id (string id) +{ + Ratio const * r = Ratio::from_id (id); + if (r) { + return VideoContentScale (r); + } + + if (id == "S0") { + return VideoContentScale (false); + } + + return VideoContentScale (true); +} + /** @param display_container Size of the container that we are displaying this content in. * @param film_container The size of the film's image. */ dcp::Size -VideoContentScale::size (shared_ptr c, dcp::Size display_container, dcp::Size film_container) const +VideoContentScale::size (shared_ptr c, dcp::Size display_container, dcp::Size film_container, int round) const { if (_ratio) { - return fit_ratio_within (_ratio->ratio (), display_container); + return fit_ratio_within (_ratio->ratio (), display_container, round); } dcp::Size const ac = c->video_size_after_crop (); /* Force scale if the film_container is smaller than the content's image */ if (_scale || film_container.width < ac.width || film_container.height < ac.height) { - return fit_ratio_within (ac.ratio (), display_container); + return fit_ratio_within (ac.ratio (), display_container, 1); } /* Scale the image so that it will be in the right place in film_container, even if display_container is a different size. */ return dcp::Size ( - c->video_size().width * float(display_container.width) / film_container.width, - c->video_size().height * float(display_container.height) / film_container.height + round_to (c->video_size().width * float(display_container.width) / film_container.width, round), + round_to (c->video_size().height * float(display_container.height) / film_container.height, round) ); }