libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-26 11:45:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1150 from unknownbrackets/mpeg-fix

Browse Source 
Reset video pts when registering new streams
This commit is contained in:
Henrik Rydgård 2013-04-01 11:18:30 -07:00
commit 28b38ab9b6
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Core/HLE/sceMpeg.cpp
View File

@ -155,6 +155,7 @@ struct StreamInfo {
int type; int type;
int num; int num;
int sid; int sid;
bool needsReset;
}; };
typedef std::map<u32, StreamInfo> StreamInfoMap; typedef std::map<u32, StreamInfo> StreamInfoMap;
@ -618,6 +619,7 @@ int sceMpegRegistStream(u32 mpeg, u32 streamType, u32 streamNum)
StreamInfo info; StreamInfo info;
info.type = streamType; info.type = streamType;
info.num = streamNum; info.num = streamNum;
info.needsReset = true;
ctx->streamMap[sid] = info; ctx->streamMap[sid] = info;
return sid; return sid;
} }
@ -813,6 +815,7 @@ u32 sceMpegUnRegistStream(u32 mpeg, int streamUid)
ctx->streamMap[streamUid] = info; ctx->streamMap[streamUid] = info;
info.type = -1; info.type = -1;
info.sid = -1 ; info.sid = -1 ;
info.needsReset = true;
ctx->isAnalyzed = false; ctx->isAnalyzed = false;
return 0; return 0;
} }
@ -1008,14 +1011,6 @@ int sceMpegRingbufferAvailableSize(u32 ringbufferAddr)
SceMpegRingBuffer ringbuffer; SceMpegRingBuffer ringbuffer;
Memory::ReadStruct(ringbufferAddr, &ringbuffer); Memory::ReadStruct(ringbufferAddr, &ringbuffer);
DEBUG_LOG(HLE, "%i=sceMpegRingbufferAvailableSize(%08x)", ringbuffer.packetsFree, ringbufferAddr); DEBUG_LOG(HLE, "%i=sceMpegRingbufferAvailableSize(%08x)", ringbuffer.packetsFree, ringbufferAddr);
static int c = 0;
if (ringbuffer.packetsFree == 0)
c++;
else
c = 0;
//if (c > 1000)
//hleDebugBreak();
return ringbuffer.packetsFree; return ringbuffer.packetsFree;
} }
@ -1102,12 +1097,19 @@ int sceMpegGetAvcAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
return PSP_ERROR_MPEG_NO_DATA; return PSP_ERROR_MPEG_NO_DATA;
} }
if (ctx->streamMap.find(streamId) == ctx->streamMap.end()) auto streamInfo = ctx->streamMap.find(streamId);
if (streamInfo == ctx->streamMap.end())
{ {
ERROR_LOG(HLE, "sceMpegGetAvcAu - bad stream id %i", streamId); ERROR_LOG(HLE, "sceMpegGetAvcAu - bad stream id %i", streamId);
return -1; return -1;
} }
if (streamInfo->second.needsReset)
{
sceAu.pts = 0;
streamInfo->second.needsReset = false;
}
// Wait for audio if too much ahead // Wait for audio if too much ahead
if (ctx->atracRegistered && (sceAu.pts > sceAu.pts + getMaxAheadTimestamp(mpegRingbuffer))) if (ctx->atracRegistered && (sceAu.pts > sceAu.pts + getMaxAheadTimestamp(mpegRingbuffer)))
{ {
@ -1174,6 +1176,13 @@ int sceMpegGetAtracAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
SceMpegAu sceAu; SceMpegAu sceAu;
sceAu.read(auAddr); sceAu.read(auAddr);
auto streamInfo = ctx->streamMap.find(streamId);
if (streamInfo != ctx->streamMap.end() && streamInfo->second.needsReset)
{
sceAu.pts = 0;
streamInfo->second.needsReset = false;
}
int result = 0; int result = 0;
if (mpegRingbuffer.packetsFree == mpegRingbuffer.packets) { if (mpegRingbuffer.packetsFree == mpegRingbuffer.packets) {
@ -1228,7 +1237,7 @@ u32 sceMpegChangeGetAuMode(u32 mpeg, int streamUid, int mode)
// NOTE: Where is the info supposed to come from? // NOTE: Where is the info supposed to come from?
StreamInfo info = {0}; StreamInfo info = {0};
info.sid = streamUid; info.sid = streamUid;
if (info.sid) { if (info.sid) {
switch (info.type) { switch (info.type) {
case MPEG_AVC_STREAM: case MPEG_AVC_STREAM:
if(mode == MPEG_AU_MODE_DECODE) { if(mode == MPEG_AU_MODE_DECODE) {