diff options
| author | Robin Gareus <robin@gareus.org> | 2014-07-06 22:43:53 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-07-06 22:44:22 +0200 |
| commit | cabed6ffce4a22680b967e0e2d211a75874f5b92 (patch) | |
| tree | 186163138e5c0247be4bc164a69732a161dc3636 /libs/timecode | |
| parent | 6d97d72999bd8a3283eb09ebae3e55a1c9500d86 (diff) | |
fix timecode > 2^31 samples calculation on 32bit systems
Diffstat (limited to 'libs/timecode')
| -rw-r--r-- | libs/timecode/src/time.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libs/timecode/src/time.cc b/libs/timecode/src/time.cc index cf2c4a1b3e..1fd78c1abb 100644 --- a/libs/timecode/src/time.cc +++ b/libs/timecode/src/time.cc @@ -716,11 +716,18 @@ timecode_to_sample( frame_rate() in the non-integer Timecode rate case. */ - sample = (int64_t)lrint((((timecode.hours * 60 * 60) + (timecode.minutes * 60) + timecode.seconds) * (lrint(timecode.rate) * frames_per_timecode_frame)) + (timecode.frames * frames_per_timecode_frame)); + sample = (int64_t) rint( + ( + ((timecode.hours * 60 * 60) + (timecode.minutes * 60) + timecode.seconds) + * + (rint(timecode.rate) * frames_per_timecode_frame) + ) + + (timecode.frames * frames_per_timecode_frame) + ); } if (use_subframes) { - sample += (int64_t) lrint(((double)timecode.subframes * frames_per_timecode_frame) / (double)subframes_per_frame); + sample += (int64_t) rint(((double)timecode.subframes * frames_per_timecode_frame) / (double)subframes_per_frame); } if (use_offset) { @@ -786,7 +793,7 @@ sample_to_timecode ( const int64_t D = frameNumber / 17982; const int64_t M = frameNumber % 17982; - timecode.subframes = lrint(subframes_per_frame + timecode.subframes = rint(subframes_per_frame * ((double)offset_sample * timecode_frames_per_second / sample_frame_rate - (double)frameNumber)); if (timecode.subframes == subframes_per_frame) { @@ -806,7 +813,7 @@ sample_to_timecode ( double timecode_frames_fraction; int64_t timecode_frames_left; const double frames_per_timecode_frame = sample_frame_rate / timecode_frames_per_second; - const int64_t frames_per_hour = (int64_t)(3600 * lrint(timecode_frames_per_second) * frames_per_timecode_frame); + const int64_t frames_per_hour = (int64_t)(3600. * rint(timecode_frames_per_second) * frames_per_timecode_frame); timecode.hours = offset_sample / frames_per_hour; @@ -815,7 +822,7 @@ sample_to_timecode ( timecode_frames_left_exact = (double)(offset_sample % frames_per_hour) / frames_per_timecode_frame; timecode_frames_fraction = timecode_frames_left_exact - floor( timecode_frames_left_exact ); - timecode.subframes = (int32_t) lrint(timecode_frames_fraction * subframes_per_frame); + timecode.subframes = (int32_t) rint(timecode_frames_fraction * subframes_per_frame); timecode_frames_left = (int64_t) floor (timecode_frames_left_exact); if (use_subframes && timecode.subframes == subframes_per_frame) { |