Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Yet another attempt to get libVLC to reliably set the audio volume.

Browse source
This commit is contained in:
Leon Styhre 2021-01-29 21:46:48 +01:00
parent 8f1108583c
commit dc3a936595
2 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
es-core/src/components/VideoVlcComponent.cpp
View file

@ -94,6 +94,7 @@ void VideoVlcComponent::setupContext()
mContext.mutex = SDL_CreateMutex(); mContext.mutex = SDL_CreateMutex();
mContext.valid = true; mContext.valid = true;
resize(); resize();
mHasSetAudioVolume = false;
} }
} }
@ -155,6 +156,14 @@ void VideoVlcComponent::resize()
void VideoVlcComponent::render(const Transform4x4f& parentTrans) void VideoVlcComponent::render(const Transform4x4f& parentTrans)
{ {
// Set the audio volume. As libVLC is very unreliable we need to make an additional
// attempt here in the render loop in addition to the initialization in startVideo().
// This is required under some circumstances such as when running on a slow computer
// or sometimes even on a faster machine when changing to the video view style or
// when starting the application directly into a gamelist.
if (!mHasSetAudioVolume && mMediaPlayer)
setAudioVolume();
VideoComponent::render(parentTrans); VideoComponent::render(parentTrans);
Transform4x4f trans = parentTrans * getTransform(); Transform4x4f trans = parentTrans * getTransform();
GuiComponent::renderChildren(trans); GuiComponent::renderChildren(trans);
@ -276,6 +285,27 @@ void VideoVlcComponent::calculateBlackRectangle()
} }
} }
void VideoVlcComponent::setAudioVolume()
{
if (mMediaPlayer && libvlc_media_player_get_state(mMediaPlayer) == libvlc_Playing) {
// This small delay may avoid a race condition in libVLC that could crash the application.
SDL_Delay(2);
if ((!Settings::getInstance()->getBool("GamelistVideoAudio") &&
!mScreensaverMode) ||
(!Settings::getInstance()->getBool("ScreensaverVideoAudio") &&
mScreensaverMode)) {
libvlc_audio_set_volume(mMediaPlayer, 0);
}
else {
if (libvlc_audio_get_mute(mMediaPlayer) == 1)
libvlc_audio_set_mute(mMediaPlayer, 0);
libvlc_audio_set_volume(mMediaPlayer,
Settings::getInstance()->getInt("SoundVolumeVideos"));
}
mHasSetAudioVolume = true;
}
}
void VideoVlcComponent::startVideo() void VideoVlcComponent::startVideo()
{ {
if (!mIsPlaying) { if (!mIsPlaying) {
@ -406,20 +436,11 @@ void VideoVlcComponent::startVideo()
}; };
} }
if (state == libvlc_Playing) { // Attempt to set the audio volume. Under some circumstances it could fail
if ((!Settings::getInstance()->getBool("GamelistVideoAudio") && // as libVLC may not be correctly initialized. Therefore there is an
!mScreensaverMode) || // additional call to this function in the render() loop.
(!Settings::getInstance()->getBool("ScreensaverVideoAudio") && setAudioVolume();
mScreensaverMode)) {
libvlc_audio_set_volume(mMediaPlayer, 0);
}
else {
if (libvlc_audio_get_mute(mMediaPlayer) == 1)
libvlc_audio_set_mute(mMediaPlayer, 0);
libvlc_audio_set_volume(mMediaPlayer,
Settings::getInstance()->getInt("SoundVolumeVideos"));
}
}
// Update the playing state. // Update the playing state.
mIsPlaying = true; mIsPlaying = true;
mFadeIn = 0.0f; mFadeIn = 0.0f;

2
es-core/src/components/VideoVlcComponent.h
View file

@ -53,6 +53,7 @@ private:
void render(const Transform4x4f& parentTrans) override; void render(const Transform4x4f& parentTrans) override;
void calculateBlackRectangle(); void calculateBlackRectangle();
void setAudioVolume();
// Start the video immediately. // Start the video immediately.
virtual void startVideo() override; virtual void startVideo() override;
@ -70,6 +71,7 @@ private:
libvlc_media_t* mMedia; libvlc_media_t* mMedia;
libvlc_media_player_t* mMediaPlayer; libvlc_media_player_t* mMediaPlayer;
VideoContext mContext; VideoContext mContext;
bool mHasSetAudioVolume;
std::shared_ptr<TextureResource> mTexture; std::shared_ptr<TextureResource> mTexture;
std::vector<float> mVideoRectangleCoords; std::vector<float> mVideoRectangleCoords;
}; };