reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-20 21:03:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winmm: Fix conversion to MMTIME, avoid floating point arithmetic.

Browse Source
This commit is contained in:
Jörg Höhle 2012-01-04 20:54:48 +01:00 committed by Alexandre Julliard
parent 8e755152c2
commit 9ef4a0099c
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/winmm/tests/wave.c
View File

@ -471,10 +471,10 @@ DWORD time_to_bytes(LPMMTIME mmtime, LPWAVEFORMATEX pwfx)
else if (mmtime->wType == TIME_MS)
return mmtime->u.ms * pwfx->nAvgBytesPerSec / 1000;
else if (mmtime->wType == TIME_SMPTE)
return ((mmtime->u.smpte.hour * 60.0 * 60.0) +
(mmtime->u.smpte.min * 60.0) +
(mmtime->u.smpte.sec) +
(mmtime->u.smpte.frame / 30.0)) * pwfx->nAvgBytesPerSec;
return ((mmtime->u.smpte.hour * 60 * 60) +
(mmtime->u.smpte.min * 60) +
(mmtime->u.smpte.sec)) * pwfx->nAvgBytesPerSec +
mmtime->u.smpte.frame * pwfx->nAvgBytesPerSec / 30;
trace("FIXME: time_to_bytes() type not supported\n");
return -1;

27
dlls/winmm/waveform.c
View File

@ -1723,32 +1723,25 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames,
time->u.sample = played_frames;
return MMSYSERR_NOERROR;
case TIME_MS:
time->u.ms = (DWORD)((played_frames / (double)sample_rate) * 1000);
time->u.ms = (UINT64)played_frames * 1000 / sample_rate;
return MMSYSERR_NOERROR;
case TIME_SMPTE:
time->u.smpte.fps = 30;
if(played_frames >= sample_rate){
time->u.smpte.sec = played_frames / (double)sample_rate;
time->u.smpte.min = time->u.smpte.sec / 60;
time->u.smpte.hour = time->u.smpte.min / 60;
time->u.smpte.sec %= 60;
time->u.smpte.min %= 60;
played_frames %= sample_rate;
}else{
time->u.smpte.sec = 0;
time->u.smpte.min = 0;
time->u.smpte.hour = 0;
}
time->u.smpte.frame = (played_frames / (double)sample_rate) * 30;
played_frames += sample_rate / time->u.smpte.fps - 1; /* round up */
time->u.smpte.frame = (played_frames % sample_rate) * time->u.smpte.fps / sample_rate;
played_frames /= sample_rate; /* yields seconds */
time->u.smpte.sec = played_frames % 60;
played_frames /= 60;
time->u.smpte.min = played_frames % 60;
time->u.smpte.hour= played_frames / 60;
return MMSYSERR_NOERROR;
case TIME_BYTES:
default:
time->wType = TIME_BYTES;
/* fall through */
case TIME_BYTES:
time->u.cb = played_frames * bytes_per_frame;
return MMSYSERR_NOERROR;
}
return MMSYSERR_ERROR;
}
static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time)