iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Another attempt to fix VFR 

Originally committed to SVN as r154.
This commit is contained in:
Rodrigo Braz Monteiro 2006-02-24 22:14:37 +00:00
parent f4ab9b2771
commit a69d456e16
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/vfr.cpp
View File

@ -127,8 +127,7 @@ int FrameRate::PTimeAtFrame(int frame) {
//wxASSERT(loaded);
if (!loaded) return -1;
wxASSERT(frame >= 0);
if (frame <= 0) return 0;
if (FrameRateType == CFR) {
return floor(double(frame) / AverageFrameRate * 1000.0);
@ -346,10 +345,12 @@ void FrameRate::SetVFR(std::vector<int> newTimes) {
// returns the adjusted time for end frames when start=false
// otherwise for start frames
int FrameRate::GetFrameAtTime(int ms,bool start) {
if (start)
return PFrameAtTime(ms+10);
else
if (start) {
return PFrameAtTime(ms);
}
else {
return PFrameAtTime(ms);
}
}
@ -357,10 +358,16 @@ int FrameRate::GetFrameAtTime(int ms,bool start) {
// Get correct time at frame
// compensates and returns an end time when start=false
int FrameRate::GetTimeAtFrame(int frame,bool start) {
if (start)
return PTimeAtFrame(frame);
else
return PTimeAtFrame(frame+1);
int finalTime;
if (start) {
finalTime = (PTimeAtFrame(frame-1) + PTimeAtFrame(frame))/2;
}
else {
if (FrameRateType == VFR) finalTime = PTimeAtFrame(frame);
else finalTime = (PTimeAtFrame(frame) + PTimeAtFrame(frame+1))/2;
}
return finalTime;
}