X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=3f6e171a549d2f6feefaca6deb3e3c5556805b66;hb=19dc3455d7112427e0470e58133d25bcb031e9f1;hp=99471edc1a84f0fdf222e9151314223664716fed;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 99471edc1..3f6e171a5 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -17,30 +17,39 @@ */ +#include #include #include "video_content.h" -#include "video_decoder.h" +#include "video_examiner.h" #include "ratio.h" +#include "compose.hpp" +#include "config.h" +#include "colour_conversion.h" #include "i18n.h" -int const VideoContentProperty::VIDEO_SIZE = 0; -int const VideoContentProperty::VIDEO_FRAME_RATE = 1; -int const VideoContentProperty::VIDEO_CROP = 2; -int const VideoContentProperty::VIDEO_RATIO = 3; +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; +int const VideoContentProperty::COLOUR_CONVERSION = 5; 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 (shared_ptr f, Time s, ContentVideoFrame len) +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")) + , _colour_conversion (Config::instance()->colour_conversions().front().conversion) { } @@ -49,7 +58,9 @@ 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")) + , _colour_conversion (Config::instance()->colour_conversions().front().conversion) { } @@ -57,10 +68,11 @@ VideoContent::VideoContent (shared_ptr f, boost::filesystem::path p) 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"); + _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"); @@ -69,16 +81,7 @@ VideoContent::VideoContent (shared_ptr f, shared_ptrnode_child ("ColourConversion")); } void @@ -89,6 +92,7 @@ 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)); @@ -96,23 +100,24 @@ VideoContent::as_xml (xmlpp::Node* node) const if (_ratio) { node->add_child("Ratio")->add_child_text (_ratio->id ()); } + _colour_conversion.as_xml (node->add_child("ColourConversion")); } 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 */ + /* 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); } @@ -135,16 +140,6 @@ VideoContent::information () const return s.str (); } -void -VideoContent::set_crop (Crop c) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _crop = c; - } - signal_changed (VideoContentProperty::VIDEO_CROP); -} - void VideoContent::set_left_crop (int c) { @@ -220,3 +215,64 @@ VideoContent::set_ratio (Ratio const * 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 + << "_" << colour_conversion().identifier (); + + 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); +} + +void +VideoContent::set_colour_conversion (ColourConversion c) +{ + { + boost::mutex::scoped_lock lm (_mutex); + _colour_conversion = c; + } + + signal_changed (VideoContentProperty::COLOUR_CONVERSION); +}