X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=927b8be69c32d28c6ebfb594006693f30abfea4c;hb=d0a0a4839f0e1e8d37f9f9ad41784c4d18210a6b;hp=d7d55e9c06bae5a3ac471fd362e81ce6a49677cd;hpb=17553e8613a83bbca51781e5c8d2308810e2aeeb;p=dcpomatic.git diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc index d7d55e9c0..927b8be69 100644 --- a/test/dcp_subtitle_test.cc +++ b/test/dcp_subtitle_test.cc @@ -1,24 +1,26 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-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 . */ /** @file test/dcp_subtitle_test.cc * @brief Test DCP subtitle content in various ways. + * @ingroup specific */ #include @@ -28,12 +30,25 @@ #include "lib/ratio.h" #include "lib/dcp_decoder.h" #include "lib/dcp_content_type.h" +#include "lib/dcp_subtitle_decoder.h" +#include "lib/subtitle_content.h" +#include "lib/content_subtitle.h" +#include "lib/subtitle_decoder.h" #include "test.h" #include using std::cout; using std::list; using boost::shared_ptr; +using boost::optional; + +optional stored; + +static void +store (ContentTextSubtitle sub) +{ + stored = sub; +} /** Test pass-through of a very simple DCP subtitle file */ BOOST_AUTO_TEST_CASE (dcp_subtitle_test) @@ -46,10 +61,10 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test) film->examine_and_add_content (content); wait_for_jobs (); - BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds (2)); + BOOST_CHECK_EQUAL (content->full_length().get(), DCPTime::from_seconds(2).get()); - content->set_use_subtitles (true); - content->set_burn_subtitles (false); + content->subtitle->set_use (true); + content->subtitle->set_burn (false); film->make_dcp (); wait_for_jobs (); @@ -67,32 +82,71 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test) film->examine_and_add_content (content); wait_for_jobs (); - shared_ptr decoder (new DCPDecoder (content, false)); - - list ctp = decoder->text_subtitles_during ( - ContentTimePeriod ( - ContentTime::from_seconds (25), - ContentTime::from_seconds (26) - ), - true - ); - - BOOST_REQUIRE_EQUAL (ctp.size(), 2); - BOOST_CHECK_EQUAL (ctp.front().from, ContentTime::from_seconds (25 + 12 * 0.04)); - BOOST_CHECK_EQUAL (ctp.front().to, ContentTime::from_seconds (26 + 4 * 0.04)); - BOOST_CHECK_EQUAL (ctp.back().from, ContentTime::from_seconds (25 + 12 * 0.04)); - BOOST_CHECK_EQUAL (ctp.back().to, ContentTime::from_seconds (26 + 4 * 0.04)); - - list subs = decoder->get_text_subtitles ( - ContentTimePeriod ( - ContentTime::from_seconds (25), - ContentTime::from_seconds (26) - ), - true - ); - - BOOST_REQUIRE_EQUAL (subs.size(), 1); - BOOST_REQUIRE_EQUAL (subs.front().subs.size(), 2); - BOOST_CHECK_EQUAL (subs.front().subs.front().text(), "Noch mal."); - BOOST_CHECK_EQUAL (subs.front().subs.back().text(), "Encore une fois."); + shared_ptr decoder (new DCPDecoder (content, film->log())); + decoder->subtitle->TextStart.connect (bind (store, _1)); + + stored = optional (); + while (!decoder->pass() && !stored) {} + + BOOST_REQUIRE (stored); + BOOST_REQUIRE_EQUAL (stored->subs.size(), 2); + BOOST_CHECK_EQUAL (stored->subs.front().text(), "Noch mal."); + BOOST_CHECK_EQUAL (stored->subs.back().text(), "Encore une fois."); +} + +/** Test subtitles whose text includes things like <b> */ +BOOST_AUTO_TEST_CASE (dcp_subtitle_test2) +{ + shared_ptr film = new_test_film ("dcp_subtitle_test2"); + film->set_container (Ratio::from_id ("185")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); + film->set_name ("frobozz"); + shared_ptr content (new DCPSubtitleContent (film, "test/data/dcp_sub2.xml")); + film->examine_and_add_content (content); + wait_for_jobs (); + + shared_ptr decoder (new DCPSubtitleDecoder (content, film->log())); + decoder->subtitle->TextStart.connect (bind (store, _1)); + + stored = optional (); + while (!decoder->pass ()) { + if (stored && stored->from() == ContentTime(0)) { + BOOST_CHECK_EQUAL (stored->subs.front().text(), "<b>Hello world!</b>"); + } + } +} + +/** Test a failure case */ +BOOST_AUTO_TEST_CASE (dcp_subtitle_test3) +{ + shared_ptr film = new_test_film ("dcp_subtitle_test3"); + film->set_container (Ratio::from_id ("185")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); + film->set_name ("frobozz"); + film->set_interop (true); + shared_ptr content (new DCPSubtitleContent (film, "test/data/dcp_sub3.xml")); + film->examine_and_add_content (content); + wait_for_jobs (); + + film->make_dcp (); + wait_for_jobs (); + + shared_ptr decoder (new DCPSubtitleDecoder (content, film->log())); + stored = optional (); + while (!decoder->pass ()) { + decoder->subtitle->TextStart.connect (bind (store, _1)); + if (stored && stored->from() == ContentTime::from_seconds(0.08)) { + list s = stored->subs; + list::const_iterator i = s.begin (); + BOOST_CHECK_EQUAL (i->text(), "This"); + ++i; + BOOST_REQUIRE (i != s.end ()); + BOOST_CHECK_EQUAL (i->text(), " is "); + ++i; + BOOST_REQUIRE (i != s.end ()); + BOOST_CHECK_EQUAL (i->text(), "wrong."); + ++i; + BOOST_REQUIRE (i == s.end ()); + } + } }