/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
#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 <iostream>
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 ();
film->examine_and_add_content (content);
wait_for_jobs ();
- shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, false));
+ shared_ptr<DCPDecoder> decoder (new DCPDecoder (content, film->log()));
list<ContentTimePeriod> ctp = decoder->text_subtitles_during (
ContentTimePeriod (
);
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));
+ BOOST_CHECK_EQUAL (ctp.front().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get());
+ BOOST_CHECK_EQUAL (ctp.front().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get());
+ BOOST_CHECK_EQUAL (ctp.back().from.get(), ContentTime::from_seconds(25 + 12 * 0.04).get());
+ BOOST_CHECK_EQUAL (ctp.back().to.get(), ContentTime::from_seconds(26 + 4 * 0.04).get());
- list<ContentTextSubtitle> subs = decoder->get_text_subtitles (
+ list<ContentTextSubtitle> subs = decoder->subtitle->get_text (
ContentTimePeriod (
ContentTime::from_seconds (25),
ContentTime::from_seconds (26)
BOOST_CHECK_EQUAL (subs.front().subs.front().text(), "Noch mal.");
BOOST_CHECK_EQUAL (subs.front().subs.back().text(), "Encore une fois.");
}
+
+/** Test subtitles whose text includes things like <b> */
+BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
+{
+ shared_ptr<Film> 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<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub2.xml"));
+ film->examine_and_add_content (content);
+ wait_for_jobs ();
+
+ shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
+ list<ContentTextSubtitle> sub = decoder->subtitle->get_text (
+ ContentTimePeriod (ContentTime::from_seconds(0), ContentTime::from_seconds(2)), true, true
+ );
+ BOOST_REQUIRE_EQUAL (sub.size(), 1);
+ BOOST_REQUIRE_EQUAL (sub.front().subs.size(), 1);
+ BOOST_CHECK_EQUAL (sub.front().subs.front().text(), "<b>Hello world!</b>");
+}
+
+/** Test a failure case */
+BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
+{
+ shared_ptr<Film> 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<DCPSubtitleContent> 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<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content, film->log()));
+ list<ContentTextSubtitle> sub = decoder->subtitle->get_text (
+ ContentTimePeriod (ContentTime::from_seconds(0), ContentTime::from_seconds(2)), true, true
+ );
+ BOOST_REQUIRE_EQUAL (sub.size(), 1);
+ BOOST_REQUIRE_EQUAL (sub.front().subs.size(), 3);
+ list<dcp::SubtitleString> s = sub.front().subs;
+ list<dcp::SubtitleString>::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 ());
+}
projects / dcpomatic.git / blobdiff