X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=3478368555b8139944144170b05ab67198134d4b;hb=11325f810e214935e4115248223c186a6e4cc184;hp=af0c3e12c08022fed68969c97f817ada684f3cc4;hpb=877227c50d5f48f0de5d64352d11afc2e0db696f;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index af0c3e12c..347836855 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -66,6 +66,7 @@ VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) VideoContent::VideoContent (shared_ptr f, shared_ptr node) : Content (f, node) + , _ratio (0) { _video_length = node->number_child ("VideoLength"); _video_size.width = node->number_child ("VideoWidth"); @@ -139,7 +140,7 @@ VideoContent::information () const _("%1x%2 pixels (%3:1)"), video_size().width, video_size().height, - setprecision (3), float (video_size().width) / video_size().height + setprecision (3), video_size().ratio () ); return s.str (); @@ -226,7 +227,7 @@ string VideoContent::identifier () const { stringstream s; - s << Content::digest() + s << Content::identifier() << "_" << crop().left << "_" << crop().right << "_" << crop().top @@ -281,3 +282,10 @@ VideoContent::set_colour_conversion (ColourConversion c) signal_changed (VideoContentProperty::COLOUR_CONVERSION); } + +/** @return Video size after 3D split and crop */ +libdcp::Size +VideoContent::video_size_after_crop () const +{ + return crop().apply (video_size_after_3d_split ()); +}