From 41a53d70bdc025da3f2b5448df0b831d97b44b99 Mon Sep 17 00:00:00 2001 From: shenweip <1037567878@qq.com> Date: Thu, 27 Feb 2020 19:21:27 +0800 Subject: [PATCH] Rename func. --- Core/HLE/scePsmf.cpp | 4 ++-- Core/HW/MediaEngine.cpp | 2 +- Core/HW/MediaEngine.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index 7e20ab46a2..458c0097f0 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -234,7 +234,7 @@ public: bool HasReachedEnd() { // The pts are ignored - the end is when we're out of data. - return mediaengine->IsVideoEnd() && (mediaengine->IsNoAudioData() || !mediaengine->IsActuallyPlayAudio()); + return mediaengine->IsVideoEnd() && (mediaengine->IsNoAudioData() || !mediaengine->IsActuallyPlayingAudio()); } u32 filehandle; @@ -1617,7 +1617,7 @@ static int scePsmfPlayerGetVideoData(u32 psmfPlayer, u32 videoDataAddr) bool doVideoStep = true; if (psmfplayer->playMode == PSMF_PLAYER_MODE_PAUSE) { doVideoStep = false; - } else if (!psmfplayer->mediaengine->IsNoAudioData() && psmfplayer->mediaengine->IsActuallyPlayAudio()) { + } else if (!psmfplayer->mediaengine->IsNoAudioData() && psmfplayer->mediaengine->IsActuallyPlayingAudio()) { s64 deltapts = psmfplayer->mediaengine->getVideoTimeStamp() - psmfplayer->mediaengine->getAudioTimeStamp(); // Don't skip the very first frame, sometimes audio starts with an early timestamp. if (deltapts > 0 && psmfplayer->mediaengine->getVideoTimeStamp() > 0) { diff --git a/Core/HW/MediaEngine.cpp b/Core/HW/MediaEngine.cpp index 968800c70c..1f8113f011 100644 --- a/Core/HW/MediaEngine.cpp +++ b/Core/HW/MediaEngine.cpp @@ -970,7 +970,7 @@ bool MediaEngine::IsNoAudioData() { return !m_demux->hasNextAudioFrame(NULL, NULL, NULL, NULL); } -bool MediaEngine::IsActuallyPlayAudio() { +bool MediaEngine::IsActuallyPlayingAudio() { return getAudioTimeStamp() >= 0; } diff --git a/Core/HW/MediaEngine.h b/Core/HW/MediaEngine.h index cbddd638ff..ff3a032424 100644 --- a/Core/HW/MediaEngine.h +++ b/Core/HW/MediaEngine.h @@ -87,7 +87,7 @@ public: bool IsVideoEnd() { return m_isVideoEnd; } bool IsNoAudioData(); - bool IsActuallyPlayAudio(); + bool IsActuallyPlayingAudio(); int VideoWidth() { return m_desWidth; } int VideoHeight() { return m_desHeight; }