X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_subtitle_stream.cc;h=da8bafc0af788a3c76328b6b7ef5a54445f2c1f1;hp=627b0fef1c8b61b6890397c97282f4d42f7700af;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=97d39f46795af78b84d5f7bc9118a188f2864781 diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc index 627b0fef1..da8bafc0a 100644 --- a/src/lib/ffmpeg_subtitle_stream.cc +++ b/src/lib/ffmpeg_subtitle_stream.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2017 Carl Hetherington This file is part of DCP-o-matic. @@ -32,60 +32,14 @@ using std::make_pair; using dcp::raw_convert; /** Construct a SubtitleStream from a value returned from to_string(). - * @param t String returned from to_string(). - * @param v State file version. + * @param node String returned from to_string(). + * @param version State file version. */ FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node, int version) : FFmpegStream (node) { - if (version == 32) { - BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Period")) { - /* In version 32 we assumed that from times were unique, so they were - used as identifiers. All subtitles were image subtitles. - */ - add_image_subtitle ( - raw_convert (i->string_child ("From")), - ContentTimePeriod ( - ContentTime (i->number_child ("From")), - ContentTime (i->number_child ("To")) - ) - ); - } - } else { - /* In version 33 we use a hash of various parts of the subtitle as the id. - was initially used for image subtitles; later we have - and - */ - BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Subtitle")) { - add_image_subtitle ( - raw_convert (i->string_child ("Id")), - ContentTimePeriod ( - ContentTime (i->number_child ("From")), - ContentTime (i->number_child ("To")) - ) - ); - } - - BOOST_FOREACH (cxml::NodePtr i, node->node_children ("ImageSubtitle")) { - add_image_subtitle ( - raw_convert (i->string_child ("Id")), - ContentTimePeriod ( - ContentTime (i->number_child ("From")), - ContentTime (i->number_child ("To")) - ) - ); - } - - BOOST_FOREACH (cxml::NodePtr i, node->node_children ("TextSubtitle")) { - add_text_subtitle ( - raw_convert (i->string_child ("Id")), - ContentTimePeriod ( - ContentTime (i->number_child ("From")), - ContentTime (i->number_child ("To")) - ) - ); - } - + if (version >= 33) { + boost::mutex::scoped_lock lm (_mutex); BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Colour")) { _colours[RGBA(i->node_child("From"))] = RGBA (i->node_child("To")); } @@ -97,9 +51,7 @@ FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const { FFmpegStream::as_xml (root); - as_xml (root, _image_subtitles, "ImageSubtitle"); - as_xml (root, _text_subtitles, "TextSubtitle"); - + boost::mutex::scoped_lock lm (_mutex); for (map::const_iterator i = _colours.begin(); i != _colours.end(); ++i) { xmlpp::Node* node = root->add_child("Colour"); i->first.as_xml (node->add_child("From")); @@ -107,115 +59,16 @@ FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const } } -void -FFmpegSubtitleStream::as_xml (xmlpp::Node* root, PeriodMap const & subs, string node_name) const -{ - for (PeriodMap::const_iterator i = subs.begin(); i != subs.end(); ++i) { - xmlpp::Node* node = root->add_child (node_name); - node->add_child("Id")->add_child_text (i->first); - node->add_child("From")->add_child_text (raw_convert (i->second.from.get ())); - node->add_child("To")->add_child_text (raw_convert (i->second.to.get ())); - } -} - -void -FFmpegSubtitleStream::add_image_subtitle (string id, ContentTimePeriod period) -{ - DCPOMATIC_ASSERT (_image_subtitles.find (id) == _image_subtitles.end ()); - _image_subtitles[id] = period; -} - -void -FFmpegSubtitleStream::add_text_subtitle (string id, ContentTimePeriod period) -{ - DCPOMATIC_ASSERT (_text_subtitles.find (id) == _text_subtitles.end ()); - _text_subtitles[id] = period; -} - -list -FFmpegSubtitleStream::image_subtitles_during (ContentTimePeriod period, bool starting) const -{ - return subtitles_during (period, starting, _image_subtitles); -} - -list -FFmpegSubtitleStream::text_subtitles_during (ContentTimePeriod period, bool starting) const -{ - return subtitles_during (period, starting, _text_subtitles); -} - -struct PeriodSorter -{ - bool operator() (ContentTimePeriod const & a, ContentTimePeriod const & b) { - return a.from < b.from; - } -}; - -list -FFmpegSubtitleStream::subtitles_during (ContentTimePeriod period, bool starting, PeriodMap const & subs) const -{ - list d; - - /* XXX: inefficient */ - for (map::const_iterator i = subs.begin(); i != subs.end(); ++i) { - if ((starting && period.contains(i->second.from)) || (!starting && period.overlap(i->second))) { - d.push_back (i->second); - } - } - - d.sort (PeriodSorter ()); - - return d; -} - -ContentTime -FFmpegSubtitleStream::find_subtitle_to (string id) const -{ - PeriodMap::const_iterator i = _image_subtitles.find (id); - if (i != _image_subtitles.end ()) { - return i->second.to; - } - - i = _text_subtitles.find (id); - DCPOMATIC_ASSERT (i != _text_subtitles.end ()); - return i->second.to; -} - -/** Add some offset to all the times in the stream */ -void -FFmpegSubtitleStream::add_offset (ContentTime offset) -{ - for (PeriodMap::iterator i = _image_subtitles.begin(); i != _image_subtitles.end(); ++i) { - i->second.from += offset; - i->second.to += offset; - } - - for (PeriodMap::iterator i = _text_subtitles.begin(); i != _text_subtitles.end(); ++i) { - i->second.from += offset; - i->second.to += offset; - } -} - map FFmpegSubtitleStream::colours () const { + boost::mutex::scoped_lock lm (_mutex); return _colours; } void FFmpegSubtitleStream::set_colour (RGBA from, RGBA to) { + boost::mutex::scoped_lock lm (_mutex); _colours[from] = to; } - -bool -FFmpegSubtitleStream::has_text () const -{ - return !_text_subtitles.empty (); -} - -bool -FFmpegSubtitleStream::has_image () const -{ - return !_image_subtitles.empty (); -}