zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-31 05:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include the source latency for movie audio synchronization

Browse source
This commit is contained in:
Chris Robinson 2022-09-28 16:58:01 -07:00 committed by Christoph Oelckers
parent 23fff7791e
commit 7401e02a14
3 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/common/audio/sound/oalsound.cpp
View file

@ -335,18 +335,36 @@ public:
using namespace std::chrono;
std::lock_guard _{Mutex};
// TODO: Get latency using AL_SOFT_source_latency
ALint state{}, offset{}, queued{};
ALint64SOFT offset[2]{};
ALint state{}, queued{};
alGetSourcei(Source, AL_BUFFERS_QUEUED, &queued);
alGetSourcei(Source, AL_SAMPLE_OFFSET, &offset);
if(Renderer->AL.SOFT_source_latency)
{
// AL_SAMPLE_OFFSET_LATENCY_SOFT fills offset[0] with the source sample
// offset in 32.32 fixed-point (which we chop off the sub-sample position
// since it's not crucial), and offset[1] with the playback latency in
// nanoseconds (how many nanoseconds until the sample point in offset[0]
// reaches the DAC).
Renderer->alGetSourcei64vSOFT(Source, AL_SAMPLE_OFFSET_LATENCY_SOFT, offset);
offset[0] >>= 32;
}
else
{
// Without AL_SOFT_source_latency, we can only get the sample offset, no
// latency info.
ALint ioffset{};
alGetSourcei(Source, AL_SAMPLE_OFFSET, &ioffset);
offset[0] = ioffset;
offset[1] = 0;
}
alGetSourcei(Source, AL_SOURCE_STATE, &state);
// If the source is stopped, there was an underrun, so the play position is
// the end of the queue.
if(state == AL_STOPPED)
return Position{Offset + queued*(Data.Size()/FrameSize), nanoseconds{0}};
return Position{Offset + queued*(Data.Size()/FrameSize), nanoseconds{offset[1]}};
// The offset is otherwise valid as long as the source has been started.
if(state != AL_INITIAL)
return Position{Offset + offset, nanoseconds{0}};
return Position{Offset + offset[0], nanoseconds{offset[1]}};
return Position{0, nanoseconds{0}};
}
@ -652,6 +670,7 @@ OpenALSoundRenderer::OpenALSoundRenderer()
AL.EXT_SOURCE_RADIUS = !!alIsExtensionPresent("AL_EXT_SOURCE_RADIUS");
AL.SOFT_deferred_updates = !!alIsExtensionPresent("AL_SOFT_deferred_updates");
AL.SOFT_loop_points = !!alIsExtensionPresent("AL_SOFT_loop_points");
AL.SOFT_source_latency = !!alIsExtensionPresent("AL_SOFT_source_latency");
AL.SOFT_source_resampler = !!alIsExtensionPresent("AL_SOFT_source_resampler");
AL.SOFT_source_spatialize = !!alIsExtensionPresent("AL_SOFT_source_spatialize");
@ -679,6 +698,8 @@ OpenALSoundRenderer::OpenALSoundRenderer()
alProcessUpdatesSOFT = _wrap_ProcessUpdatesSOFT;
}
if(AL.SOFT_source_latency)
LOAD_FUNC(alGetSourcei64vSOFT);
if(AL.SOFT_source_resampler)
LOAD_FUNC(alGetStringiSOFT);

3
src/common/audio/sound/oalsound.h
View file

@ -97,6 +97,7 @@ private:
bool EXT_SOURCE_RADIUS;
bool SOFT_deferred_updates;
bool SOFT_loop_points;
bool SOFT_source_latency;
bool SOFT_source_resampler;
bool SOFT_source_spatialize;
} AL;
@ -146,6 +147,8 @@ private:
LPALGETSTRINGISOFT alGetStringiSOFT;
LPALGETSOURCEI64VSOFT alGetSourcei64vSOFT;
void (ALC_APIENTRY*alcDevicePauseSOFT)(ALCdevice *device);
void (ALC_APIENTRY*alcDeviceResumeSOFT)(ALCdevice *device);

4
src/common/cutscenes/movieplayer.cpp
View file

@ -272,7 +272,9 @@ public:
// Calculate the difference in time between the movie clock and the audio position.
auto pos = stream->GetPlayPosition();
uint64_t clock = clocktime.load(std::memory_order_acquire);
double delay = FilterDelay(clock/1'000'000'000.0 - double(int64_t(pos.samplesplayed)+audiooffset)/samplerate);
double delay = FilterDelay(clock / 1'000'000'000.0 -
double(int64_t(pos.samplesplayed)+audiooffset) / samplerate +
pos.latency.count() / 1'000'000'000.0);
if(delay > 0.0)
{