Skip to content

bugfix(audio): Reapply Bink movie volume on first frame #3083

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
CryoTheRenegade wants to merge 7 commits into
base: main
Choose a base branch
from
Open

bugfix(audio): Reapply Bink movie volume on first frame #3083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bc773ef
bugfix(audio): Reapply Bink movie volume every frame
CryoTheRenegade Aug 9, 2026
b34a88c
docs(audio): Correct Bink volume comments per review
CryoTheRenegade Aug 9, 2026
53f7abd
refactor(audio): Apply Bink volume once on first decoded frame
CryoTheRenegade Aug 9, 2026
d46e4b3
fixup(audio): Address Skyaero42 review on Bink volume helper
CryoTheRenegade Aug 10, 2026
9130511
refactor(audio): Push speech volume to Bink movies instead of polling
CryoTheRenegade Aug 10, 2026
87a335d
fixup(audio): Remove stale Bink volume state
CryoTheRenegade Aug 10, 2026
7ed80ac
fixup(audio): Make Bink volume helper private
CryoTheRenegade Aug 11, 2026
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: 4 additions & 0 deletions Core/GameEngine/Include/GameClient/VideoPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ class VideoPlayerInterface : public SubsystemInterface
virtual const FieldParse *getFieldParse() const = 0; ///< Return the field parse info

virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) = 0; ///< Notify the video player that they can now ask for an audio handle, or they need to give theirs up.

virtual void setVolume( Real volume ) = 0; ///< Push a new speech volume to the video player's audio output
};


Expand Down Expand Up @@ -294,6 +296,8 @@ class VideoPlayer : public VideoPlayerInterface

virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) override { }

virtual void setVolume( Real volume ) override { }

// Implementation specific
void remove( VideoStream *stream ); ///< remove stream from active list

Expand Down
5 changes: 5 additions & 0 deletions Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ class BinkVideoStream : public VideoStream

class BinkVideoPlayer : public VideoPlayer
{
private:

// TheSuperHackers @bugfix Compute the Bink volume for a given speech volume.
static Int calculateMovieAudioVolume( Real speechVolume );

protected:

Expand All @@ -127,6 +131,7 @@ class BinkVideoPlayer : public VideoPlayer
virtual VideoStreamInterface* load( AsciiString movieTitle ) override; ///< Load video file in to memory for playback

virtual void notifyVideoPlayerOfNewProvider( Bool nowHasValid ) override;
virtual void setVolume( Real volume ) override;
virtual void initializeBinkWithMiles();
};

Expand Down
6 changes: 6 additions & 0 deletions Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2269,6 +2269,12 @@ void MilesAudioManager::processPlayingList()

if (m_volumeHasChanged) {
m_volumeHasChanged = false;

// Push the new speech volume to any playing movie's audio output, which
// bypasses the Miles mixer and so does not see volume changes on its own.
if (TheVideoPlayer) {
TheVideoPlayer->setVolume(getVolume(AudioAffect_Speech));
}
}
}

Expand Down
35 changes: 27 additions & 8 deletions Core/GameEngineDevice/Source/VideoDevice/Bink/BinkVideoPlayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ void BinkVideoPlayer::reset()
void BinkVideoPlayer::update()
{
VideoPlayer::update();

@Skyaero42 Skyaero42 Aug 11, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

come on now...

@xezon xezon Aug 11, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it is not a good idea to prompt the LLM to revert whatever it did, and use a diff tool instead.

@CryoTheRenegade CryoTheRenegade Aug 11, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should i revert the whitespace?

}

//============================================================================
Expand Down Expand Up @@ -202,18 +201,38 @@ VideoStreamInterface* BinkVideoPlayer::createStream( HBINK handle )
stream->m_player = this;
m_firstStream = stream;

// never let volume go to 0, as Bink will interpret that as "play at full volume".
Int mod = (Int) ((TheAudio->getVolume(AudioAffect_Speech) * 0.8f) * 100) + 1;
Int volume = (32768*mod)/100;
DEBUG_LOG(("BinkVideoPlayer::createStream() - About to set volume (%g -> %d -> %d",
TheAudio->getVolume(AudioAffect_Speech), mod, volume));
BinkSetVolume( stream->m_handle,0, volume);
DEBUG_LOG(("BinkVideoPlayer::createStream() - set volume"));
BinkSetVolume( stream->m_handle, 0, calculateMovieAudioVolume(TheAudio->getVolume(AudioAffect_Speech)) );
}

return stream;
}

//============================================================================
// BinkVideoPlayer::calculateMovieAudioVolume
//============================================================================

Int BinkVideoPlayer::calculateMovieAudioVolume( Real speechVolume )
{
// Never let volume go to 0, as Bink will interpret that as "play at full
// volume".
Int mod = (Int) ((speechVolume * 0.8f) * 100) + 1;
return (32768*mod)/100;
}

//============================================================================
// BinkVideoPlayer::setVolume
//============================================================================

void BinkVideoPlayer::setVolume( Real volume )
{
// Push the new volume to every open stream's audio output.
Int binkVolume = calculateMovieAudioVolume( volume );
for ( VideoStreamInterface *stream = firstStream(); stream != nullptr; stream = stream->next() )
{
BinkSetVolume( static_cast<BinkVideoStream*>( stream )->m_handle, 0, binkVolume );
}
}

//============================================================================
// BinkVideoPlayer::open
//============================================================================
Expand Down
Loading