Merge pull request #204 from uyjulian/libmpeg_fixes

libmpeg related fixes
ps2dev · Jul 23, 2021 · 4a8f0ba · 4a8f0ba
2 parents cf58cc6 + a4e3a47
commit 4a8f0ba
Show file tree

Hide file tree

Showing 6 changed files with 2,157 additions and 22 deletions.
diff --git a/ee/Makefile b/ee/Makefile
@@ -10,6 +10,7 @@ SUBDIRS = erl kernel kernel-nopatch libc rpc startup debug \
 	eedebug sbv dma graph math3d \
 	packet packet2 draw libgs \
 	libvux font input inputx network iopreboot \
+	mpeg \
 	elf-loader
 
 include $(PS2SDKSRC)/Defs.make

diff --git a/ee/mpeg/Makefile b/ee/mpeg/Makefile
@@ -6,7 +6,7 @@
 # Licenced under Academic Free License version 2.0
 # Review ps2sdk README & LICENSE files for further details.
 
-EE_OBJS = libmpeg.o libmpeg_core.o erl-support.o
+EE_OBJS = libmpeg.o libmpeg_core_c.o erl-support.o
 
 include $(PS2SDKSRC)/Defs.make
 include $(PS2SDKSRC)/ee/Rules.lib.make

diff --git a/ee/mpeg/include/libmpeg.h b/ee/mpeg/include/libmpeg.h
@@ -59,7 +59,7 @@ extern "C" {
 
 void MPEG_Initialize (  int ( * ) ( void* ), void*, void* ( * ) ( void*, MPEGSequenceInfo* ), void*, s64*  );
 void MPEG_Destroy    ( void );
-int  ( *MPEG_Picture ) ( void*, s64* );
+extern int  ( *MPEG_Picture ) ( void*, s64* );
 
 #ifdef __cplusplus
 }

diff --git a/ee/mpeg/src/libmpeg.c b/ee/mpeg/src/libmpeg.c
@@ -20,12 +20,12 @@
 static _MPEGContext s_MPEG12Ctx;
 static s64*        s_pCurPTS;
 
-static void ( *LumaOp[ 8 ] ) ( _MPEGMotion* ) = {
+static void ( *LumaOp[ 8 ] ) ( unsigned char* arg1, short* arg2, int arg3, int arg4 ) = {
  _MPEG_put_luma, _MPEG_put_luma_X, _MPEG_put_luma_Y, _MPEG_put_luma_XY,
  _MPEG_avg_luma, _MPEG_avg_luma_X, _MPEG_avg_luma_Y, _MPEG_avg_luma_XY
 };
 
-static void ( *ChromaOp[ 8 ] ) ( void ) = {
+static void ( *ChromaOp[ 8 ] ) ( unsigned char* arg1, short* arg2, int arg3, int arg4 ) = {
  _MPEG_put_chroma, _MPEG_put_chroma_X, _MPEG_put_chroma_Y, _MPEG_put_chroma_XY,
  _MPEG_avg_chroma, _MPEG_avg_chroma_X, _MPEG_avg_chroma_Y, _MPEG_avg_chroma_XY
 };