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

VFR code cleanup

Browse source 
Originally committed to SVN as r159.
This commit is contained in:
Rodrigo Braz Monteiro 2006-02-24 23:16:20 +00:00
parent 9e3ffaf523
commit b31d2ae85e
1 changed files with 39 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
core/vfr.cpp
View file

@ -284,36 +284,49 @@ void FrameRate::SetVFR(std::vector<int> newTimes) {
///////////////////////////// /////////////////////////////
// Gets frame number at time // Gets frame number at time
int FrameRate::PFrameAtTime(int ms,bool useceil) { int FrameRate::PFrameAtTime(int ms,bool useceil) {
//wxASSERT(loaded); // Check if it's loaded
if (!loaded) return -1; if (!loaded) return -1;
ms = MAX(ms,0); //fix me, unsafe for GetFrame... for frame 0? // Normalize miliseconds
ms = MAX(ms,0);
// Get for constant frame rate
if (FrameRateType == CFR) { if (FrameRateType == CFR) {
if (useceil) return ceil(double(ms)/1000.0 * AverageFrameRate); double value = double(ms)/1000.0 * AverageFrameRate;
else return floor(double(ms)/1000.0 * AverageFrameRate); if (useceil) return ceil(value);
else return floor(value);
} }
// Get for variable frame rate
else if (FrameRateType == VFR) { else if (FrameRateType == VFR) {
// Inside VFR range
if (ms < floor(last_time)) { if (ms < floor(last_time)) {
// Binary search // Prepare binary search
size_t start = 0; size_t start = 0;
size_t end = last_frame; size_t end = last_frame;
size_t cur; size_t cur;
bool largerEqual; bool largerEqual;
// Do binary search
while (start <= end) { while (start <= end) {
// Current frame being checked
cur = (start+end)>>1; cur = (start+end)>>1;
// Is it larger or equal to searched time?
largerEqual = Frame[cur] >= ms; largerEqual = Frame[cur] >= ms;
// Found // If it is, is the previous smaller?
if (largerEqual && (cur == 0 || Frame[cur-1] < ms)) // If so, this is the frame we're looking for
return cur; if (largerEqual && (cur == 0 || Frame[cur-1] < ms)) return cur;
// Not found // Not found, continue search
if (largerEqual) end = cur-1; if (largerEqual) end = cur-1;
else start = cur+1; else start = cur+1;
} }
} else { }
// After VFR range
else {
return last_frame + floor((ms-last_time) * AverageFrameRate / 1000); return last_frame + floor((ms-last_time) * AverageFrameRate / 1000);
} }
} }
@ -324,19 +337,27 @@ int FrameRate::PFrameAtTime(int ms,bool useceil) {
////////////////////// //////////////////////
// Gets time at frame // Gets time at frame
int FrameRate::PTimeAtFrame(int frame) { int FrameRate::PTimeAtFrame(int frame) {
//wxASSERT(loaded); // Not loaded
if (!loaded) return -1; if (!loaded) return -1;
// For negative/zero times, fallback to zero
if (frame <= 0) return 0; if (frame <= 0) return 0;
// Constant frame rate
if (FrameRateType == CFR) { if (FrameRateType == CFR) {
return floor(double(frame) / AverageFrameRate * 1000.0); return floor(double(frame) / AverageFrameRate * 1000.0);
} else if (FrameRateType == VFR) {
if (frame < last_frame)
return Frame.at(frame);
else
return floor(last_time + double(frame-last_frame) / AverageFrameRate * 1000.0);
} }
// Variable frame rate
else if (FrameRateType == VFR) {
// Is it inside frame rate range? If so, just get the value from timecodes table
if (frame < last_frame) return Frame.at(frame);
// Otherwise, calculate it
else return floor(last_time + double(frame-last_frame) / AverageFrameRate * 1000.0);
}
// Unknown frame rate type
return -1; return -1;
} }