X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=c50d466a1f703f083a51a01d72440d0e0642d315;hb=4dbc6ef917aeceb906b1ef1caf6911033e7e2c54;hp=98c3d929af4f85e4e6f0c4e4cbc4e7b4f9ea1315;hpb=e749511fb4839feaccc94d506fa13b89ab13a570;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 98c3d929a..c50d466a1 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -17,10 +17,6 @@ */ -#include -#include -#include -#include #include "video_content.h" #include "video_examiner.h" #include "compose.hpp" @@ -33,6 +29,10 @@ #include "frame_rate_change.h" #include "log.h" #include "safe_stringstream.h" +#include +#include +#include +#include #include "i18n.h" @@ -53,6 +53,9 @@ using std::cout; using std::vector; using std::min; using std::max; +using std::stringstream; +using std::fixed; +using std::setprecision; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; @@ -63,7 +66,7 @@ VideoContent::VideoContent (shared_ptr f) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Config::instance()->default_scale ()) + , _scale (VideoContentScale (Ratio::from_id ("178"))) { set_default_colour_conversion (false); } @@ -73,7 +76,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 (Config::instance()->default_scale ()) + , _scale (VideoContentScale (Ratio::from_id ("178"))) { set_default_colour_conversion (false); } @@ -83,7 +86,7 @@ VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) , _video_length (0) , _video_frame_rate (0) , _video_frame_type (VIDEO_FRAME_TYPE_2D) - , _scale (Config::instance()->default_scale ()) + , _scale (VideoContentScale (Ratio::from_id ("178"))) { set_default_colour_conversion (false); } @@ -103,6 +106,7 @@ VideoContent::VideoContent (shared_ptr f, cxml::ConstNodePtr node, i } _video_frame_type = static_cast (node->number_child ("VideoFrameType")); + _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"); @@ -132,7 +136,7 @@ VideoContent::VideoContent (shared_ptr f, vector , _video_length (0) { shared_ptr ref = dynamic_pointer_cast (c[0]); - assert (ref); + DCPOMATIC_ASSERT (ref); for (size_t i = 0; i < c.size(); ++i) { shared_ptr vc = dynamic_pointer_cast (c[i]); @@ -187,6 +191,9 @@ VideoContent::as_xml (xmlpp::Node* node) const 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))); + if (_sample_aspect_ratio) { + node->add_child("SampleAspectRatio")->add_child_text (raw_convert (_sample_aspect_ratio.get ())); + } _crop.as_xml (node); _scale.as_xml (node->add_child("Scale")); if (_colour_conversion) { @@ -214,22 +221,31 @@ 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 (); + optional const vfr = d->video_frame_rate (); ContentTime vl = d->video_length (); + optional const ar = d->sample_aspect_ratio (); { boost::mutex::scoped_lock lm (_mutex); _video_size = vs; - _video_frame_rate = vfr; + /* Default video frame rate to 24fps if the examiner doesn't know */ + _video_frame_rate = vfr.get_value_or (24); _video_length = vl; + _sample_aspect_ratio = ar; + + /* 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) + ); } shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_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 (VideoContentProperty::VIDEO_SCALE); signal_changed (ContentProperty::LENGTH); } @@ -249,6 +265,10 @@ VideoContent::information () const video_size().height, setprecision (3), video_size().ratio () ); + + if (sample_aspect_ratio ()) { + s << String::compose (_(" sample aspect ratio %1:1"), sample_aspect_ratio().get ()); + } return s.str (); } @@ -362,13 +382,19 @@ VideoContent::set_video_frame_type (VideoFrameType t) string VideoContent::technical_summary () const { - return String::compose ( + string s = String::compose ( "video: length %1, size %2x%3, rate %4", video_length_after_3d_combine().seconds(), video_size().width, video_size().height, video_frame_rate() ); + + if (sample_aspect_ratio ()) { + s += String::compose (_(", sample aspect ratio %1"), (sample_aspect_ratio().get ())); + } + + return s; } dcp::Size @@ -387,7 +413,7 @@ VideoContent::video_size_after_3d_split () const return dcp::Size (s.width, s.height / 2); } - assert (false); + DCPOMATIC_ASSERT (false); } void @@ -448,7 +474,7 @@ ContentTime VideoContent::dcp_time_to_content_time (DCPTime t) const { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); return ContentTime (t, FrameRateChange (video_frame_rate(), film->video_frame_rate())); } @@ -456,7 +482,7 @@ void VideoContent::scale_and_crop_to_fit_width () { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); set_scale (VideoContentScale (film->container ())); @@ -469,7 +495,7 @@ void VideoContent::scale_and_crop_to_fit_height () { shared_ptr film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); set_scale (VideoContentScale (film->container ())); @@ -496,7 +522,7 @@ VideoContent::set_video_frame_rate (float r) optional VideoContent::fade (VideoFrame f) const { - assert (f >= 0); + DCPOMATIC_ASSERT (f >= 0); if (f < fade_in().frames (video_frame_rate ())) { return float (f) / _fade_in.frames (video_frame_rate ()); @@ -509,3 +535,62 @@ VideoContent::fade (VideoFrame f) const return optional (); } + +string +VideoContent::processing_description () const +{ + /* stringstream is OK here as this string is just for presentation to the user */ + stringstream d; + + if (video_size().width && video_size().height) { + d << String::compose ( + _("Content video is %1x%2"), + video_size_after_3d_split().width, + video_size_after_3d_split().height + ); + + d << " (" << fixed << setprecision(2) << video_size_after_3d_split().ratio() << ":1)\n"; + } + + if ((crop().left || crop().right || crop().top || crop().bottom) && video_size() != dcp::Size (0, 0)) { + dcp::Size cropped = video_size_after_crop (); + d << String::compose ( + _("Cropped to %1x%2"), + cropped.width, cropped.height + ); + + d << " (" << fixed << setprecision(2) << cropped.ratio () << ":1)\n"; + } + + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + + dcp::Size const container_size = film->frame_size (); + dcp::Size const scaled = scale().size (dynamic_pointer_cast (shared_from_this ()), container_size, container_size, 1); + + if (scaled != video_size_after_crop ()) { + d << String::compose ( + _("Scaled to %1x%2"), + scaled.width, scaled.height + ); + + d << " (" << fixed << setprecision(2) << scaled.ratio() << ":1)\n"; + } + + if (scaled != container_size) { + d << String::compose ( + _("Padded with black to %1x%2"), + container_size.width, container_size.height + ); + + d << " (" << fixed << setprecision(2) << container_size.ratio () << ":1)\n"; + } + + 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 (); +}