Container: add Matroska (MKV) demuxer for existing supported codecs

Makefile

@@ -12,7 +12,7 @@ EE_BIN = $(EE_BIN_DIR)SMS.elf
 EE_INCS    = -I$(EE_INC_DIR) -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -I$(PS2SDK)/ports/include -I$(PS2SDK)/sbv/include
 EE_LDFLAGS = -L$(PS2SDK)/sbv/lib -L$(PS2SDK)/ee/lib -L$(PS2SDK)/ports/lib -L$(EE_SRC_DIR)/lzma2
 EE_LIBS    = -lpatches -lc -lkernel -lmf
-EE_CFLAGS := -Dmemset=mips_memset -Dmemcpy=mips_memcpy -D_EE -O2 -G8192 -mgpopt -Wall -mno-check-zero-division
+EE_CFLAGS := -Dmemset=mips_memset -Dmemcpy=mips_memcpy -D_EE -O2 -G4096 -mgpopt -Wall -mno-check-zero-division
 
 EE_OBJS  = main.o SMS_OS.o SMS_GS_0.o SMS_GS_1.o SMS_GS_2.o SMS_Timer.o           \
            SMS_MP123Core.o SMS_FileContext.o  SMS_H263.o                          \
@@ -34,6 +34,7 @@ EE_OBJS  = main.o SMS_OS.o SMS_GS_0.o SMS_GS_1.o SMS_GS_2.o SMS_Timer.o
            SMS_GUIMenuSMS.o SMS_GUISMBrowser.o SMS_WMA.o mbstring.o SMS_PCM.o     \
            SMS_ContainerASF.o SMS_GUInfoPanel.o SMS_ContainerMOV.o                \
            SMS_ContainerAAC.o SMS_ContainerFLAC.o SMS_FLAC.o SMS_ContainerAC3.o   \
+           SMS_ContainerMKV.o                                                     \
            SMS_History.o SMS_PgInd.o SMS_VSync.o SMS_GUIClock.o SMS_DateTime.o    \
            SMS_PlayerBallSim.o SMS_SIF.o SMS_ContainerJPG.o SMS_FileMapping.o     \
            SMS_JPEGData.o SMS_JPEG.o SMS_Rescale.o SMS_MPEGInit.o                 \

include/SMS_Container.h

@@ -46,6 +46,7 @@ struct SMS_ListNode;
  * serve .m4a audio. Both must stay: .m4a keeps the audio-only reader, .mp4 now uses this one.
  * MUST match the index of SMS_GetContainerMOV in s_CCreator[] ( SMS_Container.c ). */
 #define SMS_CONTAINER_MOV    11
+#define SMS_CONTAINER_MKV    12
 
 #define SMS_CONT_FLAGS_SEEKABLE 0x00000001
 

include/SMS_ContainerMKV.h

@@ -0,0 +1,26 @@
+/*
+#     ___  _ _      ___
+#    |    | | |    |
+# ___|    |   | ___|    PS2DEV Open Source Project.
+#----------------------------------------------------------
+# Licenced under Academic Free License version 2.0
+#
+*/
+#ifndef __SMS_ContainerMKV_H
+#define __SMS_ContainerMKV_H
+
+#ifndef __SMS_Container_H
+#include "SMS_Container.h"
+#endif  /* __SMS_Container_H */
+
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
+int SMS_GetContainerMKV ( SMS_Container* );
+
+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */
+#endif  /* __SMS_ContainerMKV_H */
+

src/SMS_Container.c

@@ -20,6 +20,7 @@
 #include "SMS_ContainerFLAC.h"
 #include "SMS_ContainerAC3.h"
 #include "SMS_ContainerJPG.h"
+#include "SMS_ContainerMKV.h"
 #include "SMS_List.h"
 
 #include <malloc.h>
@@ -43,6 +44,7 @@ static const ContainerCreator s_CCreator[] = {
  SMS_GetContainerM3U,
  SMS_GetContainerMOV,   /* index 11 -- MUST equal SMS_CONTAINER_MOV. Was absent entirely, so
                          * the video-preserving ISO-BMFF demuxer was compiled-in dead code. */
+ SMS_GetContainerMKV,
  NULL
 };