mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-14 12:24:16 -04:00
d_a_movie_player fixes
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#ifndef JSYSTEM_PCH
|
||||
#define JSYSTEM_PCH
|
||||
|
||||
#include "JSystem/JSupport/JSUList.h"
|
||||
#include "JSystem/J3DGraphBase/J3DShape.h"
|
||||
#include "JSystem/JSupport/JSUList.h" // IWYU pragma: export
|
||||
#include "JSystem/J3DGraphBase/J3DShape.h" // IWYU pragma: export
|
||||
|
||||
#endif /* JSYSTEM_PCH */
|
||||
|
||||
@@ -6,9 +6,11 @@
|
||||
#include "d/d_drawlist.h"
|
||||
#include "dolphin/dvd/dvd.h"
|
||||
|
||||
#if VERSION > VERSION_DEMO
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
#endif
|
||||
|
||||
typedef u8 THPSample;
|
||||
typedef s16 THPCoeff;
|
||||
@@ -45,8 +47,10 @@ static void __THPInverseDCTY8(THPCoeff* in, u32 xPos);
|
||||
static void __THPGQRSetup();
|
||||
static s32 __THPHuffDecodeTab(THPFileInfo* info, THPHuffmanTab* h);
|
||||
|
||||
#if VERSION > VERSION_DEMO
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
} // extern "C"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
class daMP_c : public fopAc_ac_c {
|
||||
@@ -63,7 +67,7 @@ public:
|
||||
|
||||
public:
|
||||
/* 0x290 */ u32 (*mpGetMovieRestFrame)();
|
||||
/* 0x294 */ u32 (*mpSetPercentMovieVol)(f32);
|
||||
/* 0x294 */ void (*mpSetPercentMovieVol)(f32);
|
||||
#if VERSION == VERSION_PAL
|
||||
/* 0x29C */ u32 (*mpTHPGetTotalFrame)(void);
|
||||
#endif
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "d/d_drawlist.h"
|
||||
#include "d/d_event.h"
|
||||
#include "d/d_event_manager.h"
|
||||
#include "d/d_item_data.h"
|
||||
#include "d/d_map.h"
|
||||
#include "d/d_particle.h"
|
||||
#include "d/d_resorce.h"
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "JSystem/JKernel/JKRFileFinder.h" // IWYU pragma: export
|
||||
#include "d/d_bg_s_lin_chk.h" // IWYU pragma: export
|
||||
#include "m_Do/m_Do_hostIO.h" // IWYU pragma: export
|
||||
#include "m_Do/m_Do_graphic.h" // IWYU pragma: export
|
||||
#include "d/d_cc_uty.h" // IWYU pragma: export
|
||||
#include "d/d_magma.h" // IWYU pragma: export
|
||||
#include "d/d_mesg.h" // IWYU pragma: export
|
||||
|
||||
+1
-32
@@ -28,7 +28,7 @@ typedef struct _THPComponent {
|
||||
THPCoeff predDC;
|
||||
} THPComponent;
|
||||
|
||||
typedef struct _THPFileInfo {
|
||||
typedef struct _local_THPFileInfo {
|
||||
THPQuantTab quantTabs[3];
|
||||
THPHuffmanTab huffmanTabs[4];
|
||||
THPComponent components[3];
|
||||
@@ -116,37 +116,6 @@ typedef struct THPHeader {
|
||||
#define THP_READ_BUFFER_COUNT 10
|
||||
#define THP_TEXTURE_SET_COUNT 3
|
||||
|
||||
static u32 THPAudioDecode(s16* audioBuffer, u8* audioFrame, s32 flag);
|
||||
static s32 __THPAudioGetNewSample(THPAudioDecodeInfo* info);
|
||||
static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr);
|
||||
|
||||
s32 __THPAudioGetNewSample(THPAudioDecodeInfo*);
|
||||
void __THPAudioInitialize(THPAudioDecodeInfo*, u8*);
|
||||
|
||||
static void __THPSetupBuffers(void);
|
||||
static u8 __THPReadFrameHeader(void);
|
||||
static u8 __THPReadScaneHeader(void);
|
||||
static u8 __THPReadQuantizationTable(void);
|
||||
static u8 __THPReadHuffmanTableSpecification(void);
|
||||
static void __THPHuffGenerateSizeTable(void);
|
||||
static void __THPHuffGenerateCodeTable(void);
|
||||
static void __THPHuffGenerateDecoderTables(u8 tabIndex);
|
||||
static void __THPRestartDefinition(void);
|
||||
static void __THPPrepBitStream(void);
|
||||
static void __THPDecompressYUV(void* tileY, void* tileU, void* tileV);
|
||||
static void __THPGQRRestore(void);
|
||||
static void __THPDecompressiMCURow512x448(void);
|
||||
static void __THPDecompressiMCURow640x480(void);
|
||||
static void __THPDecompressiMCURowNxN(void);
|
||||
static void __THPInverseDCTNoYPos(THPCoeff* in, u32 xPos);
|
||||
static void __THPHuffDecodeDCTCompY(THPFileInfo* info, THPCoeff* block);
|
||||
static void __THPHuffDecodeDCTCompU(THPFileInfo* info, THPCoeff* block);
|
||||
static void __THPHuffDecodeDCTCompV(THPFileInfo* info, THPCoeff* block);
|
||||
|
||||
static void __THPInverseDCTY8(THPCoeff* in, u32 xPos);
|
||||
static void __THPGQRSetup();
|
||||
static s32 __THPHuffDecodeTab(THPFileInfo* info, THPHuffmanTab* h);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user