dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-07-10 02:04:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to decoder loop logic (#4648)

Browse Source
This commit is contained in:
Stephen Miller 2026-06-30 11:21:56 -05:00 committed by GitHub
parent 1d5447b74c
commit b6026cc65d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/libraries/avplayer/avplayer_source.cpp
View File

@ -361,7 +361,8 @@ bool AvPlayerSource::GetVideoData(AvPlayerFrameInfoEx& video_info) {
const auto& new_frame = m_video_frames.Front();
if (m_state.GetSyncMode() == AvPlayerAvSyncMode::Default) {
if (m_audio_stream_index) {
if (m_audio_stream_index && m_audio_decoder_thread.Joinable()) {
// Audio is available, sync video with it.
if (new_frame.info.timestamp > m_last_audio_ts.value_or(0)) {
return false;
}
@ -573,12 +574,15 @@ void AvPlayerSource::DemuxerThread(std::stop_token stop) {
m_audio_packets_cv.Notify();
m_video_frames_cv.Notify();
m_audio_frames_cv.Notify();
m_video_buffers_cv.Notify();
m_audio_buffers_cv.Notify();
m_video_decoder_thread.Join();
m_audio_decoder_thread.Join();
m_state.OnEOF();
LOG_INFO(Lib_AvPlayer, "Demuxer Thread exited normally");
m_demuxer_thread.Join();
}
AvPlayerSource::AVFramePtr AvPlayerSource::ConvertVideoFrame(const AVFrame& frame) {
@ -709,8 +713,8 @@ void AvPlayerSource::VideoDecoderThread(std::stop_token stop) {
LOG_INFO(Lib_AvPlayer, "Video Decoder Thread started");
while ((!m_is_eof || m_video_packets.Size() != 0) && !stop.stop_requested()) {
if (!m_video_packets_cv.Wait(stop,
[this] { return m_video_packets.Size() != 0 || m_is_eof; })) {
if (m_video_packets.Size() == 0 &&
!m_video_packets_cv.Wait(stop, [this] { return m_video_packets.Size() != 0; })) {
continue;
}
const auto packet = m_video_packets.Pop();
@ -726,12 +730,10 @@ void AvPlayerSource::VideoDecoderThread(std::stop_token stop) {
return;
}
while (res >= 0) {
if (!m_video_buffers_cv.Wait(stop, [this] { return m_video_buffers.Size() != 0; })) {
if (m_video_buffers.Size() == 0 &&
!m_video_buffers_cv.Wait(stop, [this] { return m_video_buffers.Size() != 0; })) {
break;
}
if (m_video_buffers.Size() == 0) {
continue;
}
auto up_frame = AVFramePtr(av_frame_alloc(), &ReleaseAVFrame);
res = avcodec_receive_frame(m_video_codec_context.get(), up_frame.get());
if (res < 0) {
@ -767,6 +769,7 @@ void AvPlayerSource::VideoDecoderThread(std::stop_token stop) {
}
LOG_INFO(Lib_AvPlayer, "Video Decoder Thread exited normally");
m_video_decoder_thread.Join();
}
AvPlayerSource::AVFramePtr AvPlayerSource::ConvertAudioFrame(const AVFrame& frame) {
@ -832,8 +835,8 @@ void AvPlayerSource::AudioDecoderThread(std::stop_token stop) {
LOG_INFO(Lib_AvPlayer, "Audio Decoder Thread started");
while ((!m_is_eof || m_audio_packets.Size() != 0) && !stop.stop_requested()) {
if (!m_audio_packets_cv.Wait(stop,
[this] { return m_audio_packets.Size() != 0 || m_is_eof; })) {
if (m_audio_packets.Size() == 0 &&
!m_audio_packets_cv.Wait(stop, [this] { return m_audio_packets.Size() != 0; })) {
continue;
}
const auto packet = m_audio_packets.Pop();
@ -848,12 +851,10 @@ void AvPlayerSource::AudioDecoderThread(std::stop_token stop) {
return;
}
while (res >= 0) {
if (!m_audio_buffers_cv.Wait(stop, [this] { return m_audio_buffers.Size() != 0; })) {
if (m_audio_buffers.Size() == 0 &&
!m_audio_buffers_cv.Wait(stop, [this] { return m_audio_buffers.Size() != 0; })) {
break;
}
if (m_audio_buffers.Size() == 0) {
continue;
}
auto up_frame = AVFramePtr(av_frame_alloc(), &ReleaseAVFrame);
res = avcodec_receive_frame(m_audio_codec_context.get(), up_frame.get());
@ -886,6 +887,7 @@ void AvPlayerSource::AudioDecoderThread(std::stop_token stop) {
}
LOG_INFO(Lib_AvPlayer, "Audio Decoder Thread exited normally");
m_audio_decoder_thread.Join();
}
bool AvPlayerSource::HasRunningThreads() const {