projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix invalid Interop subtitle times in some cases.
[dcpomatic.git]
/
src
/
lib
/
subrip_decoder.cc
diff --git
a/src/lib/subrip_decoder.cc
b/src/lib/subrip_decoder.cc
index 5c6d331dfe66bb3802010657de4ed0be2bd94b71..32d50d86b14e62ad44b0f28015799fea1ce1514b 100644
(file)
--- a/
src/lib/subrip_decoder.cc
+++ b/
src/lib/subrip_decoder.cc
@@
-20,6
+20,7
@@
#include <dcp/subtitle_string.h>
#include "subrip_decoder.h"
#include "subrip_content.h"
#include <dcp/subtitle_string.h>
#include "subrip_decoder.h"
#include "subrip_content.h"
+#include <iostream>
using std::list;
using std::vector;
using std::list;
using std::vector;
@@
-40,7
+41,7
@@
void
SubRipDecoder::seek (ContentTime time, bool accurate)
{
SubtitleDecoder::seek (time, accurate);
SubRipDecoder::seek (ContentTime time, bool accurate)
{
SubtitleDecoder::seek (time, accurate);
-
+
_next = 0;
while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
++_next;
_next = 0;
while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
++_next;
@@
-48,14
+49,14
@@
SubRipDecoder::seek (ContentTime time, bool accurate)
}
bool
}
bool
-SubRipDecoder::pass (
PassReason
)
+SubRipDecoder::pass ()
{
if (_next >= _subtitles.size ()) {
return true;
}
/* XXX: we are ignoring positioning specified in the file */
{
if (_next >= _subtitles.size ()) {
return true;
}
/* XXX: we are ignoring positioning specified in the file */
-
+
list<dcp::SubtitleString> out;
for (list<sub::Line>::const_iterator i = _subtitles[_next].lines.begin(); i != _subtitles[_next].lines.end(); ++i) {
for (list<sub::Block>::const_iterator j = i->blocks.begin(); j != i->blocks.end(); ++j) {
list<dcp::SubtitleString> out;
for (list<sub::Line>::const_iterator i = _subtitles[_next].lines.begin(); i != _subtitles[_next].lines.end(); ++i) {
for (list<sub::Block>::const_iterator j = i->blocks.begin(); j != i->blocks.end(); ++j) {
@@
-63,11
+64,11
@@
SubRipDecoder::pass (PassReason)
dcp::SubtitleString (
SubRipContent::font_id,
j->italic,
dcp::SubtitleString (
SubRipContent::font_id,
j->italic,
- dcp::Colour (
255, 255,
255),
+ dcp::Colour (
j->colour.r * 255, j->colour.g * 255, j->colour.b *
255),
j->font_size.points (72 * 11),
1.0,
j->font_size.points (72 * 11),
1.0,
- dcp::Time (_subtitles[_next].from.all_as_seconds()),
- dcp::Time (_subtitles[_next].to.all_as_seconds()),
+ dcp::Time (_subtitles[_next].from.all_as_seconds()
, 1000
),
+ dcp::Time (_subtitles[_next].to.all_as_seconds()
, 1000
),
0,
dcp::HALIGN_CENTER,
i->vertical_position.line.get() * (1.5 / 22) + 0.8,
0,
dcp::HALIGN_CENTER,
i->vertical_position.line.get() * (1.5 / 22) + 0.8,
@@
-75,14
+76,15
@@
SubRipDecoder::pass (PassReason)
j->text,
dcp::NONE,
dcp::Colour (255, 255, 255),
j->text,
dcp::NONE,
dcp::Colour (255, 255, 255),
-
0
,
- 0
+
dcp::Time (0, 1000)
,
+ dcp::Time (0, 1000)
)
);
}
}
)
);
}
}
- text_subtitle (out);
+ text_subtitle (content_time_period (_subtitles[_next]), out);
+
++_next;
return false;
}
++_next;
return false;
}
@@
-101,12
+103,7
@@
SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
list<ContentTimePeriod> d;
for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
list<ContentTimePeriod> d;
for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-
- ContentTimePeriod t (
- ContentTime::from_seconds (i->from.all_as_seconds()),
- ContentTime::from_seconds (i->to.all_as_seconds())
- );
-
+ ContentTimePeriod t = content_time_period (*i);
if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {
d.push_back (t);
}
if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {
d.push_back (t);
}
@@
-114,3
+111,12
@@
SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
return d;
}
return d;
}
+
+ContentTimePeriod
+SubRipDecoder::content_time_period (sub::Subtitle s) const
+{
+ return ContentTimePeriod (
+ ContentTime::from_seconds (s.from.all_as_seconds()),
+ ContentTime::from_seconds (s.to.all_as_seconds())
+ );
+}