Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add crc record to psmfplayer

Browse source
This commit is contained in:
sum2012 2022-10-04 09:50:33 +08:00
parent bbe9c41098
commit af93a7185b
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/HLE/sceKernelModule.cpp
View file

@ -1181,7 +1181,7 @@ static PSPModule *__KernelLoadELFFromPtr(const u8 *ptr, size_t elfSize, u32 load
__MpegLoadModule(ver, crcstring); __MpegLoadModule(ver, crcstring);
} }
if (!strcmp(head->modname, "scePsmfP_library") || !strcmp(head->modname, "scePsmfPlayer")) { if (!strcmp(head->modname, "scePsmfP_library") || !strcmp(head->modname, "scePsmfPlayer")) {
__PsmfPlayerLoadModule(head->devkitversion); __PsmfPlayerLoadModule(head->devkitversion, crcstring);
} }
} }
@ -1617,7 +1617,7 @@ static PSPModule *__KernelLoadELFFromPtr(const u8 *ptr, size_t elfSize, u32 load
__MpegLoadModule(modinfo->moduleVersion, crcstring); __MpegLoadModule(modinfo->moduleVersion, crcstring);
} }
if (!strcmp(modinfo->name, "scePsmfP_library") || !strcmp(modinfo->name, "scePsmfPlayer")) { if (!strcmp(modinfo->name, "scePsmfP_library") || !strcmp(modinfo->name, "scePsmfPlayer")) {
__PsmfPlayerLoadModule(devkitVersion); __PsmfPlayerLoadModule(devkitVersion, crcstring);
} }
} }

14
Core/HLE/scePsmf.cpp
View file

@ -59,6 +59,7 @@ static const int audioSamplesBytes = audioSamples * 4;
static int videoPixelMode = GE_CMODE_32BIT_ABGR8888; static int videoPixelMode = GE_CMODE_32BIT_ABGR8888;
static int videoLoopStatus = PSMF_PLAYER_CONFIG_NO_LOOP; static int videoLoopStatus = PSMF_PLAYER_CONFIG_NO_LOOP;
static int psmfPlayerLibVersion = 0; static int psmfPlayerLibVersion = 0;
static std::string psmfPlayerLibcrcstring = "null";
int eventPsmfPlayerStatusChange = -1; int eventPsmfPlayerStatusChange = -1;
@ -696,8 +697,9 @@ void __PsmfInit() {
eventPsmfPlayerStatusChange = CoreTiming::RegisterEvent("PsmfPlayerStatusChange", &__PsmfPlayerStatusChange); eventPsmfPlayerStatusChange = CoreTiming::RegisterEvent("PsmfPlayerStatusChange", &__PsmfPlayerStatusChange);
} }
void __PsmfPlayerLoadModule(int devkitVersion) { void __PsmfPlayerLoadModule(int devkitVersion, std::string crcstr) {
psmfPlayerLibVersion = devkitVersion; psmfPlayerLibVersion = devkitVersion;
psmfPlayerLibcrcstring = crcstr;
} }
void __PsmfDoState(PointerWrap &p) { void __PsmfDoState(PointerWrap &p) {
@ -722,6 +724,11 @@ void __PsmfPlayerDoState(PointerWrap &p) {
Do(p, eventPsmfPlayerStatusChange); Do(p, eventPsmfPlayerStatusChange);
} }
CoreTiming::RestoreRegisterEvent(eventPsmfPlayerStatusChange, "PsmfPlayerStatusChangeEvent", &__PsmfPlayerStatusChange); CoreTiming::RestoreRegisterEvent(eventPsmfPlayerStatusChange, "PsmfPlayerStatusChangeEvent", &__PsmfPlayerStatusChange);
if (s < 3) {
psmfPlayerLibcrcstring = "null";
} else {
Do(p, psmfPlayerLibcrcstring);
}
if (s < 2) { if (s < 2) {
// Assume the latest, which is what we were emulating before. // Assume the latest, which is what we were emulating before.
psmfPlayerLibVersion = 0x06060010; psmfPlayerLibVersion = 0x06060010;
@ -1157,7 +1164,8 @@ static int scePsmfPlayerCreate(u32 psmfPlayer, u32 dataPtr) {
int delayUs = 20000; int delayUs = 20000;
DelayPsmfStateChange(psmfPlayer, PSMF_PLAYER_STATUS_INIT, delayUs); DelayPsmfStateChange(psmfPlayer, PSMF_PLAYER_STATUS_INIT, delayUs);
return hleLogSuccessInfoI(ME, hleDelayResult(0, "player create", delayUs)); INFO_LOG(ME, "psmfplayer create, psmfPlayerLibVersion 0x%0x, psmfPlayerLibcrcstring %s", psmfPlayerLibVersion, psmfPlayerLibcrcstring.c_str());
return hleDelayResult(0, "player create", delayUs);
} }
static int scePsmfPlayerStop(u32 psmfPlayer) { static int scePsmfPlayerStop(u32 psmfPlayer) {
@ -1427,7 +1435,7 @@ static int scePsmfPlayerStart(u32 psmfPlayer, u32 psmfPlayerData, int initPts)
psmfplayer->playMode = playerData->playMode; psmfplayer->playMode = playerData->playMode;
psmfplayer->playSpeed = playerData->playSpeed; psmfplayer->playSpeed = playerData->playSpeed;
WARN_LOG(ME, "scePsmfPlayerStart(%08x, %08x, %d,(mode %d, speed %d)", psmfPlayer, psmfPlayerData, initPts, playerData->playMode, playerData->playSpeed); WARN_LOG(ME, "scePsmfPlayerStart(%08x, %08x, %d (mode %d, speed %d)", psmfPlayer, psmfPlayerData, initPts, playerData->playMode, playerData->playSpeed);
// Does not alter current pts, it just catches up when Update()/etc. get there. // Does not alter current pts, it just catches up when Update()/etc. get there.

2
Core/HLE/scePsmf.h
View file

@ -21,7 +21,7 @@ void Register_scePsmf();
void Register_scePsmfPlayer(); void Register_scePsmfPlayer();
void __PsmfInit(); void __PsmfInit();
void __PsmfPlayerLoadModule(int devkitVersion); void __PsmfPlayerLoadModule(int devkitVersion,std::string crcstr);
void __PsmfDoState(PointerWrap &p); void __PsmfDoState(PointerWrap &p);
void __PsmfPlayerDoState(PointerWrap &p); void __PsmfPlayerDoState(PointerWrap &p);
void __PsmfShutdown(); void __PsmfShutdown();