izzy/ppsspp
0
0
Fork 0
mirror of https://github.com/izzy2lost/ppsspp.git synced 2026-03-10 12:43:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Jpeg: Retain previous width/height.

Browse Source 
Seems to be reused even after Delete, strangely.
This commit is contained in:
Unknown W. Brackets
2022-10-07 23:24:09 -07:00
parent bcee6c0310
commit 95d40cc09f
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Core/HLE/sceJpeg.cpp
View File

@@ -45,13 +45,13 @@ struct u24_be {
};
static int mjpegInited = 0;
static int mjpegWidth = 0x7FFFFFFF;
static int mjpegHeight = 0x7FFFFFFF;
static int mjpegWidth = 0;
static int mjpegHeight = 0;
void __JpegInit() {
mjpegInited = 0;
mjpegWidth = 0x7FFFFFFF;
mjpegHeight = 0x7FFFFFFF;
mjpegWidth = 0;
mjpegHeight = 0;
}
enum : uint32_t {
@@ -399,14 +399,12 @@ static int sceJpeg_9B36444C() {
static int sceJpegCreateMJpeg(int width, int height) {
if (mjpegInited == 0)
return hleLogError(ME, ERROR_JPEG_INVALID_STATE, "not yet inited");
if (mjpegInited == 1 && mjpegWidth != 0x7FFFFFFF)
if (mjpegInited == 2)
return hleLogError(ME, ERROR_JPEG_INVALID_STATE, "already created");
if (width > 1024)
return hleLogError(ME, ERROR_JPEG_INVALID_SIZE, "width outside bounds");
// Assume valid usage in an old save state.
if (mjpegInited == -1)
mjpegInited = 1;
mjpegInited = 2;
mjpegWidth = width;
mjpegHeight = height;
@@ -416,35 +414,32 @@ static int sceJpegCreateMJpeg(int width, int height) {
static int sceJpegDeleteMJpeg() {
if (mjpegInited == 0)
return hleLogError(ME, ERROR_JPEG_INVALID_STATE, "not yet inited");
if (mjpegInited == 1 && mjpegWidth == 0x7FFFFFFF)
return hleLogError(ME, ERROR_JPEG_INVALID_STATE, "nto yet created");
if (mjpegInited == 1)
return hleLogError(ME, ERROR_JPEG_INVALID_STATE, "not yet created");
if (mjpegInited == -1)
mjpegInited = 1;
mjpegWidth = 0x7FFFFFFF;
mjpegHeight = 0x7FFFFFFF;
mjpegInited = 1;
return hleLogSuccessInfoI(ME, 0);
}
static int sceJpegInitMJpeg() {
if (mjpegInited == 1)
if (mjpegInited == 1 || mjpegInited == 2)
return hleLogError(ME, ERROR_JPEG_ALREADY_INIT, "already inited");
// If it was -1, it's from an old save state, avoid double init error but assume inited.
if (mjpegInited == 0)
mjpegInited = 1;
return hleLogDebug(ME, hleDelayResult(0, "mjpeg init", 130));
return hleLogSuccessI(ME, hleDelayResult(0, "mjpeg init", 130));
}
static int sceJpegFinishMJpeg() {
if (mjpegInited == 0)
return hleLogError(ME, ERROR_JPEG_INVALID_STATE, "already inited");
if (mjpegInited != -1 && (mjpegWidth != 0x7FFFFFFF || mjpegHeight != 0x7FFFFFFF))
if (mjpegInited == 2)
return hleLogError(ME, ERROR_JPEG_INVALID_STATE, "mjpeg not deleted");
// Even from an old save state, if we see this we leave compat mode.
mjpegInited = 0;
return hleLogDebug(ME, hleDelayResult(0, "mjpeg finish", 120));
return hleLogSuccessI(ME, hleDelayResult(0, "mjpeg finish", 120));
}
static int sceJpegMJpegCscWithColorOption() {