mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Use unrounded rational time in microdvd subtitle format

Browse source 
Originally committed to SVN as r6116.
This commit is contained in:
Thomas Goyne 2011-12-22 21:27:45 +00:00
parent 93ce90cbf9
commit ac6e9fd022
1 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
aegisub/src/subtitle_format_microdvd.cpp
View file

@ -82,12 +82,9 @@ void MicroDVDSubtitleFormat::ReadFile(wxString const& filename, wxString const&
LoadDefault(false); LoadDefault(false);
agi::vfr::Framerate cfr; agi::vfr::Framerate fps;
const agi::vfr::Framerate *rate = 𝔠
bool isFirst = true; bool isFirst = true;
FPSRational fps_rat;
double fps = 0.0;
while (file.HasMoreLines()) { while (file.HasMoreLines()) {
wxString line = file.ReadLineFromFile(); wxString line = file.ReadLineFromFile();
if (exp.Matches(line)) { if (exp.Matches(line)) {
@ -98,26 +95,24 @@ void MicroDVDSubtitleFormat::ReadFile(wxString const& filename, wxString const&
// If it's the first, check if it contains fps information // If it's the first, check if it contains fps information
if (isFirst) { if (isFirst) {
if (f1 == 1 && f2 == 1) {
// Convert fps
try {
text.ToDouble(&fps);
}
catch (...) { }
}
isFirst = false; isFirst = false;
if (f1 == 1 && f2 == 1) {
// Convert fps
double cfr;
if (text.ToDouble(&cfr)) {
fps = cfr;
continue;
}
}
// If it wasn't an fps line, ask the user for it // If it wasn't an fps line, ask the user for it
if (fps <= 0.0) { FPSRational fps_rat = AskForFPS();
fps_rat = AskForFPS(); if (fps_rat.num == 0) return;
if (fps_rat.num == 0) return; else if (fps_rat.num > 0)
else if (fps_rat.num > 0) cfr = double(fps_rat.num)/fps_rat.den; fps = agi::vfr::Framerate(fps_rat.num, fps_rat.den);
else rate = &VideoContext::Get()->FPS(); else
} fps = VideoContext::Get()->FPS();
else {
cfr = fps;
continue;
}
} }
text.Replace("|", "\\N"); text.Replace("|", "\\N");
@ -125,8 +120,8 @@ void MicroDVDSubtitleFormat::ReadFile(wxString const& filename, wxString const&
AssDialogue *line = new AssDialogue; AssDialogue *line = new AssDialogue;
line->group = "[Events]"; line->group = "[Events]";
line->Style = "Default"; line->Style = "Default";
line->Start.SetMS(rate->TimeAtFrame(f1, agi::vfr::START)); line->Start.SetMS(fps.TimeAtFrame(f1, agi::vfr::START));
line->End.SetMS(rate->TimeAtFrame(f2, agi::vfr::END)); line->End.SetMS(fps.TimeAtFrame(f2, agi::vfr::END));
line->Text = text; line->Text = text;
Line->push_back(line); Line->push_back(line);
} }
@ -134,14 +129,14 @@ void MicroDVDSubtitleFormat::ReadFile(wxString const& filename, wxString const&
} }
void MicroDVDSubtitleFormat::WriteFile(wxString const& filename, wxString const& encoding) { void MicroDVDSubtitleFormat::WriteFile(wxString const& filename, wxString const& encoding) {
agi::vfr::Framerate cfr; agi::vfr::Framerate fps;
const agi::vfr::Framerate *rate = &cfr;
FPSRational fps_rat = AskForFPS(); FPSRational fps_rat = AskForFPS();
if (fps_rat.num == 0 || fps_rat.den == 0) return; if (fps_rat.num == 0 || fps_rat.den == 0) return;
double fps = double(fps_rat.num) / fps_rat.den; if (fps_rat.num < 0 || fps_rat.den < 0)
if (fps > 0.0) cfr = fps; fps = VideoContext::Get()->FPS();
else rate = &VideoContext::Get()->FPS(); else
fps = agi::vfr::Framerate(fps_rat.num, fps_rat.den);
// Convert file // Convert file
CreateCopy(); CreateCopy();
@ -155,15 +150,15 @@ void MicroDVDSubtitleFormat::WriteFile(wxString const& filename, wxString const&
TextFileWriter file(filename, encoding); TextFileWriter file(filename, encoding);
// Write FPS line // Write FPS line
if (!rate->IsVFR()) { if (!fps.IsVFR()) {
file.WriteLineToFile(wxString::Format("{1}{1}%.6f", rate->FPS())); file.WriteLineToFile(wxString::Format("{1}{1}%.6f", fps.FPS()));
} }
// Write lines // Write lines
for (std::list<AssEntry*>::iterator cur=Line->begin();cur!=Line->end();cur++) { for (std::list<AssEntry*>::iterator cur=Line->begin();cur!=Line->end();cur++) {
if (AssDialogue *current = dynamic_cast<AssDialogue*>(*cur)) { if (AssDialogue *current = dynamic_cast<AssDialogue*>(*cur)) {
int start = rate->FrameAtTime(current->Start.GetMS(), agi::vfr::START); int start = fps.FrameAtTime(current->Start.GetMS(), agi::vfr::START);
int end = rate->FrameAtTime(current->End.GetMS(), agi::vfr::END); int end = fps.FrameAtTime(current->End.GetMS(), agi::vfr::END);
file.WriteLineToFile(wxString::Format("{%i}{%i}%s", start, end, current->Text)); file.WriteLineToFile(wxString::Format("{%i}{%i}%s", start, end, current->Text));
} }