/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include "test.h"
-#include "ssa_reader.h"
+
#include "collect.h"
+#include "compose.hpp"
+#include "exceptions.h"
+#include "ssa_reader.h"
#include "subtitle.h"
+#include "test.h"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <cstdio>
#include <cmath>
#include <iostream>
-using std::list;
+
using std::fabs;
+using std::string;
+using std::vector;
+
BOOST_AUTO_TEST_CASE (ssa_reader_test)
{
FILE* f = fopen (p.string().c_str(), "r");
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
- list<sub::Subtitle>::iterator i = subs.begin ();
+ auto i = subs.begin ();
+
+ /* Convert a font size in points to a proportional size for this file */
+ auto fs = [](int x) {
+ return static_cast<float>(x) / 1024;
+ };
BOOST_REQUIRE (i != subs.end ());
BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 2, 40, 650));
BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 2, 41, 790));
- list<sub::Line>::iterator j = i->lines.begin();
+ auto j = i->lines.begin();
BOOST_REQUIRE (j != i->lines.end ());
BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
sub::Block b = j->blocks.front ();
BOOST_CHECK_EQUAL (b.text, "Et les enregistrements de ses ondes delta ?");
BOOST_CHECK_EQUAL (b.font.get(), "Wolf_Rain");
- BOOST_CHECK_EQUAL (b.font_size.points().get(), 56);
+ BOOST_CHECK_CLOSE(b.font_size.proportional().get(), fs(56), 0.1);
BOOST_CHECK_EQUAL (b.bold, false);
BOOST_CHECK_EQUAL (b.italic, false);
BOOST_CHECK_EQUAL (b.underline, false);
b = j->blocks.front ();
BOOST_CHECK_EQUAL (b.text, "Toujours rien.");
BOOST_CHECK_EQUAL (b.font.get(), "Wolf_Rain");
- BOOST_CHECK_EQUAL (b.font_size.points().get(), 56);
+ BOOST_CHECK_CLOSE(b.font_size.proportional().get(), fs(56), 0.1);
BOOST_CHECK_EQUAL (b.bold, false);
BOOST_CHECK_EQUAL (b.italic, false);
BOOST_CHECK_EQUAL (b.underline, false);
BOOST_CHECK (i == subs.end());
}
+
BOOST_AUTO_TEST_CASE (ssa_reader_line_test1)
{
sub::RawSubtitle base;
- list<sub::RawSubtitle> r = sub::SSAReader::parse_line (
+ auto r = sub::SSAReader::parse_line (
base,
"This is a line with some {\\i1}italics{\\i0} and then\\nthere is a new line.",
- 1920, 1080
+ 1920, 1080,
+ sub::Colour(1, 1, 1)
);
- list<sub::RawSubtitle>::const_iterator i = r.begin ();
+ auto i = r.begin();
BOOST_CHECK_EQUAL (i->text, "This is a line with some ");
BOOST_CHECK_EQUAL (i->italic, false);
++i;
BOOST_REQUIRE (i == r.end ());
}
+
BOOST_AUTO_TEST_CASE (ssa_reader_line_test2)
{
sub::RawSubtitle base;
- list<sub::RawSubtitle> r = sub::SSAReader::parse_line (
+ auto r = sub::SSAReader::parse_line (
base,
"{\\i1}It's all just italics{\\i0}",
- 1920, 1080
+ 1920, 1080,
+ sub::Colour(1, 1, 1)
);
- list<sub::RawSubtitle>::const_iterator i = r.begin ();
+ /* Convert a font size in points to a vertical position for this file */
+ auto vp = [](int x) {
+ return x * 1.2 / 1080;
+ };
+
+ auto i = r.begin ();
BOOST_CHECK_EQUAL (i->text, "It's all just italics");
BOOST_CHECK_EQUAL (i->italic, true);
++i;
r = sub::SSAReader::parse_line (
base,
"{\\i1}Italic{\\i0}\\Nand new line",
- 1920, 1080
+ 1920, 1080,
+ sub::Colour(1, 1, 1)
);
i = r.begin ();
BOOST_CHECK_EQUAL (i->text, "Italic");
BOOST_CHECK_EQUAL (i->italic, true);
- BOOST_CHECK (fabs ((72.0 * 1.2 / 792) - i->vertical_position.proportional.get()) < 1e-5);
+ BOOST_CHECK(fabs(vp(72) - i->vertical_position.proportional.get()) < 1e-5);
++i;
BOOST_CHECK_EQUAL (i->text, "and new line");
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK (i->vertical_position.proportional.get() < 1e-5);
}
+
static void
test (boost::filesystem::path p)
{
test ("DKH_UT_EN20160601def.ssa");
test ("dcpsubtest-en.ssa");
test ("dcpsubtest-en.ssa");
- test ("Widdershins_GERMAN_SUBS_grey.ass");
+ test ("W_GERMAN_SUBS_grey.ass");
}
#define SUB_START(f, t) \
BOOST_REQUIRE (k != j->blocks.end ()); \
BOOST_CHECK_EQUAL (k->text, t); \
BOOST_CHECK_EQUAL (k->font.get(), f); \
- BOOST_CHECK_EQUAL (k->font_size.points().get(), s); \
+ BOOST_CHECK_CLOSE(k->font_size.proportional().get(), s, 0.1); \
BOOST_CHECK_EQUAL (k->bold, b); \
BOOST_CHECK_EQUAL (k->italic, i); \
BOOST_CHECK_EQUAL (k->underline, u); \
FILE* f = fopen (p.string().c_str(), "r");
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
+
+ /* Convert a font size in points to a proportional size for this file */
+ auto fs = [](int x) {
+ return static_cast<float>(x) / 1080;
+ };
- list<sub::Subtitle>::iterator i = subs.begin ();
- list<sub::Line>::iterator j;
- list<sub::Block>::iterator k;
+ /* Convert a font size in points to a vertical position for this file */
+ auto vp = [&fs](int x) {
+ return fs(x) * 1.2;
+ };
+
+ auto i = subs.begin();
+ vector<sub::Line>::iterator j;
+ vector<sub::Block>::iterator k;
/* Hello world */
SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550));
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("Hello world", "Arial", 20, false, false, false);
+ LINE((10.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Hello world", "Arial", fs(20), false, false, false);
SUB_END();
/* This is vertically moved\nand has two lines. */
points, 1.2 times spaced, as a proportion of the total
screen height 729 points) up.
*/
- LINE((900.0 / 1080) - (20.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("This is vertically moved", "Arial", 20, false, false, false);
+ LINE((900.0 / 1080) - vp(20), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This is vertically moved", "Arial", fs(20), false, false, false);
LINE((900.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("and has two lines.", "Arial", 20, false, false, false);
+ BLOCK("and has two lines.", "Arial", fs(20), false, false, false);
SUB_END();
/* Some {\i1}italics{\i} are here. */
SUB_START (sub::Time::from_hms (0, 0, 7, 740), sub::Time::from_hms (0, 0, 9, 0));
- LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("Some ", "Arial", 20, false, false, false);
- BLOCK("italics", "Arial", 20, false, true, false);
- BLOCK(" are here.", "Arial", 20, false, false, false);
+ LINE((10.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Some ", "Arial", fs(20), false, false, false);
+ BLOCK("italics", "Arial", fs(20), false, true, false);
+ BLOCK(" are here.", "Arial", fs(20), false, false, false);
SUB_END();
/* Alignments */
SUB_START (sub::Time::from_hms (0, 0, 9, 230), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("bottom left", "Arial", 20, false, false, false);
+ LINE ((10.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::LEFT_OF_SCREEN);
+ BLOCK("bottom left", "Arial", fs(20), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 240), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("bottom centre", "Arial", 20, false, false, false);
+ LINE ((10.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("bottom centre", "Arial", fs(20), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 250), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("bottom right", "Arial", 20, false, false, false);
+ LINE ((10.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::RIGHT_OF_SCREEN);
+ BLOCK("bottom right", "Arial", fs(20), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 260), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("middle left", "Arial", 20, false, false, false);
+ /* Position is half of a 20pt line (with line spacing) above vertical centre */
+ LINE (-vp(10), sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::LEFT_OF_SCREEN);
+ BLOCK("middle left", "Arial", fs(20), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 270), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("middle centre", "Arial", 20, false, false, false);
+ LINE (-vp(10), sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("middle centre", "Arial", fs(20), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 280), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("middle right", "Arial", 20, false, false, false);
+ LINE (-vp(10), sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::RIGHT_OF_SCREEN);
+ BLOCK("middle right", "Arial", fs(20), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 290), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("top left", "Arial", 20, false, false, false);
+ LINE ((10.0 / 1080), sub::TOP_OF_SCREEN, 0, sub::LEFT_OF_SCREEN);
+ BLOCK("top left", "Arial", fs(20), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 300), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("top centre", "Arial", 20, false, false, false);
+ LINE ((10.0 / 1080), sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("top centre", "Arial", fs(20), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 310), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK("top right", "Arial", 20, false, false, false);
+ LINE ((10.0 / 1080), sub::TOP_OF_SCREEN, 0, sub::RIGHT_OF_SCREEN);
+ BLOCK("top right", "Arial", fs(20), false, false, false);
SUB_END ();
BOOST_REQUIRE (i == subs.end ());
}
+
/** Test reading of a file within the libsub-test-private tree which exercises the parser */
BOOST_AUTO_TEST_CASE (ssa_reader_test4)
{
FILE* f = fopen (p.string().c_str(), "r");
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
- list<sub::Subtitle>::iterator i = subs.begin ();
- list<sub::Line>::iterator j;
- list<sub::Block>::iterator k;
+ auto i = subs.begin();
+ vector<sub::Line>::iterator j;
+ vector<sub::Block>::iterator k;
BOOST_REQUIRE (i != subs.end ());
+ /* Convert a font size in points to a proportional size for this file */
+ auto fs = [](int x) {
+ return static_cast<float>(x) / 288;
+ };
+
+ /* Convert a font size in points to a vertical position for this file */
+ auto vp = [&fs](int x) {
+ return fs(x) * 1.2;
+ };
+
SUB_START (sub::Time::from_hms (0, 0, 1, 0), sub::Time::from_hms (0, 0, 3, 0));
/* The first line should be one line (50 points, 1.2 times
spaced, as a proportion of the total screen height 729
points) up.
*/
- LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("1st line: This is normal", "Verdana", 50, false, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("2d line: this is bold", "Verdana", 50, true, false, false);
+ LINE(vp(50), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("1st line: This is normal", "Verdana", fs(50), false, false, false);
+ LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("2d line: this is bold", "Verdana", fs(50), true, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 3, 100), sub::Time::from_hms (0, 0, 5, 100));
- LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("1st line: this is bold", "Verdana", 50, true, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("2nd line: This is normal", "Verdana", 50, false, false, false);
+ LINE(vp(50), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("1st line: this is bold", "Verdana", fs(50), true, false, false);
+ LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("2nd line: This is normal", "Verdana", fs(50), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 5, 200), sub::Time::from_hms (0, 0, 7, 200));
- LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("1st line: this is bold", "Verdana", 50, true, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("2nd line: this is italics", "Verdana", 50, false, true, false);
+ LINE(vp(50), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("1st line: this is bold", "Verdana", fs(50), true, false, false);
+ LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("2nd line: this is italics", "Verdana", fs(50), false, true, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 7, 300), sub::Time::from_hms (0, 0, 9, 300));
- LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("1st line: this is italics", "Verdana", 50, false, true, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("2nd line: this is bold", "Verdana", 50, true, false, false);
+ LINE(vp(50), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("1st line: this is italics", "Verdana", fs(50), false, true, false);
+ LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("2nd line: this is bold", "Verdana", fs(50), true, false, false);
SUB_END ();
}
+
/** Test reading of a .ass file */
BOOST_AUTO_TEST_CASE (ssa_reader_test5)
{
FILE* f = fopen (p.string().c_str(), "r");
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
+
+ /* Convert a font size in points to a proportional size for this file */
+ auto fs = [](int x) {
+ return static_cast<float>(x) / 288;
+ };
+
+ /* Convert a font size in points to a vertical position for this file */
+ auto vp = [&fs](int x) {
+ return fs(x) * 1.2;
+ };
- list<sub::Subtitle>::iterator i = subs.begin ();
- list<sub::Line>::iterator j;
- list<sub::Block>::iterator k;
+ auto i = subs.begin ();
+ vector<sub::Line>::iterator j;
+ vector<sub::Block>::iterator k;
BOOST_REQUIRE (i != subs.end ());
spaced, as a proportion of the total screen height 729
points) up.
*/
- LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("1st subtitle, 1st line", "arial", 26, true, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("2nd subtitle, 2nd line", "arial", 26, true, false, false);
+ LINE(vp(26), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("1st subtitle, 1st line", "arial", fs(26), true, false, false);
+ LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("2nd subtitle, 2nd line", "arial", fs(26), true, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 3, 100), sub::Time::from_hms (0, 0, 5, 100));
- LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("2nd subtitle, 1st line", "arial", 26, true, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("2nd subtitle, 2nd line", "arial", 26, true, false, false);
+ LINE(vp(26), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("2nd subtitle, 1st line", "arial", fs(26), true, false, false);
+ LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("2nd subtitle, 2nd line", "arial", fs(26), true, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 5, 200), sub::Time::from_hms (0, 0, 7, 200));
- LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("3rd subtitle, 1st line", "arial", 26, true, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("3rd subtitle, 2nd line", "arial", 26, true, false, false);
+ LINE(vp(26), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("3rd subtitle, 1st line", "arial", fs(26), true, false, false);
+ LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("3rd subtitle, 2nd line", "arial", fs(26), true, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 7, 300), sub::Time::from_hms (0, 0, 9, 300));
- LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("4th subtitle, 1st line", "arial", 26, true, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("4th subtitle, 2nd line", "arial", 26, true, false, false);
+ LINE(vp(26), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("4th subtitle, 1st line", "arial", fs(26), true, false, false);
+ LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("4th subtitle, 2nd line", "arial", fs(26), true, false, false);
SUB_END ();
}
+
/** Test reading of another .ass file */
BOOST_AUTO_TEST_CASE (ssa_reader_test6)
{
boost::filesystem::path p = private_test / "DCP-o-matic_test_subs_1.ass";
- FILE* f = fopen (p.string().c_str(), "r");
+ auto f = fopen (p.string().c_str(), "r");
BOOST_REQUIRE (f);
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
+
+ /* Convert a font size in points to a proportional size for this file */
+ auto fs = [](int x) {
+ return static_cast<float>(x) / 288;
+ };
+
+ /* Convert a font size in points to a vertical position for this file */
+ auto vp = [&fs](int x) {
+ return fs(x) * 1.2;
+ };
- list<sub::Subtitle>::iterator i = subs.begin ();
- list<sub::Line>::iterator j;
- list<sub::Block>::iterator k;
+ auto i = subs.begin ();
+ vector<sub::Line>::iterator j;
+ vector<sub::Block>::iterator k;
BOOST_REQUIRE (i != subs.end ());
SUB_START (sub::Time::from_hms (0, 0, 0, 70), sub::Time::from_hms (0, 0, 1, 110));
/* The first line should be one line (30 points, 1.2 times
- spaced, as a proportion of the total screen height 729
- points) up.
+ spaced, as a proportion of the total screen height 792
+ points) up. There's also a 10 pixel (with respect to a
+ 288-pixel-high screen) margin.
*/
- LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("This line is normal", "Arial", 30, false, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("This line is bold", "Arial", 30, true, false, false);
+ LINE((vp(30) + (10.0 / 288.0)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This line is normal", "Arial", fs(30), false, false, false);
+ LINE ((10.0 / 288.0), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This line is bold", "Arial", fs(30), true, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 1, 200), sub::Time::from_hms (0, 0, 2, 240));
- LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("This line is bold", "Arial", 30, true, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("This line is normal", "Arial", 30, false, false, false);
+ LINE((vp(30) + (10.0 / 288.0)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This line is bold", "Arial", fs(30), true, false, false);
+ LINE ((10.0 / 288.0), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This line is normal", "Arial", fs(30), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 2, 300), sub::Time::from_hms (0, 0, 3, 380));
- LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("This line is bold", "Arial", 30, true, false, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("This line is italic", "Arial", 30, false, true, false);
+ LINE ((vp(30) + (10.0 / 288.0)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This line is bold", "Arial", fs(30), true, false, false);
+ LINE ((10.0 / 288.0), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This line is italic", "Arial", fs(30), false, true, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 3, 400), sub::Time::from_hms (0, 0, 4, 480));
- LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("This line is italic", "Arial", 30, false, true, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("This line is bold", "Arial", 30, true, false, false);
+ LINE ((vp(30) + (10.0 / 288.0)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This line is italic", "Arial", fs(30), false, true, false);
+ LINE ((10.0 / 288.0), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This line is bold", "Arial", fs(30), true, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 4, 510), sub::Time::from_hms (0, 0, 5, 600));
- LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("Last three words are ", "Arial", 30, false, false, false);
- BLOCK ("bold AND italic", "Arial", 30, true, true, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("Last three words are ", "Arial", 30, false, false, false);
- BLOCK ("italic AND bold", "Arial", 30, true, true, false);
+ LINE ((vp(30) + (10.0 / 288.0)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Last three words are ", "Arial", fs(30), false, false, false);
+ BLOCK("bold AND italic", "Arial", fs(30), true, true, false);
+ LINE ((10.0 / 288.0), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Last three words are ", "Arial", fs(30), false, false, false);
+ BLOCK("italic AND bold", "Arial", fs(30), true, true, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 5, 620), sub::Time::from_hms (0, 0, 6, 710));
- LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("Last three words are ", "Arial", 30, false, false, false);
- BLOCK ("bold AND italic", "Arial", 30, true, true, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("First three words", "Arial", 30, true, true, false);
- BLOCK (" are italic AND bold", "Arial", 30, false, false, false);
+ LINE((vp(30) + (10.0 / 288.0)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Last three words are ", "Arial", fs(30), false, false, false);
+ BLOCK("bold AND italic", "Arial", fs(30), true, true, false);
+ LINE ((10.0 / 288.0), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("First three words", "Arial", fs(30), true, true, false);
+ BLOCK(" are italic AND bold", "Arial", fs(30), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 6, 730), sub::Time::from_hms (0, 0, 8, 30));
- LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("Last three words are ", "Arial", 30, false, false, false);
- BLOCK ("bold AND italic", "Arial", 30, true, true, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("This line is normal", "Arial", 30, false, false, false);
+ LINE ((vp(30) + (10.0 / 288.0)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Last three words are ", "Arial", fs(30), false, false, false);
+ BLOCK("bold AND italic", "Arial", fs(30), true, true, false);
+ LINE ((10.0 / 288.0), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("This line is normal", "Arial", fs(30), false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 8, 90), sub::Time::from_hms (0, 0, 9, 210));
- LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("Both lines are bold AND italic", "Arial", 30, true, true, false);
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("Both lines are bold AND italic", "Arial", 30, true, true, false);
+ LINE((vp(30) + (10.0 / 288.0)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Both lines are bold AND italic", "Arial", fs(30), true, true, false);
+ LINE((10.0 / 288.0), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Both lines are bold AND italic", "Arial", fs(30), true, true, false);
SUB_END ();
}
+
+BOOST_AUTO_TEST_CASE (ssa_reader_test7)
+{
+ auto p = boost::filesystem::path("test") / "data" / "test3.ssa";
+ auto f = fopen(p.string().c_str(), "r");
+ BOOST_REQUIRE(f);
+ sub::SSAReader reader(f);
+ fclose(f);
+ auto subs = sub::collect<vector<sub::Subtitle>>(reader.subtitles());
+
+ /* Convert a font size in points to a proportional size for this file */
+ auto fs = [](int x) {
+ return static_cast<float>(x) / 1080;
+ };
+
+ /* Convert a font size in points to a vertical position for this file */
+ auto vp = [&fs](int x) {
+ return fs(x) * 1.2;
+ };
+
+ auto i = subs.begin();
+ vector<sub::Line>::iterator j;
+ vector<sub::Block>::iterator k;
+
+ BOOST_REQUIRE (i != subs.end());
+
+ SUB_START(sub::Time::from_hms(0, 0, 1, 0), sub::Time::from_hms(0, 0, 3, 0));
+ LINE((vp(60) + (100.0 / 1080)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Helvetica Neue 60pt - Default", "Helvetica Neue", fs(60), false, false, false);
+ LINE((100.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Bottom 100 pt off edge", "Helvetica Neue", fs(60), false, false, false);
+ SUB_END();
+
+ SUB_START(sub::Time::from_hms(0, 0, 4, 0), sub::Time::from_hms(0, 0, 6, 0));
+ LINE((vp(30) + (100.0 / 1080)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Helvetica Neue 30pt", "Helvetica Neue", fs(30), false, false, false);
+ LINE((100.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Bottom 100pt off edge", "Helvetica Neue", fs(30), false, false, false);
+ SUB_END();
+
+ SUB_START(sub::Time::from_hms(0, 0, 7, 0), sub::Time::from_hms(0, 0, 9, 0));
+ LINE((vp(120) + (100.0 / 1080)), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Helvetica Neue 120pt", "Helvetica Neue", fs(120), false, false, false);
+ LINE((100.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Bottom 100pt off edge", "Helvetica Neue", fs(120), false, false, false);
+ SUB_END();
+
+ SUB_START(sub::Time::from_hms(0, 0, 10, 0), sub::Time::from_hms(0, 0, 12, 0));
+ LINE((100.0 / 1080), sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Helvetica Neue 60pt", "Helvetica Neue", fs(60), false, false, false);
+ LINE((vp(60) + (100.0 / 1080)), sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Top Alignment 100pt off edge", "Helvetica Neue", fs(60), false, false, false);
+ SUB_END();
+
+ SUB_START(sub::Time::from_hms(0, 0, 13, 0), sub::Time::from_hms(0, 0, 15, 0));
+ LINE(vp(-60), sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK("Helvetica Neue 60pt", "Helvetica Neue 60 Center", fs(60), false, false, false);
+ LINE(0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK(" Vertical Center Alignment", "Helvetica Neue 60 Center", fs(60), false, false, false);
+ SUB_END();
+}
+
+
/** Test \pos */
BOOST_AUTO_TEST_CASE (ssa_reader_pos)
{
FILE* f = fopen (p.string().c_str(), "r");
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
- list<sub::Subtitle>::iterator i = subs.begin ();
- list<sub::Line>::iterator j;
- list<sub::Block>::iterator k;
+ /* Convert a font size in points to a proportional size for this file */
+ auto fs = [](int x) {
+ return static_cast<float>(x) / 1080;
+ };
+
+ auto i = subs.begin ();
+ vector<sub::Line>::iterator j;
+ vector<sub::Block>::iterator k;
/* Hello world */
SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550));
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
- BLOCK ("Hello world this is ", "Arial", 20, false, false, false);
- LINE (300.0 / 1080, sub::TOP_OF_SCREEN, 400.0 / 1920, sub::LEFT_OF_SCREEN);
- BLOCK ("positioning.", "Arial", 20, false, false, false);
+ LINE ((10.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ BLOCK ("Hello world this is ", "Arial", fs(20), false, false, false);
+ LINE ((310.0 / 1080), sub::TOP_OF_SCREEN, 400.0 / 1920, sub::LEFT_OF_SCREEN);
+ BLOCK ("positioning.", "Arial", fs(20), false, false, false);
SUB_END();
}
+
/** Test \fs */
BOOST_AUTO_TEST_CASE (ssa_reader_fs)
{
sub::RawSubtitle base;
- list<sub::RawSubtitle> r = sub::SSAReader::parse_line (
+ auto r = sub::SSAReader::parse_line (
base,
"This is a line with some {\\fs64}font sizing.",
- 1920, 1080
+ 1920, 1080,
+ sub::Colour(1, 1, 1)
);
- list<sub::RawSubtitle>::const_iterator i = r.begin ();
+ auto i = r.begin ();
BOOST_CHECK_EQUAL (i->text, "This is a line with some ");
++i;
BOOST_REQUIRE (i != r.end ());
BOOST_CHECK_EQUAL (i->text, "font sizing.");
- BOOST_CHECK (i->font_size.points());
- BOOST_CHECK_EQUAL (i->font_size.points().get(), 64);
+ BOOST_REQUIRE(i->font_size.proportional());
+ BOOST_CHECK_CLOSE(i->font_size.proportional().get(), 64.0 / 1080, 0.1);
++i;
BOOST_REQUIRE (i == r.end ());
}
+
+
+static void
+test_c(string command, string colour)
+{
+ sub::RawSubtitle base;
+ auto r = sub::SSAReader::parse_line (
+ base,
+ String::compose("{\\c%1}Hello world", command),
+ 1920, 1080,
+ sub::Colour(1, 0, 1)
+ );
+
+ auto i = r.begin ();
+ BOOST_CHECK_EQUAL (i->text, "Hello world");
+ BOOST_CHECK (i->colour == sub::Colour::from_rgb_hex(colour));
+ BOOST_REQUIRE(std::next(i) == r.end());
+}
+
+
+/** Test a valid \c */
+BOOST_AUTO_TEST_CASE (ssa_reader_c)
+{
+ test_c("&H00FFFF&", "ffff00");
+ test_c("&H123456&", "563412");
+ test_c("&H0&", "000000");
+ test_c("&HFF&", "ff0000");
+ test_c("&HFF00&", "00ff00");
+ test_c("&HFF0000&", "0000ff");
+ test_c("&HFFFFFF&", "ffffff");
+ /* \c with no parameter seems to be parsed as "return to primary colour" */
+ test_c("", "ff00ff");
+}
+
projects / libsub.git / blobdiff