External/pspsdk
1
0
Fork 0
mirror of https://github.com/pspdev/pspsdk.git synced 2025-10-03 08:41:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #317 from RegularRabbit05/master

Browse Source 
Add sceJpegDecodeMJpegYCbCr, sceJpegCsc and sceJpegGetOutputInfo
This commit is contained in:
Wouter Wijsman
2025-07-06 21:42:23 +02:00
committed by GitHub
parent 658d5bd5cf 6dced23b25
commit c1debe88e3
2 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/mpeg/pspjpeg.h
View File

@@ -17,6 +17,13 @@ extern "C" {
#include <psptypes.h>
#define SCE_JPEG_ERROR_BAD_MARKER_LENGTH (0x80650004)
#define SCE_JPEG_ERROR_INVALID_POINTER (0x80650010)
#define SCE_JPEG_ERROR_UNSUPPORT_COLORSPACE (0x80650013)
#define SCE_JPEG_ERROR_UNSUPPORT_SAMPLING (0x80650016)
#define SCE_JPEG_ERROR_UNSUPPORT_IMAGE_SIZE (0x80650020)
#define SCE_JPEG_ERROR_UNKNOWN_MARKER (0x80650035)
/**
* Inits the MJpeg library
*
@@ -49,7 +56,9 @@ int sceJpegCreateMJpeg(int width, int height);
int sceJpegDeleteMJpeg(void);
/**
* Decodes a mjpeg frame.
* Decodes a mjpeg frame to RGBA encoding.
* @note Input frame should be encoded as either yuv420p or yuvj420p,
* returns SCE_JPEG_ERROR_UNSUPPORT_SAMPLING otherwise
*
* @param jpegbuf - the buffer with the mjpeg frame
* @param size - size of the buffer pointed by jpegbuf
@@ -59,7 +68,48 @@ int sceJpegDeleteMJpeg(void);
*
* @return (width * 65536) + height on success, < 0 on error
*/
int sceJpegDecodeMJpeg(u8 *jpegbuf, SceSize size, void *rgba, u32 unk);
int sceJpegDecodeMJpeg(u8 *jpegbuf, SceSize size, u8 *rgba, u32 unk);
/**
* Reads information from mjpeg frame
*
* @param jpegbuf - the buffer with the mjpeg frame
* @param size - size of the mjpeg frame
* @param colourInfo - address where the mjpeg chroma information will be stored
* @param unk - Unknown, pass 0
*
* @return number of bytes needed in the buffer that will be used for YCbCr decoding, <= 0 on error
*/
int sceJpegGetOutputInfo(u8 *jpegbuf, SceSize size, int *colourInfo, int unk);
/**
* Decodes a mjpeg frame to YCbCr encoding
* @note Input frame should be encoded as either yuv420p or yuvj420p,
* returns SCE_JPEG_ERROR_UNSUPPORT_SAMPLING otherwise
*
* @param jpegbuf - the buffer with the mjpeg frame
* @param size - size of the buffer pointed by jpegbuf
* @param yCbCr - buffer where the decoded data in YCbCr format will be stored
* @param yCbCrSize - size of the buffer pointed by yCbCr (see sceJpegGetOutputInfo())
* @param unk - Unknown, pass 0
*
* @return (width * 65536) + height on success, < 0 on error
*/
int sceJpegDecodeMJpegYCbCr(u8 *jpegbuf, SceSize size, u8 *yCbCr, SceSize yCbCrSize, u32 unk);
/**
* Converts a frame from YCbCr to RGBA
*
* @param imageAddr - buffer where the converted data in RGBA format will be stored.
* @param yCbCrAddr - the buffer with the YCbCr data
* @param widthHeight - width and height of the frame (width * 65536) + height,
* as returned by sceJpegDecodeMJpegYCbCr() or sceJpegDecodeMJpeg()
* @param bufferWidth - number of pixels per row of the buffer
* @param colourInfo - chroma subsampling mode, as provided by sceJpegGetOutputInfo()
*
* @return 0 on success, < 0 on error
*/
int sceJpegCsc(u8 *imageAddr, u8 *yCbCrAddr, int widthHeight, int bufferWidth, int colourInfo);
#ifdef __cplusplus
}

2
src/mpeg/sceJpeg.S
View File

@@ -24,7 +24,7 @@
IMPORT_FUNC "sceJpeg",0x64B6F978,sceJpeg_64B6F978
#endif
#ifdef F_sceJpeg_0007
IMPORT_FUNC "sceJpeg",0x67F0ED84,sceJpeg_67F0ED84
IMPORT_FUNC "sceJpeg",0x67F0ED84,sceJpegCsc
#endif
#ifdef F_sceJpeg_0008
IMPORT_FUNC "sceJpeg",0x7D2F3D7F,sceJpegFinishMJpeg