Skip to content

Check if we are dividing by zero when rescaling #2016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
darbyjohnston wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Check if we are dividing by zero when rescaling #2016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/opentime/rationalTime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ class OPENTIME_API_TYPE RationalTime
/// @brief Returns the time value converted to a new rate.
constexpr double value_rescaled_to(double new_rate) const noexcept
{
return new_rate == _rate ? _value : (_value * new_rate) / _rate;
return new_rate == _rate
? _value
: (_rate > 0 ? (_value * new_rate) / _rate : 0);
}

/// @brief Returns the time value converted to a new rate.
Expand Down
12 changes: 12 additions & 0 deletions tests/test_opentime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ main(int argc, char** argv)
assertFalse(t2.is_invalid_time());
});

tests.add_test("test_rescale", [] {
RationalTime t1(1.0, 1.0);
RationalTime t2 = t1.rescaled_to(24);
assertEqual(t2.value(), 24);
assertEqual(t2.rate(), 24);

// Try rescaling an invalid time:
t2 = RationalTime(1.0, 0.0).rescaled_to(24);
assertEqual(t2.value(), 0);
assertEqual(t2.rate(), 24);
});

tests.add_test("test_equality", [] {
RationalTime t1(30.2);
assertEqual(t1, t1);
Expand Down
Loading