preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-14 01:59:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #931 from sum2012/patch-3

Browse Source 
Correct WrapI_UUUI and IMP sceMpegAvcConvertToYuv420
This commit is contained in:
Henrik Rydgård committed 2013-03-10 00:30:06 -08:00
2 parents 1871c4e8bd bb82ad1685
commit 075f7bbe0f
2 files changed
+10 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/HLE/FunctionWrappers.h
+2 -2
View File
@@ -147,8 +147,8 @@ template<int func(u32, u32, u32)> void WrapI_UUU() {
RETURN(retval);
}
template<int func(int, u32, u32, u32, int)> void WrapI_UUUI() {
int retval = func(PARAM(0), PARAM(1), PARAM(2), PARAM(3), PARAM(4));
template<int func(u32, u32, u32, int)> void WrapI_UUUI() {
int retval = func(PARAM(0), PARAM(1), PARAM(2), PARAM(3));
RETURN(retval);
}
Core/HLE/sceMpeg.cpp
+8
View File
@@ -1354,6 +1354,13 @@ u32 sceMpegAvcResourceInit(u32 mpeg)
return 0;
}
int sceMpegAvcConvertToYuv420(u32 mpeg, u32 bufferOutput, u32 unknown1, int unknown2)
{
ERROR_LOG(HLE, "UNIMPL sceMpegAvcConvertToYuv420(%08x, %08x, %08x, %08x)", mpeg, bufferOutput, unknown1, unknown2);
return 0;
}
/* MP3 */
int sceMp3Decode(u32 mp3, u32 outPcmPtr)
{
@@ -1728,6 +1735,7 @@ const HLEFunction sceMpeg[] =
{0x8160a2fe,WrapU_U<sceMpegAvcResourceFinish>,"sceMpegAvcResourceFinish"},
{0xaf26bb01,WrapU_U<sceMpegAvcResourceGetAvcEsBuf>,"sceMpegAvcResourceGetAvcEsBuf"},
{0xfcbdb5ad,WrapU_U<sceMpegAvcResourceInit>,"sceMpegAvcResourceInit"},
{0xF5E7EA31,WrapI_UUUI<sceMpegAvcConvertToYuv420>,"sceMpegAvcConvertToYuv420"},
};
const HLEFunction sceMp3[] =