From 32017202bff3eb5a0a303694426b5fcd722e00cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 18 Sep 2026 13:45:55 -0600 Subject: [PATCH] Use the disc's own mpeg.prx, and say when sceMp4 won't work A game that ships MPEG.PRX doesn't need a firmware installed to run the real module - Death Jr. loads PSP_GAME/USRDIR/MODULES/MPEG.PRX itself - but the flag came off anyway, because the decision has to be made before the game's imports resolve and nothing had looked on the disc yet. So look: a bounded walk for a file of that name, only when flash0 comes up empty, so the usual case pays nothing. The name is the easy part - about a quarter of discs ship one and it is called mpeg.prx in every case seen - but the directory is not. MODULE and MODULES are the common ones, with KMODULE, PRX, DATA/MODULE, and more at five levels deep, hence the generous depth limit. Matching on the name rather than reading each PRX to see what it exports means guessing wrong only costs us the real module. sceMp4 is the other half of this. Our HLE of it is nearly all stubs, so dropping the flag for want of firmware doesn't rescue anything - those libraries only exist in firmware 6.00 and later, and without them MP4 playback simply isn't available. Since almost nothing uses sceMp4, warning about that every boot would be noise, so NotifyLoadStatusMp4 says it instead, which only something actually asking for MP4 reaches. Co-Authored-By: Claude Opus 5 (1M context) --- Core/HLE/HLE.cpp | 70 +++++++++++++++++++++++++++++++++++------ Core/HLE/sceUtility.cpp | 15 ++++++++- 2 files changed, 75 insertions(+), 10 deletions(-) diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp index b6dfe9c396..c3256cffdd 100644 --- a/Core/HLE/HLE.cpp +++ b/Core/HLE/HLE.cpp @@ -29,6 +29,7 @@ #include "Common/Log.h" #include "Common/Serialize/SerializeFuncs.h" +#include "Common/StringUtils.h" #include "Common/TimeUtil.h" #include "Core/Config.h" #include "Core/Core.h" @@ -349,14 +350,54 @@ static void hleDelayResultFinish(u64 userdata, int cycleslate) { // disc like any other but reads its fonts from flash0:/font with nothing to fall back on. Either // way the HLE is the only thing that can serve, so the flag comes off. // -// sceMpeg is the awkward one. Some discs carry their own mpeg.prx (Death Jr. has one under -// PSP_GAME/USRDIR/MODULES) and don't need the firmware at all, but the choice has to be made before -// the game's imports are resolved, and we can't tell then whether a module will show up later. -// Choosing wrong leaves the game importing from a module that never loads. So: no firmware, no -// flag, even for a disc that would have worked. +// sceMpeg can come from either place: some discs carry their own mpeg.prx (Death Jr. loads +// PSP_GAME/USRDIR/MODULES/MPEG.PRX) and don't need the firmware at all. The choice has to be made +// here, before the game's imports are resolved, and getting it wrong leaves the game importing from +// a module that never loads - so when the firmware hasn't got one, look on the disc for one too. // // sceMp3 and sceAtrac aren't here because they're not on by default - the user asked for those // specifically, and they warn at the point they would have loaded a module. + +// Whether the disc carries its own copy of a module, for when the firmware doesn't have it. Only a +// filename match: reading each PRX to see what it exports would be the sure way, but the name is +// remarkably consistent, and guessing wrong here only costs us the real module. +// +// About a quarter of discs ship one, and in every case seen it is called mpeg.prx - but where it +// sits varies a great deal. PSP_GAME/USRDIR/MODULE and .../MODULES are the common ones, with +// KMODULE, PRX, AMODULE, DATA/MODULE, LAUNCHER/MODULE, PSP152 and plain USRDIR also turning up - +// and EACN/PRX/MODULE, which is five deep. Hence the generous depth. +static bool DiscHasModule(std::string_view filename) { + struct Walker { + std::string_view wanted; + // Bounded so a disc laid out in some way nobody expected can't turn this into a long walk + // during boot. Listing a directory is cheap - it reads the ISO's own records, not files - + // so this is a lot of headroom over the handful of module directories a game really has. + int budget = 10000; + + bool Search(const std::string &dir, int depth) { + if (depth > 8 || budget <= 0) { + return false; + } + std::vector entries = pspFileSystem.GetDirListing(dir); + budget -= (int)entries.size(); + for (const PSPFileInfo &entry : entries) { + if (entry.name == "." || entry.name == "..") { + continue; + } + if (entry.type == FILETYPE_DIRECTORY) { + if (Search(dir + entry.name + "/", depth + 1)) { + return true; + } + } else if (equalsNoCase(entry.name, wanted)) { + return true; + } + } + return false; + } + }; + Walker walker{ filename }; + return walker.Search("disc0:/", 0); +} void HLECheckModuleAvailability() { g_unavailableDisableFlags = (DisableHLEFlags)0; @@ -370,8 +411,13 @@ void HLECheckModuleAvailability() { } // Ask AlwaysDisableHLEFlags rather than the setting: these two are on by default now, so the - // setting's bit is clear for almost everyone. That is also why neither warns on screen any - // more - missing firmware is the ordinary way to run PPSSPP, not a failed request. + // setting's bit is clear for almost everyone. + // + // No game ships the MP4 libraries and they only appear in firmware 6.00 and later, so an older + // dump legitimately hasn't got them. Dropping the flag here doesn't rescue anything - our + // sceMp4 HLE is very nearly all stubs - so without those files MP4 playback is simply not + // available. Nothing is said about it here because almost nothing uses sceMp4, and a warning + // every boot would be noise; NotifyLoadStatusMp4 says it instead, when something actually asks. if (AlwaysDisableHLEFlags() & DisableHLEFlags::sceMp4) { const Path kd = g_Config.nandRootDirectory / "flash0" / "kd"; if (!pspFileSystem.GetFileInfo("flash0:/kd/libmp4.prx").exists || @@ -382,10 +428,16 @@ void HLECheckModuleAvailability() { } } + // sceMpeg is the one that should normally be there - PPSSPP installs a firmware dump when it + // finds one - so unlike sceMp4 above, not having it is worth saying out loud. Unless the disc + // brought its own, which is just as good and wants no comment. if (AlwaysDisableHLEFlags() & DisableHLEFlags::sceMpeg) { - if (!pspFileSystem.GetFileInfo("flash0:/kd/mpeg.prx").exists) { + if (!pspFileSystem.GetFileInfo("flash0:/kd/mpeg.prx").exists && !DiscHasModule("mpeg.prx")) { g_unavailableDisableFlags |= DisableHLEFlags::sceMpeg; - INFO_LOG(Log::HLE, "flash0:/kd/mpeg.prx isn't there - using the HLE sceMpeg."); + ERROR_LOG(Log::HLE, "Neither flash0:/kd nor the disc has mpeg.prx - using the HLE sceMpeg."); + auto sy = GetI18NCategory(I18NCat::SYSTEM); + g_OSD.Show(OSDType::MESSAGE_WARNING, + sy->T("No mpeg.prx - install a firmware dump for accurate video"), 6.0f); } } } diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index 21be540051..dde35a1c43 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -171,7 +171,20 @@ static void NotifyLoadStatusAvcodec(int state, u32 loadAddr, u32 totalSize) { // functions from sceAudiocodec (Init and Decode) plus ordinary kernel calls, and mp4msv.prx - the // 41 functions libmp4 leans on - imports nothing at all. static void NotifyLoadStatusMp4(int state, u32 loadAddr, u32 totalSize) { - if (state != 1 || !(GetEffectiveDisableHLEFlags() & DisableHLEFlags::sceMp4)) { + if (state != 1) { + return; + } + if (!(GetEffectiveDisableHLEFlags() & DisableHLEFlags::sceMp4)) { + // Only something that actually uses sceMp4 gets this far, which is why the warning lives + // here rather than with the other firmware checks at boot: our HLE is nearly all stubs, so + // whatever just asked for MP4 is not going to work, and this is the one moment where + // saying so is neither noise nor too late. + if (!pspFileSystem.GetFileInfo("flash0:/kd/libmp4.prx").exists || + !pspFileSystem.GetFileInfo("flash0:/kd/mp4msv.prx").exists) { + auto sy = GetI18NCategory(I18NCat::SYSTEM); + g_OSD.Show(OSDType::MESSAGE_WARNING, sy->T("MP4 playback needs a firmware dump from " + "version 6.00 or later - it won't work without one"), 8.0f, "hle_no_module_sceMp4"); + } return; } // mp4msv first - libmp4 imports from it, and an import can only resolve to a module that is