Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-08 11:33:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename func.

Browse Source
This commit is contained in:
shenweip 2020-02-27 19:21:27 +08:00
parent 6eb1d1b742
commit 41a53d70bd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/HLE/scePsmf.cpp
View File

@ -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) {

2
Core/HW/MediaEngine.cpp
View File

@ -970,7 +970,7 @@ bool MediaEngine::IsNoAudioData() {
return !m_demux->hasNextAudioFrame(NULL, NULL, NULL, NULL);
}
bool MediaEngine::IsActuallyPlayAudio() {
bool MediaEngine::IsActuallyPlayingAudio() {
return getAudioTimeStamp() >= 0;
}

2
Core/HW/MediaEngine.h
View File

@ -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; }