Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-04 09:15:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow negative timecodes in "delay:" lines in VobSub subtitles. Fix for bug 241.

Browse Source
This commit is contained in:
Moritz Bunkus 2007-04-19 07:50:15 +00:00
parent 6bbfae08fc
commit 4c84e14b9e
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-04-19 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: Fixed the VobSub reader so that "delay:"
lines with negative timecodes are accepted. Fix for bug 241.
2007-04-18 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: Improved the file type detection code for

23
src/common/common.cpp
View File

@ -1611,7 +1611,8 @@ set_tcp_error(const string &error) {
bool
parse_timecode(const string &src,
int64_t &timecode) {
int64_t &timecode,
bool allow_negative) {
// Recognized format:
// 1. XXXXXXXu with XXXXXX being a number followed
// by one of the units 's', 'ms', 'us' or 'ns'
@ -1620,13 +1621,21 @@ parse_timecode(const string &src,
// 2. HH:MM:SS:nnnnnnnnn with up to nine digits 'n' for ns precision;
// HH: is optional; HH, MM and SS can be either one or two digits.
int h, m, s, n, i, values[4], num_values, num_digits, num_colons;
int offset = 0, negative = 1;
bool decimal_point_found;
if (src.empty())
return false;
if ('-' == src[0]) {
if (!allow_negative)
return false;
negative = -1;
offset = 1;
}
try {
if (src.length() < 2)
if (src.length() < (2 + offset))
throw false;
string unit = src.substr(src.length() - 2, 2);
@ -1646,13 +1655,13 @@ parse_timecode(const string &src,
else
throw false;
if (src.length() < (unit_length + 1))
if (src.length() < (unit_length + 1 + offset))
throw false;
if (!parse_int(src.substr(0, src.length() - unit_length), value))
if (!parse_int(src.substr(offset, src.length() - unit_length - offset), value))
throw false;
timecode = value * multiplier;
timecode = value * multiplier * negative;
return true;
} catch (...) {
@ -1664,7 +1673,7 @@ parse_timecode(const string &src,
decimal_point_found = false;
memset(&values, 0, sizeof(int) * 4);
for (i = 0; src.length() > i; ++i) {
for (i = offset; src.length() > i; ++i) {
if (isdigit(src[i])) {
if (decimal_point_found && (9 == num_digits))
return set_tcp_error("Invalid format: More than nine nano-second "
@ -1749,6 +1758,8 @@ parse_timecode(const string &src,
timecode = ((int64_t)h * 60 * 60 + (int64_t)m * 60 + (int64_t)s) *
1000000000ll + n;
timecode *= negative;
timecode_parser_error = "no error";
return true;
}

3
src/common/common.h
View File

@ -97,7 +97,8 @@ using namespace std;
(int32_t)((t) % 1000000000)
#define ARG_TIMECODEN(t) ARG_TIMECODENINT((int64_t)(t))
extern string MTX_DLL_API timecode_parser_error;
extern bool MTX_DLL_API parse_timecode(const string &s, int64_t &timecode);
extern bool MTX_DLL_API parse_timecode(const string &s, int64_t &timecode,
bool allow_negative = false);
extern bool MTX_DLL_API suppress_warnings;
void MTX_DLL_API fix_format(const char *fmt, string &new_fmt);

2
src/input/r_vobsub.cpp
View File

@ -248,7 +248,7 @@ vobsub_reader_c::parse_headers() {
line.erase(0, 6);
strip(line);
if (!parse_timecode(line, timestamp))
if (!parse_timecode(line, timestamp, true))
mxerror(PFX "'%s', line " LLD ": The 'delay' timestamp could not be "
"parsed.\n", ti.fname.c_str(), line_no);
delay = timestamp;