Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Mpeg timestamps are in the wrong dword order.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-01-06 19:22:52 -08:00
parent 21cfd087e1
commit 39b91e906c
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Core/HLE/sceMpeg.cpp
View file

@ -581,7 +581,7 @@ u32 sceMpegAvcDecode(u32 mpeg, u32 auAddr, u32 frameWidth, u32 bufferAddr, u32 i
}
SceMpegAu avcAu;
Memory::ReadStruct(auAddr, &avcAu);
avcAu.read(auAddr);
SceMpegRingBuffer ringbuffer;
Memory::ReadStruct(ctx->mpegRingbufferAddr, &ringbuffer);
@ -650,7 +650,7 @@ u32 sceMpegAvcDecode(u32 mpeg, u32 auAddr, u32 frameWidth, u32 bufferAddr, u32 i
ctx->avc.avcDecodeResult = MPEG_AVC_DECODE_SUCCESS;
// Flush structs back to memory
Memory::WriteStruct(auAddr, &avcAu);
avcAu.write(auAddr);
Memory::WriteStruct(ctx->mpegRingbufferAddr, &ringbuffer);
Memory::Write_U32(ctx->avc.avcFrameStatus, initAddr); // 1 = showing, 0 = not showing
@ -731,7 +731,7 @@ int sceMpegInitAu(u32 mpeg, u32 bufferAddr, u32 auPointer)
DEBUG_LOG(HLE, "sceMpegInitAu(%08x, %i, %08x)", mpeg, bufferAddr, auPointer);
SceMpegAu sceAu;
Memory::ReadStruct(auPointer, &sceAu);
sceAu.read(auPointer);
if (bufferAddr >= 1 && bufferAddr <= NUM_ES_BUFFERS && ctx->esBuffers[bufferAddr - 1]) {
// This esbuffer has been allocated for Avc.
@ -740,7 +740,7 @@ int sceMpegInitAu(u32 mpeg, u32 bufferAddr, u32 auPointer)
sceAu.dts = 0;
sceAu.pts = 0;
Memory::WriteStruct(auPointer, &sceAu);
sceAu.write(auPointer);
} else {
// This esbuffer has been left as Atrac.
sceAu.esBuffer = bufferAddr;
@ -748,7 +748,7 @@ int sceMpegInitAu(u32 mpeg, u32 bufferAddr, u32 auPointer)
sceAu.pts = 0;
sceAu.dts = UNKNOWN_TIMESTAMP;
Memory::WriteStruct(auPointer, &sceAu);
sceAu.write(auPointer);
}
return 0;
}
@ -859,7 +859,7 @@ int sceMpegGetAvcAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
Memory::ReadStruct(ctx->mpegRingbufferAddr, &mpegRingbuffer);
SceMpegAu sceAu;
Memory::ReadStruct(auAddr, &sceAu);
sceAu.read(auAddr);
if (mpegRingbuffer.packetsRead == 0) {
// delayThread(mpegErrorDecodeDelay)
@ -888,11 +888,11 @@ int sceMpegGetAvcAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
} else {
ctx->endOfAudioReached = false;
}
// The avcau struct may have been modified by mediaengine, write it back.
Memory::WriteStruct(auAddr, &sceAu);
}
// The avcau struct may have been modified by mediaengine, write it back.
sceAu.write(auAddr);
if (Memory::IsValidAddress(attrAddr)) {
Memory::Write_U32(1, attrAddr);
}
@ -926,7 +926,7 @@ int sceMpegGetAtracAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
Memory::ReadStruct(ctx->mpegRingbufferAddr, &mpegRingbuffer);
SceMpegAu sceAu;
Memory::ReadStruct(auAddr, &sceAu);
sceAu.read(auAddr);
//...

13
Core/HLE/sceMpeg.h
View file

@ -19,6 +19,7 @@
#include "../../Globals.h"
#include "../../Common/ChunkFile.h"
#include "../MIPS/MIPS.h"
enum {
ERROR_MPEG_BAD_VERSION = 0x80610002,
@ -57,6 +58,18 @@ struct SceMpegAu {
s64 dts; // decode time stamp
u32 esBuffer;
u32 esSize;
void read(u32 addr) {
Memory::ReadStruct(addr, this);
pts = (pts & 0xFFFFFFFFULL) << 32 | (pts >> 32);
dts = (dts & 0xFFFFFFFFULL) << 32 | (dts >> 32);
}
void write(u32 addr) {
pts = (pts & 0xFFFFFFFFULL) << 32 | (pts >> 32);
dts = (dts & 0xFFFFFFFFULL) << 32 | (dts >> 32);
Memory::WriteStruct(addr, this);
}
};
const int videoTimestampStep = 3003;