mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-01-21 05:51:39 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

core: name avplayer threads

Browse source
This commit is contained in:
Daniel R. 2024-09-19 20:19:29 +02:00
parent 185667a44d
commit 63409fb26d
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/libraries/avplayer/avplayer_source.cpp
View file

@ -7,6 +7,8 @@
#include "common/alignment.h" #include "common/alignment.h"
#include "common/singleton.h" #include "common/singleton.h"
#include "common/thread.h"
#include "core/file_sys/fs.h" #include "core/file_sys/fs.h"
#include "core/libraries/kernel/time_management.h" #include "core/libraries/kernel/time_management.h"
@ -432,6 +434,8 @@ void AvPlayerSource::ReleaseAVFormatContext(AVFormatContext* context) {
void AvPlayerSource::DemuxerThread(std::stop_token stop) { void AvPlayerSource::DemuxerThread(std::stop_token stop) {
using namespace std::chrono; using namespace std::chrono;
Common::SetCurrentThreadName("shadPS4:AvDemuxer");
if (!m_audio_stream_index.has_value() && !m_video_stream_index.has_value()) { if (!m_audio_stream_index.has_value() && !m_video_stream_index.has_value()) {
LOG_WARNING(Lib_AvPlayer, "Could not start DEMUXER thread. No streams enabled."); LOG_WARNING(Lib_AvPlayer, "Could not start DEMUXER thread. No streams enabled.");
return; return;
@ -499,7 +503,7 @@ void AvPlayerSource::DemuxerThread(std::stop_token stop) {
} }
m_state.OnEOF(); m_state.OnEOF();
LOG_INFO(Lib_AvPlayer, "Demuxer Thread exited normaly"); LOG_INFO(Lib_AvPlayer, "Demuxer Thread exited normally");
} }
AvPlayerSource::AVFramePtr AvPlayerSource::ConvertVideoFrame(const AVFrame& frame) { AvPlayerSource::AVFramePtr AvPlayerSource::ConvertVideoFrame(const AVFrame& frame) {
@ -598,6 +602,8 @@ Frame AvPlayerSource::PrepareVideoFrame(FrameBuffer buffer, const AVFrame& frame
void AvPlayerSource::VideoDecoderThread(std::stop_token stop) { void AvPlayerSource::VideoDecoderThread(std::stop_token stop) {
using namespace std::chrono; using namespace std::chrono;
Common::SetCurrentThreadName("shadPS4:AvVideoDecoder");
LOG_INFO(Lib_AvPlayer, "Video Decoder Thread started"); LOG_INFO(Lib_AvPlayer, "Video Decoder Thread started");
while ((!m_is_eof || m_video_packets.Size() != 0) && !stop.stop_requested()) { while ((!m_is_eof || m_video_packets.Size() != 0) && !stop.stop_requested()) {
if (!m_video_packets_cv.Wait(stop, if (!m_video_packets_cv.Wait(stop,
@ -653,7 +659,7 @@ void AvPlayerSource::VideoDecoderThread(std::stop_token stop) {
} }
} }
LOG_INFO(Lib_AvPlayer, "Video Decoder Thread exited normaly"); LOG_INFO(Lib_AvPlayer, "Video Decoder Thread exited normally");
} }
AvPlayerSource::AVFramePtr AvPlayerSource::ConvertAudioFrame(const AVFrame& frame) { AvPlayerSource::AVFramePtr AvPlayerSource::ConvertAudioFrame(const AVFrame& frame) {
@ -718,6 +724,8 @@ Frame AvPlayerSource::PrepareAudioFrame(FrameBuffer buffer, const AVFrame& frame
void AvPlayerSource::AudioDecoderThread(std::stop_token stop) { void AvPlayerSource::AudioDecoderThread(std::stop_token stop) {
using namespace std::chrono; using namespace std::chrono;
Common::SetCurrentThreadName("shadPS4:AvAudioDecoder");
LOG_INFO(Lib_AvPlayer, "Audio Decoder Thread started"); LOG_INFO(Lib_AvPlayer, "Audio Decoder Thread started");
while ((!m_is_eof || m_audio_packets.Size() != 0) && !stop.stop_requested()) { while ((!m_is_eof || m_audio_packets.Size() != 0) && !stop.stop_requested()) {
if (!m_audio_packets_cv.Wait(stop, if (!m_audio_packets_cv.Wait(stop,
@ -773,7 +781,7 @@ void AvPlayerSource::AudioDecoderThread(std::stop_token stop) {
} }
} }
LOG_INFO(Lib_AvPlayer, "Audio Decoder Thread exited normaly"); LOG_INFO(Lib_AvPlayer, "Audio Decoder Thread exited normally");
} }
bool AvPlayerSource::HasRunningThreads() const { bool AvPlayerSource::HasRunningThreads() const {

3
src/core/libraries/avplayer/avplayer_state.cpp
View file

@ -5,6 +5,8 @@
#include "avplayer_source.h" #include "avplayer_source.h"
#include "avplayer_state.h" #include "avplayer_state.h"
#include "common/thread.h"
#include "core/libraries/error_codes.h" #include "core/libraries/error_codes.h"
#include "core/libraries/kernel/time_management.h" #include "core/libraries/kernel/time_management.h"
@ -178,6 +180,7 @@ bool AvPlayerState::Start() {
void AvPlayerState::AvControllerThread(std::stop_token stop) { void AvPlayerState::AvControllerThread(std::stop_token stop) {
using std::chrono::milliseconds; using std::chrono::milliseconds;
Common::SetCurrentThreadName("shadPS4:AvController");
while (!stop.stop_requested()) { while (!stop.stop_requested()) {
if (m_event_queue.Size() != 0) { if (m_event_queue.Size() != 0) {