AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update amuse

This commit is contained in:
Jack Andersen 2016-06-07 18:38:26 -10:00
parent fccd52e155
commit 384f660efc
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Runtime/Graphics/CMoviePlayer.cpp
View File

@ -359,12 +359,12 @@ CMoviePlayer::CMoviePlayer(const char* path, float preLoadSeconds, bool loop, bo
/* Read THP header information */ /* Read THP header information */
u8 buf[64]; u8 buf[64];
SyncRead(buf, 64); SyncRead(buf, 64);
memcpy(&x28_thpHead, buf, 48); memmove(&x28_thpHead, buf, 48);
x28_thpHead.swapBig(); x28_thpHead.swapBig();
u32 cur = x28_thpHead.componentDataOffset; u32 cur = x28_thpHead.componentDataOffset;
SyncSeekRead(buf, 32, ESeekOrigin::Begin, cur); SyncSeekRead(buf, 32, ESeekOrigin::Begin, cur);
memcpy(&x58_thpComponents, buf, 20); memmove(&x58_thpComponents, buf, 20);
cur += 20; cur += 20;
x58_thpComponents.swapBig(); x58_thpComponents.swapBig();
@ -374,13 +374,13 @@ CMoviePlayer::CMoviePlayer(const char* path, float preLoadSeconds, bool loop, bo
{ {
case THPComponents::Type::Video: case THPComponents::Type::Video:
SyncSeekRead(buf, 32, ESeekOrigin::Begin, cur); SyncSeekRead(buf, 32, ESeekOrigin::Begin, cur);
memcpy(&x6c_videoInfo, buf, 8); memmove(&x6c_videoInfo, buf, 8);
cur += 8; cur += 8;
x6c_videoInfo.swapBig(); x6c_videoInfo.swapBig();
break; break;
case THPComponents::Type::Audio: case THPComponents::Type::Audio:
SyncSeekRead(buf, 32, ESeekOrigin::Begin, cur); SyncSeekRead(buf, 32, ESeekOrigin::Begin, cur);
memcpy(&x74_audioInfo, buf, 12); memmove(&x74_audioInfo, buf, 12);
cur += 12; cur += 12;
x74_audioInfo.swapBig(); x74_audioInfo.swapBig();
xf4_25_hasAudio = true; xf4_25_hasAudio = true;
@ -522,7 +522,7 @@ void CMoviePlayer::MixAudio(s16* out, const s16* in, u32 samples)
if (xd4_audioSlot == -1) if (xd4_audioSlot == -1)
{ {
if (in) if (in)
memcpy(out, in, samples * 4); memmove(out, in, samples * 4);
else else
memset(out, 0, samples * 4); memset(out, 0, samples * 4);
return; return;
@ -572,7 +572,7 @@ void CMoviePlayer::MixAudio(s16* out, const s16* in, u32 samples)
{ {
/* urde addition: failsafe for buffer overrun */ /* urde addition: failsafe for buffer overrun */
if (in) if (in)
memcpy(out, in, samples * 4); memmove(out, in, samples * 4);
else else
memset(out, 0, samples * 4); memset(out, 0, samples * 4);
//fprintf(stderr, "dropped %d samples\n", samples); //fprintf(stderr, "dropped %d samples\n", samples);
@ -820,18 +820,18 @@ void CMoviePlayer::DecodeFromRead(const void* data)
u8* mappedData = (u8*)tex.Y[0]->map(planeSizeHalf); u8* mappedData = (u8*)tex.Y[0]->map(planeSizeHalf);
for (unsigned y=0 ; y<x6c_videoInfo.height/2 ; ++y) for (unsigned y=0 ; y<x6c_videoInfo.height/2 ; ++y)
{ {
memcpy(mappedData + x6c_videoInfo.width*y, memmove(mappedData + x6c_videoInfo.width*y,
m_yuvBuf.get() + x6c_videoInfo.width*(y*2), m_yuvBuf.get() + x6c_videoInfo.width*(y*2),
x6c_videoInfo.width); x6c_videoInfo.width);
} }
tex.Y[0]->unmap(); tex.Y[0]->unmap();
mappedData = (u8*)tex.Y[1]->map(planeSizeHalf); mappedData = (u8*)tex.Y[1]->map(planeSizeHalf);
for (unsigned y=0 ; y<x6c_videoInfo.height/2 ; ++y) for (unsigned y=0 ; y<x6c_videoInfo.height/2 ; ++y)
{ {
memcpy(mappedData + x6c_videoInfo.width*y, memmove(mappedData + x6c_videoInfo.width*y,
m_yuvBuf.get() + x6c_videoInfo.width*(y*2+1), m_yuvBuf.get() + x6c_videoInfo.width*(y*2+1),
x6c_videoInfo.width); x6c_videoInfo.width);
} }
tex.Y[1]->unmap(); tex.Y[1]->unmap();

2
amuse

@ -1 +1 @@
Subproject commit 8930e005df7a528b3d15866d2039e835f566a61d Subproject commit 117d7046dd5667d75d8ffaa9fd031801c2ec8c9f

2
hecl

@ -1 +1 @@
Subproject commit ea8b603ee18895d87d4cf477712a8848a73c0212 Subproject commit 095b8d70c3eb8a282517c6b2c390427c9bcbd242