mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-04 05:51:27 +12:00
* Huge improvement in the speed of cell{Png|Gif|Jpg}DecDecodeData when reading input files. Note: Sorry if this commit is too "small", but I need to sync every change since I use two PCs.
270 lines
No EOL
8.5 KiB
C++
270 lines
No EOL
8.5 KiB
C++
#include "stdafx.h"
|
|
#include "Emu/SysCalls/SysCalls.h"
|
|
#include "Emu/SysCalls/SC_FUNC.h"
|
|
|
|
#include "stblib/stb_image.h"
|
|
|
|
void cellPngDec_init();
|
|
Module cellPngDec(0x0018, cellPngDec_init);
|
|
|
|
//Return Codes
|
|
enum
|
|
{
|
|
CELL_PNGDEC_ERROR_HEADER = 0x80611201,
|
|
CELL_PNGDEC_ERROR_STREAM_FORMAT = 0x80611202,
|
|
CELL_PNGDEC_ERROR_ARG = 0x80611203,
|
|
CELL_PNGDEC_ERROR_SEQ = 0x80611204,
|
|
CELL_PNGDEC_ERROR_BUSY = 0x80611205,
|
|
CELL_PNGDEC_ERROR_FATAL = 0x80611206,
|
|
CELL_PNGDEC_ERROR_OPEN_FILE = 0x80611207,
|
|
CELL_PNGDEC_ERROR_SPU_UNSUPPORT = 0x80611208,
|
|
CELL_PNGDEC_ERROR_SPU_ERROR = 0x80611209,
|
|
CELL_PNGDEC_ERROR_CB_PARAM = 0x8061120a,
|
|
};
|
|
|
|
enum CellPngDecColorSpace
|
|
{
|
|
CELL_PNGDEC_GRAYSCALE = 1,
|
|
CELL_PNGDEC_RGB = 2,
|
|
CELL_PNGDEC_PALETTE = 4,
|
|
CELL_PNGDEC_GRAYSCALE_ALPHA = 9,
|
|
CELL_PNGDEC_RGBA = 10,
|
|
CELL_PNGDEC_ARGB = 20,
|
|
};
|
|
|
|
struct CellPngDecInfo
|
|
{
|
|
u32 imageWidth;
|
|
u32 imageHeight;
|
|
u32 numComponents;
|
|
u32 colorSpace; // CellPngDecColorSpace
|
|
u32 bitDepth;
|
|
u32 interlaceMethod; // CellPngDecInterlaceMode
|
|
u32 chunkInformation;
|
|
};
|
|
|
|
struct CellPngDecSrc
|
|
{
|
|
u32 srcSelect; // CellPngDecStreamSrcSel
|
|
u32 fileName; // const char*
|
|
u64 fileOffset; // int64_t
|
|
u32 fileSize;
|
|
u32 streamPtr;
|
|
u32 streamSize;
|
|
u32 spuThreadEnable; // CellPngDecSpuThreadEna
|
|
};
|
|
|
|
struct CellPngDecInParam
|
|
{
|
|
u32 *commandPtr;
|
|
u32 outputMode; // CellPngDecOutputMode
|
|
u32 outputColorSpace; // CellPngDecColorSpace
|
|
u32 outputBitDepth;
|
|
u32 outputPackFlag; // CellPngDecPackFlag
|
|
u32 outputAlphaSelect; // CellPngDecAlphaSelect
|
|
u32 outputColorAlpha;
|
|
};
|
|
|
|
struct CellPngDecOutParam
|
|
{
|
|
u64 outputWidthByte;
|
|
u32 outputWidth;
|
|
u32 outputHeight;
|
|
u32 outputComponents;
|
|
u32 outputBitDepth;
|
|
u32 outputMode; // CellPngDecOutputMode
|
|
u32 outputColorSpace; // CellPngDecColorSpace
|
|
u32 useMemorySpace;
|
|
};
|
|
|
|
struct CellPngDecSubHandle //Custom struct
|
|
{
|
|
u32 fd;
|
|
u64 fileSize;
|
|
CellPngDecInParam inParam;
|
|
};
|
|
|
|
CellPngDecInfo current_info;
|
|
CellPngDecSrc current_src;
|
|
|
|
|
|
int cellPngDecCreate(u32 mainHandle, u32 threadInParam, u32 threadOutParam)
|
|
{
|
|
UNIMPLEMENTED_FUNC(cellPngDec);
|
|
return CELL_OK;
|
|
}
|
|
|
|
int cellPngDecDestroy(u32 mainHandle)
|
|
{
|
|
UNIMPLEMENTED_FUNC(cellPngDec);
|
|
return CELL_OK;
|
|
}
|
|
|
|
int cellPngDecOpen(u32 mainHandle, u32 subHandle_addr, u32 src_addr, u32 openInfo)
|
|
{
|
|
//current_src.srcSelect = Memory.Read32(src_addr);
|
|
current_src.fileName = Memory.Read32(src_addr+4);
|
|
//current_src.fileOffset = Memory.Read32(src_addr+8);
|
|
//current_src.fileSize = Memory.Read32(src_addr+12);
|
|
//current_src.streamPtr = Memory.Read32(src_addr+16);
|
|
//current_src.streamSize = Memory.Read32(src_addr+20);
|
|
//current_src.spuThreadEnable = Memory.Read32(src_addr+24);
|
|
|
|
CellPngDecSubHandle *subHandle = new CellPngDecSubHandle;
|
|
|
|
// Get file descriptor
|
|
u32 fd_addr = Memory.Alloc(sizeof(u32), 1);
|
|
int ret = cellFsOpen(current_src.fileName, 0, fd_addr, NULL, 0);
|
|
subHandle->fd = Memory.Read32(fd_addr);
|
|
Memory.Free(fd_addr);
|
|
if(ret != 0) return CELL_PNGDEC_ERROR_OPEN_FILE;
|
|
|
|
// Get size of file
|
|
u32 sb_addr = Memory.Alloc(52,1); // Alloc a CellFsStat struct
|
|
cellFsFstat(subHandle->fd, sb_addr);
|
|
subHandle->fileSize = Memory.Read64(sb_addr+36); // Get CellFsStat.st_size
|
|
Memory.Free(sb_addr);
|
|
|
|
// From now, every u32 subHandle argument is a pointer to a CellPngDecSubHandle struct.
|
|
Memory.Write32(subHandle_addr, (u32)subHandle);
|
|
|
|
return CELL_OK;
|
|
}
|
|
|
|
int cellPngDecClose(u32 mainHandle, u32 subHandle)
|
|
{
|
|
cellFsClose( ((CellPngDecSubHandle*)subHandle)->fd );
|
|
delete (CellPngDecSubHandle*)subHandle;
|
|
|
|
return CELL_OK;
|
|
}
|
|
|
|
int cellPngDecReadHeader(u32 mainHandle, u32 subHandle, u32 info_addr)
|
|
{
|
|
const u32& fd = ((CellPngDecSubHandle*)subHandle)->fd;
|
|
const u64& fileSize = ((CellPngDecSubHandle*)subHandle)->fileSize;
|
|
|
|
//Check size of file
|
|
if(fileSize < 29) return CELL_PNGDEC_ERROR_HEADER; // Error: The file is smaller than the length of a PNG header
|
|
|
|
//Write the header to buffer
|
|
u32 buffer = Memory.Alloc(34,1); // Alloc buffer for PNG header
|
|
u32 pos_addr = Memory.Alloc(8,1);
|
|
cellFsLseek(fd, 0, 0, pos_addr);
|
|
cellFsRead(fd, buffer, 34, NULL);
|
|
Memory.Free(pos_addr);
|
|
|
|
if (Memory.Read32(buffer) != 0x89504E47 ||
|
|
Memory.Read32(buffer+4) != 0x0D0A1A0A || // Error: The first 8 bytes are not a valid PNG signature
|
|
Memory.Read32(buffer+12) != 0x49484452) // Error: The PNG file does not start with an IHDR chunk
|
|
{
|
|
Memory.Free(buffer);
|
|
return CELL_PNGDEC_ERROR_HEADER;
|
|
}
|
|
|
|
current_info.imageWidth = Memory.Read32(buffer+16);
|
|
current_info.imageHeight = Memory.Read32(buffer+20);
|
|
current_info.numComponents = 0; // Unimplemented
|
|
current_info.colorSpace = Memory.Read8(buffer+25);
|
|
current_info.bitDepth = Memory.Read8(buffer+24);
|
|
current_info.interlaceMethod = Memory.Read8(buffer+28);
|
|
current_info.chunkInformation = 0; // Unimplemented
|
|
|
|
mem_class_t info(info_addr);
|
|
info += current_info.imageWidth;
|
|
info += current_info.imageHeight;
|
|
info += current_info.numComponents;
|
|
info += current_info.colorSpace;
|
|
info += current_info.bitDepth;
|
|
info += current_info.interlaceMethod;
|
|
info += current_info.chunkInformation;
|
|
Memory.Free(buffer);
|
|
|
|
return CELL_OK;
|
|
}
|
|
|
|
int cellPngDecDecodeData(u32 mainHandle, u32 subHandle, u32 data_addr, u32 dataCtrlParam_addr, u32 dataOutInfo_addr)
|
|
{
|
|
const u32& fd = ((CellPngDecSubHandle*)subHandle)->fd;
|
|
const u64& fileSize = ((CellPngDecSubHandle*)subHandle)->fileSize;
|
|
const CellPngDecInParam& inParam = ((CellPngDecSubHandle*)subHandle)->inParam; // (TODO: We should use the outParam)
|
|
|
|
//Copy the PNG file to a buffer
|
|
u32 buffer = Memory.Alloc(fileSize,1);
|
|
u32 pos_addr = Memory.Alloc(sizeof(u64),1);
|
|
cellFsLseek(fd, 0, 0, pos_addr);
|
|
cellFsRead(fd, buffer, fileSize, NULL);
|
|
Memory.Free(pos_addr);
|
|
|
|
//Decode PNG file. (TODO: Is there any faster alternative? Can we do it without external libraries?)
|
|
int width, height, actual_components;
|
|
unsigned char *png = (unsigned char*)Memory.VirtualToRealAddr(buffer);
|
|
unsigned char *image = stbi_load_from_memory(png, fileSize, &width, &height, &actual_components, 4);
|
|
Memory.Free(buffer);
|
|
if (!image) return CELL_PNGDEC_ERROR_STREAM_FORMAT;
|
|
|
|
u32 image_size = width * height * 4;
|
|
if (inParam.outputColorSpace == CELL_PNGDEC_RGBA){
|
|
for(u32 i = 0; i < image_size; i+=4){
|
|
Memory.Write8(data_addr+i+0, image[i+0]);
|
|
Memory.Write8(data_addr+i+1, image[i+1]);
|
|
Memory.Write8(data_addr+i+2, image[i+2]);
|
|
Memory.Write8(data_addr+i+3, image[i+3]);
|
|
}
|
|
}
|
|
else if (inParam.outputColorSpace == CELL_PNGDEC_ARGB){
|
|
for(u32 i = 0; i < image_size; i+=4){
|
|
Memory.Write8(data_addr+i+0, image[i+3]);
|
|
Memory.Write8(data_addr+i+1, image[i+0]);
|
|
Memory.Write8(data_addr+i+2, image[i+1]);
|
|
Memory.Write8(data_addr+i+3, image[i+2]);
|
|
}
|
|
}
|
|
delete[] image;
|
|
|
|
return CELL_OK;
|
|
}
|
|
|
|
int cellPngDecSetParameter(u32 mainHandle, u32 subHandle, u32 inParam_addr, u32 outParam_addr)
|
|
{
|
|
CellPngDecInParam& inParam = ((CellPngDecSubHandle*)subHandle)->inParam;
|
|
inParam.outputColorSpace = Memory.Read32(inParam_addr+8);
|
|
|
|
// (TODO)
|
|
|
|
return CELL_OK;
|
|
}
|
|
|
|
void cellPngDec_init()
|
|
{
|
|
cellPngDec.AddFunc(0x157d30c5, cellPngDecCreate);
|
|
cellPngDec.AddFunc(0x820dae1a, cellPngDecDestroy);
|
|
cellPngDec.AddFunc(0xd2bc5bfd, cellPngDecOpen);
|
|
cellPngDec.AddFunc(0x5b3d1ff1, cellPngDecClose);
|
|
cellPngDec.AddFunc(0x9ccdcc95, cellPngDecReadHeader);
|
|
cellPngDec.AddFunc(0x2310f155, cellPngDecDecodeData);
|
|
cellPngDec.AddFunc(0xe97c9bd4, cellPngDecSetParameter);
|
|
|
|
/*cellPngDec.AddFunc(0x48436b2d, cellPngDecExtCreate);
|
|
cellPngDec.AddFunc(0x0c515302, cellPngDecExtOpen);
|
|
cellPngDec.AddFunc(0x8b33f863, cellPngDecExtReadHeader);
|
|
cellPngDec.AddFunc(0x726fc1d0, cellPngDecExtDecodeData);
|
|
cellPngDec.AddFunc(0x9e9d7d42, cellPngDecExtSetParameter);
|
|
cellPngDec.AddFunc(0x7585a275, cellPngDecGetbKGD);
|
|
cellPngDec.AddFunc(0x7a062d26, cellPngDecGetcHRM);
|
|
cellPngDec.AddFunc(0xb153629c, cellPngDecGetgAMA);
|
|
cellPngDec.AddFunc(0xb905ebb7, cellPngDecGethIST);
|
|
cellPngDec.AddFunc(0xf44b6c30, cellPngDecGetiCCP);
|
|
cellPngDec.AddFunc(0x27c921b5, cellPngDecGetoFFs);
|
|
cellPngDec.AddFunc(0xb4fe75e1, cellPngDecGetpCAL);
|
|
cellPngDec.AddFunc(0x3d50016a, cellPngDecGetpHYs);
|
|
cellPngDec.AddFunc(0x30cb334a, cellPngDecGetsBIT);
|
|
cellPngDec.AddFunc(0xc41e1198, cellPngDecGetsCAL);
|
|
cellPngDec.AddFunc(0xa5cdf57e, cellPngDecGetsPLT);
|
|
cellPngDec.AddFunc(0xe4416e82, cellPngDecGetsRGB);
|
|
cellPngDec.AddFunc(0x35a6846c, cellPngDecGettIME);
|
|
cellPngDec.AddFunc(0xb96fb26e, cellPngDecGettRNS);
|
|
cellPngDec.AddFunc(0xe163977f, cellPngDecGetPLTE);
|
|
cellPngDec.AddFunc(0x609ec7d5, cellPngDecUnknownChunks);
|
|
cellPngDec.AddFunc(0xb40ca175, cellPngDecGetTextChunk);*/
|
|
} |