X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=655b8baf6aa861af5c947eaed8b2e2ce6580c2ed;hb=6cac49dc50dae6b173135df101d532f20031ca70;hp=f5e5139122191337183735e764573480894688cf;hpb=1d2a51bdc8315fa7283be329669860e435a1513f;p=dcpomatic.git diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index f5e513912..655b8baf6 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -43,13 +43,13 @@ int const VideoContentProperty::USE = 0; int const VideoContentProperty::SIZE = 1; int const VideoContentProperty::FRAME_TYPE = 2; int const VideoContentProperty::CROP = 3; -int const VideoContentProperty::SCALE = 4; -int const VideoContentProperty::COLOUR_CONVERSION = 5; -int const VideoContentProperty::FADE_IN = 6; -int const VideoContentProperty::FADE_OUT = 7; -int const VideoContentProperty::RANGE = 8; -int const VideoContentProperty::CUSTOM_RATIO = 9; -int const VideoContentProperty::CUSTOM_SIZE = 10; +int const VideoContentProperty::COLOUR_CONVERSION = 4; +int const VideoContentProperty::FADE_IN = 5; +int const VideoContentProperty::FADE_OUT = 6; +int const VideoContentProperty::RANGE = 7; +int const VideoContentProperty::CUSTOM_RATIO = 8; +int const VideoContentProperty::CUSTOM_SIZE = 9; +int const VideoContentProperty::BURNT_SUBTITLE_LANGUAGE = 10; using std::string; using std::setprecision; @@ -62,6 +62,7 @@ using std::setprecision; using std::list; using std::pair; using std::shared_ptr; +using std::make_shared; using boost::optional; using std::dynamic_pointer_cast; using dcp::raw_convert; @@ -71,7 +72,7 @@ VideoContent::VideoContent (Content* parent) : ContentPart (parent) , _use (true) , _length (0) - , _frame_type (VIDEO_FRAME_TYPE_2D) + , _frame_type (VideoFrameType::TWO_D) , _yuv (true) , _fade_in (0) , _fade_out (0) @@ -84,10 +85,10 @@ shared_ptr VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) { if (!node->optional_number_child ("VideoWidth")) { - return shared_ptr (); + return {}; } - return shared_ptr (new VideoContent (parent, node, version)); + return make_shared(parent, node, version); } VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version) @@ -109,22 +110,22 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio /* Snapshot of the VideoFrameType enum at version 34 */ switch (node->number_child ("VideoFrameType")) { case 0: - _frame_type = VIDEO_FRAME_TYPE_2D; + _frame_type = VideoFrameType::TWO_D; break; case 1: - _frame_type = VIDEO_FRAME_TYPE_3D_LEFT_RIGHT; + _frame_type = VideoFrameType::THREE_D_LEFT_RIGHT; break; case 2: - _frame_type = VIDEO_FRAME_TYPE_3D_TOP_BOTTOM; + _frame_type = VideoFrameType::THREE_D_TOP_BOTTOM; break; case 3: - _frame_type = VIDEO_FRAME_TYPE_3D_ALTERNATE; + _frame_type = VideoFrameType::THREE_D_ALTERNATE; break; case 4: - _frame_type = VIDEO_FRAME_TYPE_3D_LEFT; + _frame_type = VideoFrameType::THREE_D_LEFT; break; case 5: - _frame_type = VIDEO_FRAME_TYPE_3D_RIGHT; + _frame_type = VideoFrameType::THREE_D_RIGHT; break; } } else { @@ -138,7 +139,7 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio _crop.bottom = node->number_child ("BottomCrop"); if (version <= 7) { - optional r = node->optional_string_child ("Ratio"); + auto r = node->optional_string_child ("Ratio"); if (r) { _legacy_ratio = Ratio::from_id(r.get())->ratio(); } @@ -182,8 +183,15 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio if (node->optional_string_child("Range").get_value_or("full") == "video") { _range = VideoRange::VIDEO; } + + auto burnt = node->optional_string_child("BurntSubtitleLanguage"); + if (burnt) { + _burnt_subtitle_language = dcp::LanguageTag (*burnt); + } + } + VideoContent::VideoContent (Content* parent, vector > c) : ContentPart (parent) , _length (0) @@ -226,6 +234,10 @@ VideoContent::VideoContent (Content* parent, vector > c) throw JoinError (_("Content to be joined must have the same fades.")); } + if (c[i]->video->burnt_subtitle_language() != ref->burnt_subtitle_language()) { + throw JoinError (_("Content to be joined must have the same burnt subtitle language.")); + } + _length += c[i]->video->length (); if (c[i]->video->yuv ()) { @@ -242,8 +254,10 @@ VideoContent::VideoContent (Content* parent, vector > c) _fade_in = ref->fade_in (); _fade_out = ref->fade_out (); _range = ref->range (); + _burnt_subtitle_language = ref->burnt_subtitle_language (); } + void VideoContent::as_xml (xmlpp::Node* node) const { @@ -271,6 +285,9 @@ VideoContent::as_xml (xmlpp::Node* node) const node->add_child("FadeIn")->add_child_text (raw_convert (_fade_in)); node->add_child("FadeOut")->add_child_text (raw_convert (_fade_out)); node->add_child("Range")->add_child_text(_range == VideoRange::FULL ? "full" : "video"); + if (_burnt_subtitle_language) { + node->add_child("BurntSubtitleLanguage")->add_child_text(_burnt_subtitle_language->to_string()); + } } void @@ -283,10 +300,9 @@ VideoContent::take_from_examiner (shared_ptr d) auto const yuv = d->yuv (); auto const range = d->range (); - ChangeSignaller cc1 (_parent, VideoContentProperty::SIZE); - ChangeSignaller cc2 (_parent, VideoContentProperty::SCALE); - ChangeSignaller cc3 (_parent, ContentProperty::LENGTH); - ChangeSignaller cc4 (_parent, VideoContentProperty::RANGE); + ContentChangeSignaller cc1 (_parent, VideoContentProperty::SIZE); + ContentChangeSignaller cc2 (_parent, ContentProperty::LENGTH); + ContentChangeSignaller cc3 (_parent, VideoContentProperty::RANGE); { boost::mutex::scoped_lock lm (_mutex); @@ -355,15 +371,15 @@ VideoContent::size_after_3d_split () const { auto const s = size (); switch (frame_type ()) { - case VIDEO_FRAME_TYPE_2D: - case VIDEO_FRAME_TYPE_3D: - case VIDEO_FRAME_TYPE_3D_ALTERNATE: - case VIDEO_FRAME_TYPE_3D_LEFT: - case VIDEO_FRAME_TYPE_3D_RIGHT: + case VideoFrameType::TWO_D: + case VideoFrameType::THREE_D: + case VideoFrameType::THREE_D_ALTERNATE: + case VideoFrameType::THREE_D_LEFT: + case VideoFrameType::THREE_D_RIGHT: return s; - case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT: + case VideoFrameType::THREE_D_LEFT_RIGHT: return dcp::Size (s.width / 2, s.height); - case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM: + case VideoFrameType::THREE_D_TOP_BOTTOM: return dcp::Size (s.width, s.height / 2); } @@ -555,6 +571,14 @@ VideoContent::set_use (bool u) maybe_set (_use, u, VideoContentProperty::USE); } + +void +VideoContent::set_burnt_subtitle_language (boost::optional language) +{ + maybe_set (_burnt_subtitle_language, language, VideoContentProperty::BURNT_SUBTITLE_LANGUAGE); +} + + void VideoContent::take_settings_from (shared_ptr c) { @@ -573,8 +597,10 @@ VideoContent::take_settings_from (shared_ptr c) set_custom_size (c->_custom_size); set_fade_in (c->_fade_in); set_fade_out (c->_fade_out); + set_burnt_subtitle_language (c->_burnt_subtitle_language); } + void VideoContent::modify_position (shared_ptr film, DCPTime& pos) const {