From c808aad59554d5e2a84423913190e82abd62e929 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 27 Sep 2022 17:32:12 -0700 Subject: [PATCH] Play the VPX "soundtrack" as a SoundStream --- src/common/audio/music/music.cpp | 3 +- src/common/audio/music/s_music.h | 6 ++- src/common/cutscenes/movieplayer.cpp | 56 +++++++++++++++++++++++++--- src/common/cutscenes/playmve.cpp | 2 +- 4 files changed, 59 insertions(+), 8 deletions(-) diff --git a/src/common/audio/music/music.cpp b/src/common/audio/music/music.cpp index ffc0b5ad8..37617761e 100644 --- a/src/common/audio/music/music.cpp +++ b/src/common/audio/music/music.cpp @@ -117,10 +117,11 @@ int MusicEnabled() // int return is for scripting static std::unique_ptr musicStream; static TArray customStreams; -SoundStream *S_CreateCustomStream(size_t size, int samplerate, int numchannels, StreamCallback cb, void *userdata) +SoundStream *S_CreateCustomStream(size_t size, int samplerate, int numchannels, MusicCustomStreamType sampletype, StreamCallback cb, void *userdata) { int flags = 0; if (numchannels < 2) flags |= SoundStream::Mono; + if (sampletype == MusicSamplesFloat) flags |= SoundStream::Float; auto stream = GSnd->CreateStream(cb, int(size), flags, samplerate, userdata); if (stream) { diff --git a/src/common/audio/music/s_music.h b/src/common/audio/music/s_music.h index fc1b86ca0..1970a57da 100644 --- a/src/common/audio/music/s_music.h +++ b/src/common/audio/music/s_music.h @@ -11,9 +11,13 @@ class FileReader; class SoundStream; +enum MusicCustomStreamType : bool { + MusicSamples16bit, + MusicSamplesFloat +}; int MusicEnabled(); typedef bool(*StreamCallback)(SoundStream* stream, void* buff, int len, void* userdata); -SoundStream *S_CreateCustomStream(size_t size, int samplerate, int numchannels, StreamCallback cb, void *userdata); +SoundStream *S_CreateCustomStream(size_t size, int samplerate, int numchannels, MusicCustomStreamType sampletype, StreamCallback cb, void *userdata); void S_StopCustomStream(SoundStream* stream); void S_PauseAllCustomStreams(bool on); diff --git a/src/common/cutscenes/movieplayer.cpp b/src/common/cutscenes/movieplayer.cpp index a13d0c91e..e57c24c66 100644 --- a/src/common/cutscenes/movieplayer.cpp +++ b/src/common/cutscenes/movieplayer.cpp @@ -47,6 +47,8 @@ #include "filesystem.h" #include "vm.h" #include "printf.h" +#include +#include "filereadermusicinterface.h" class MoviePlayer { @@ -221,6 +223,9 @@ class VpxPlayer : public MoviePlayer AnimTextures animtex; const TArray animSnd; + ZMusic_MusicStream MusicStream = nullptr; + SoundStream *AudioStream = nullptr; + unsigned width, height; TArray Pic; TArray readBuf; @@ -240,6 +245,12 @@ class VpxPlayer : public MoviePlayer public: int soundtrack = -1; + bool StreamCallback(SoundStream*, void *buff, int len) + { + return ZMusic_FillStream(MusicStream, buff, len); + } + static bool StreamCallbackC(SoundStream *stream, void *buff, int len, void *userdata) + { return static_cast(userdata)->StreamCallback(stream, buff, len); } public: bool isvalid() { return !failed; } @@ -405,9 +416,36 @@ public: void Start() override { - if (soundtrack > 0) + if (soundtrack >= 0 && !AudioStream) { - S_ChangeMusic(fileSystem.GetFileFullName(soundtrack, false), 0, false); + S_StopMusic(true); + FileReader reader = fileSystem.OpenFileReader(soundtrack); + if (reader.isOpen()) + { + MusicStream = ZMusic_OpenSong(GetMusicReader(reader), MDEV_DEFAULT, nullptr); + } + if (MusicStream) + { + SoundStreamInfo info{}; + ZMusic_GetStreamInfo(MusicStream, &info); + // if mBufferSize == 0, the music stream is played externally (e.g. + // Windows' MIDI synth), which we can't keep synced. Play anyway? + if (info.mBufferSize > 0 && ZMusic_Start(MusicStream, 0, false)) + { + AudioStream = S_CreateCustomStream(6000, info.mSampleRate, abs(info.mNumChannels), + (info.mNumChannels < 0) ? MusicSamples16bit : MusicSamplesFloat, + &StreamCallbackC, this); + } + if (!AudioStream) + { + ZMusic_Close(MusicStream); + MusicStream = nullptr; + } + } + } + else if (AudioStream) + { + AudioStream->SetPaused(false); } animtex.SetSize(AnimTexture::YUV, width, height); } @@ -461,9 +499,12 @@ public: return !stop; } - void Stop() + void Stop() override { - S_StopMusic(true); + if (AudioStream) + { + AudioStream->SetPaused(true); + } bool nostopsound = (flags & NOSOUNDCUTOFF); if (!nostopsound) soundEngine->StopAllChannels(); } @@ -472,6 +513,11 @@ public: { vpx_codec_destroy(&codec); animtex.Clean(); + if(AudioStream) + { + S_StopCustomStream(AudioStream); + ZMusic_Close(MusicStream); + } } FTextureID GetTexture() override @@ -618,7 +664,7 @@ public: if (adata.inf.bitsPerSample == 8) copy8bitSamples(read); else copy16bitSamples(read); if (!stream && read) // the sound may not start in the first frame, but the stream cannot start without any sound data present. - stream = S_CreateCustomStream(6000, adata.inf.sampleRate, adata.inf.nChannels, StreamCallbackFunc, this); + stream = S_CreateCustomStream(6000, adata.inf.sampleRate, adata.inf.nChannels, MusicSamples16bit, StreamCallbackFunc, this); } diff --git a/src/common/cutscenes/playmve.cpp b/src/common/cutscenes/playmve.cpp index 26165de0e..ffd830d19 100644 --- a/src/common/cutscenes/playmve.cpp +++ b/src/common/cutscenes/playmve.cpp @@ -291,7 +291,7 @@ bool InterplayDecoder::RunFrame(uint64_t clock) if (!bAudioStarted) { // start audio playback - stream = S_CreateCustomStream(6000, audio.nSampleRate, audio.nChannels, StreamCallbackFunc, this); + stream = S_CreateCustomStream(6000, audio.nSampleRate, audio.nChannels, MusicSamples16bit, StreamCallbackFunc, this); bAudioStarted = true; }