X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;h=422bb65658e9e4a2afc160e1117a37c13d3ac470;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hp=89953b0e5d5c791c1db7fcd2aa94aff61fa6c3a1;hpb=cc76b517f6a74f813ae38137bdc88ff3bafa6dd9;p=dcpomatic.git diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 89953b0e5..422bb6565 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -1,30 +1,30 @@ /* Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "subtitle_content.h" #include "util.h" #include "exceptions.h" -#include "safe_stringstream.h" #include "font.h" #include "raw_convert.h" #include "content.h" -#include "film.h" +#include #include #include #include @@ -49,10 +49,12 @@ int const SubtitleContentProperty::LANGUAGE = 506; int const SubtitleContentProperty::FONTS = 507; int const SubtitleContentProperty::COLOUR = 508; int const SubtitleContentProperty::OUTLINE = 509; -int const SubtitleContentProperty::OUTLINE_COLOUR = 510; +int const SubtitleContentProperty::SHADOW = 510; +int const SubtitleContentProperty::EFFECT_COLOUR = 511; +int const SubtitleContentProperty::LINE_SPACING = 512; -SubtitleContent::SubtitleContent (Content* parent, shared_ptr film) - : ContentPart (parent, film) +SubtitleContent::SubtitleContent (Content* parent) + : ContentPart (parent) , _use (false) , _burn (false) , _x_offset (0) @@ -61,23 +63,36 @@ SubtitleContent::SubtitleContent (Content* parent, shared_ptr film) , _y_scale (1) , _colour (255, 255, 255) , _outline (false) - , _outline_colour (0, 0, 0) + , _shadow (false) + , _effect_colour (0, 0, 0) + , _line_spacing (1) { } shared_ptr -SubtitleContent::from_xml (Content* parent, shared_ptr film, cxml::ConstNodePtr node, int version) +SubtitleContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) { + if (version < 34) { + /* With old metadata FFmpeg content has the subtitle-related tags even with no + subtitle streams, so check for that. + */ + if (node->string_child("Type") == "FFmpeg" && node->node_children("SubtitleStream").empty()) { + return shared_ptr (); + } + + /* Otherwise we can drop through to the newer logic */ + } + if (!node->optional_number_child("SubtitleXOffset") && !node->optional_number_child("SubtitleOffset")) { return shared_ptr (); } - return shared_ptr (new SubtitleContent (parent, film, node, version)); + return shared_ptr (new SubtitleContent (parent, node, version)); } -SubtitleContent::SubtitleContent (Content* parent, shared_ptr film, cxml::ConstNodePtr node, int version) - : ContentPart (parent, film) +SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int version) + : ContentPart (parent) , _use (false) , _burn (false) , _x_offset (0) @@ -90,11 +105,8 @@ SubtitleContent::SubtitleContent (Content* parent, shared_ptr film, node->optional_number_child("Blue").get_value_or(255) ) , _outline (node->optional_bool_child("Outline").get_value_or(false)) - , _outline_colour ( - node->optional_number_child("OutlineRed").get_value_or(255), - node->optional_number_child("OutlineGreen").get_value_or(255), - node->optional_number_child("OutlineBlue").get_value_or(255) - ) + , _shadow (node->optional_bool_child("Shadow").get_value_or(false)) + , _line_spacing (node->optional_number_child("LineSpacing").get_value_or (1)) { if (version >= 32) { _use = node->bool_child ("UseSubtitles"); @@ -115,6 +127,20 @@ SubtitleContent::SubtitleContent (Content* parent, shared_ptr film, _x_scale = _y_scale = node->number_child ("SubtitleScale"); } + if (version >= 36) { + _effect_colour = dcp::Colour ( + node->optional_number_child("EffectRed").get_value_or(255), + node->optional_number_child("EffectGreen").get_value_or(255), + node->optional_number_child("EffectBlue").get_value_or(255) + ); + } else { + _effect_colour = dcp::Colour ( + node->optional_number_child("OutlineRed").get_value_or(255), + node->optional_number_child("OutlineGreen").get_value_or(255), + node->optional_number_child("OutlineBlue").get_value_or(255) + ); + } + _language = node->optional_string_child ("SubtitleLanguage").get_value_or (""); list fonts = node->node_children ("Font"); @@ -125,8 +151,8 @@ SubtitleContent::SubtitleContent (Content* parent, shared_ptr film, connect_to_fonts (); } -SubtitleContent::SubtitleContent (Content* parent, shared_ptr film, vector > c) - : ContentPart (parent, film) +SubtitleContent::SubtitleContent (Content* parent, vector > c) + : ContentPart (parent) { shared_ptr ref = c[0]->subtitle; DCPOMATIC_ASSERT (ref); @@ -158,6 +184,10 @@ SubtitleContent::SubtitleContent (Content* parent, shared_ptr film, throw JoinError (_("Content to be joined must have the same subtitle Y scale.")); } + if (c[i]->subtitle->line_spacing() != ref->line_spacing()) { + throw JoinError (_("Content to be joined must have the same subtitle line spacing.")); + } + list > fonts = c[i]->subtitle->fonts (); if (fonts.size() != ref_fonts.size()) { throw JoinError (_("Content to be joined must use the same fonts.")); @@ -183,6 +213,7 @@ SubtitleContent::SubtitleContent (Content* parent, shared_ptr film, _y_scale = ref->y_scale (); _language = ref->language (); _fonts = ref_fonts; + _line_spacing = ref->line_spacing (); connect_to_fonts (); } @@ -204,9 +235,11 @@ SubtitleContent::as_xml (xmlpp::Node* root) const root->add_child("Green")->add_child_text (raw_convert (_colour.g)); root->add_child("Blue")->add_child_text (raw_convert (_colour.b)); root->add_child("Outline")->add_child_text (raw_convert (_outline)); - root->add_child("OutlineRed")->add_child_text (raw_convert (_outline_colour.r)); - root->add_child("OutlineGreen")->add_child_text (raw_convert (_outline_colour.g)); - root->add_child("OutlineBlue")->add_child_text (raw_convert (_outline_colour.b)); + root->add_child("Shadow")->add_child_text (raw_convert (_shadow)); + root->add_child("EffectRed")->add_child_text (raw_convert (_effect_colour.r)); + root->add_child("EffectGreen")->add_child_text (raw_convert (_effect_colour.g)); + root->add_child("EffectBlue")->add_child_text (raw_convert (_effect_colour.b)); + root->add_child("LineSpacing")->add_child_text (raw_convert (_line_spacing)); for (list >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) { (*i)->as_xml (root->add_child("Font")); @@ -216,11 +249,12 @@ SubtitleContent::as_xml (xmlpp::Node* root) const string SubtitleContent::identifier () const { - SafeStringStream s; + locked_stringstream s; s << raw_convert (x_scale()) << "_" << raw_convert (y_scale()) << "_" << raw_convert (x_offset()) - << "_" << raw_convert (y_offset()); + << "_" << raw_convert (y_offset()) + << "_" << raw_convert (line_spacing()); /* XXX: I suppose really _fonts shouldn't be in here, since not all types of subtitle content involve fonts. @@ -278,9 +312,15 @@ SubtitleContent::set_outline (bool o) } void -SubtitleContent::set_outline_colour (dcp::Colour colour) +SubtitleContent::set_shadow (bool s) +{ + maybe_set (_shadow, s, SubtitleContentProperty::SHADOW); +} + +void +SubtitleContent::set_effect_colour (dcp::Colour colour) { - maybe_set (_outline_colour, colour, SubtitleContentProperty::OUTLINE_COLOUR); + maybe_set (_effect_colour, colour, SubtitleContentProperty::EFFECT_COLOUR); } void @@ -324,3 +364,9 @@ SubtitleContent::set_language (string language) { maybe_set (_language, language, SubtitleContentProperty::LANGUAGE); } + +void +SubtitleContent::set_line_spacing (double s) +{ + maybe_set (_line_spacing, s, SubtitleContentProperty::LINE_SPACING); +}