X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=f61518ec0f5b72f80a8ec936bcebc92ece04cdad;hb=a5a64cf04a5b87296abd2a04306a907767f02e56;hp=9fb2b9bce8f3a4c12860ee6bae4ab00e8b2ef59f;hpb=47f25009bcbc765e397bcb471dd361a511c99daf;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 9fb2b9bce..f61518ec0 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -17,45 +17,65 @@ */ +#include #include #include "video_content.h" -#include "video_decoder.h" +#include "video_examiner.h" +#include "ratio.h" +#include "compose.hpp" #include "i18n.h" -int const VideoContentProperty::VIDEO_LENGTH = 0; -int const VideoContentProperty::VIDEO_SIZE = 1; -int const VideoContentProperty::VIDEO_FRAME_RATE = 2; +int const VideoContentProperty::VIDEO_SIZE = 0; +int const VideoContentProperty::VIDEO_FRAME_RATE = 1; +int const VideoContentProperty::VIDEO_FRAME_TYPE = 2; +int const VideoContentProperty::VIDEO_CROP = 3; +int const VideoContentProperty::VIDEO_RATIO = 4; using std::string; using std::stringstream; using std::setprecision; +using std::cout; using boost::shared_ptr; using boost::lexical_cast; +using boost::optional; -VideoContent::VideoContent (boost::filesystem::path f) - : Content (f) +VideoContent::VideoContent (shared_ptr f, Time s, VideoContent::Frame len) + : Content (f, s) + , _video_length (len) + , _video_frame_rate (0) + , _video_frame_type (VIDEO_FRAME_TYPE_2D) + , _ratio (Ratio::from_id ("185")) +{ + +} + +VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) + : Content (f, p) , _video_length (0) + , _video_frame_rate (0) + , _video_frame_type (VIDEO_FRAME_TYPE_2D) + , _ratio (Ratio::from_id ("185")) { } -VideoContent::VideoContent (shared_ptr node) - : Content (node) +VideoContent::VideoContent (shared_ptr f, shared_ptr node) + : Content (f, node) { - _video_length = node->number_child ("VideoLength"); + _video_length = 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"); -} - -VideoContent::VideoContent (VideoContent const & o) - : Content (o) - , _video_length (o._video_length) - , _video_size (o._video_size) - , _video_frame_rate (o._video_frame_rate) -{ - + _video_frame_type = static_cast (node->number_child ("VideoFrameType")); + _crop.left = node->number_child ("LeftCrop"); + _crop.right = node->number_child ("RightCrop"); + _crop.top = node->number_child ("TopCrop"); + _crop.bottom = node->number_child ("BottomCrop"); + optional r = node->optional_string_child ("Ratio"); + if (r) { + _ratio = Ratio::from_id (r.get ()); + } } void @@ -66,23 +86,31 @@ VideoContent::as_xml (xmlpp::Node* node) const 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)); + if (_ratio) { + node->add_child("Ratio")->add_child_text (_ratio->id ()); + } } void -VideoContent::take_from_video_decoder (shared_ptr d) +VideoContent::take_from_video_examiner (shared_ptr d) { - /* These decoder calls could call other content methods which take a lock on the mutex */ - libdcp::Size const vs = d->native_size (); + /* These examiner calls could call other content methods which take a lock on the mutex */ + libdcp::Size const vs = d->video_size (); float const vfr = d->video_frame_rate (); - { - boost::mutex::scoped_lock lm (_mutex); - _video_size = vs; + { + boost::mutex::scoped_lock lm (_mutex); + _video_size = vs; _video_frame_rate = vfr; - } - - signal_changed (VideoContentProperty::VIDEO_SIZE); - signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); + } + + signal_changed (VideoContentProperty::VIDEO_SIZE); + signal_changed (VideoContentProperty::VIDEO_FRAME_RATE); } @@ -104,3 +132,128 @@ VideoContent::information () const return s.str (); } + +void +VideoContent::set_left_crop (int c) +{ + { + boost::mutex::scoped_lock lm (_mutex); + + if (_crop.left == c) { + return; + } + + _crop.left = c; + } + + signal_changed (VideoContentProperty::VIDEO_CROP); +} + +void +VideoContent::set_right_crop (int c) +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_crop.right == c) { + return; + } + + _crop.right = c; + } + + signal_changed (VideoContentProperty::VIDEO_CROP); +} + +void +VideoContent::set_top_crop (int c) +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_crop.top == c) { + return; + } + + _crop.top = c; + } + + signal_changed (VideoContentProperty::VIDEO_CROP); +} + +void +VideoContent::set_bottom_crop (int c) +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_crop.bottom == c) { + return; + } + + _crop.bottom = c; + } + + signal_changed (VideoContentProperty::VIDEO_CROP); +} + +void +VideoContent::set_ratio (Ratio const * r) +{ + { + boost::mutex::scoped_lock lm (_mutex); + if (_ratio == r) { + return; + } + + _ratio = r; + } + + signal_changed (VideoContentProperty::VIDEO_RATIO); +} + +/** @return string which includes everything about how this content looks */ +string +VideoContent::identifier () const +{ + stringstream s; + s << Content::digest() + << "_" << crop().left + << "_" << crop().right + << "_" << crop().top + << "_" << crop().bottom; + + if (ratio()) { + s << "_" << ratio()->id (); + } + + return s.str (); +} + +void +VideoContent::set_video_frame_type (VideoFrameType t) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _video_frame_type = t; + } + + signal_changed (VideoContentProperty::VIDEO_FRAME_TYPE); +} + +string +VideoContent::technical_summary () const +{ + return String::compose ("video: length %1, size %2x%3, rate %4", video_length(), video_size().width, video_size().height, video_frame_rate()); +} + +libdcp::Size +VideoContent::video_size_after_3d_split () const +{ + libdcp::Size const s = video_size (); + switch (video_frame_type ()) { + case VIDEO_FRAME_TYPE_2D: + return s; + case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: + return libdcp::Size (s.width / 2, s.height); + } + + assert (false); +}