Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-12-04 03:32:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2081 from oioitff/mpeg-fix

Browse Source 
More improvement for mpeg pts.
This commit is contained in:
Henrik Rydgård 2013-06-04 08:19:25 -07:00
commit db7d20dbe2
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/HLE/sceMpeg.cpp
View File

@ -975,7 +975,7 @@ int sceMpegGetAvcAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
int result = 0;
sceAu.pts = ctx->mediaengine->getVideoTimeStamp();
if (sceAu.pts >= ctx->mediaengine->getLastTimeStamp()) {
if (ctx->mediaengine->IsVideoEnd()) {
INFO_LOG(HLE, "video end reach. pts: %i dts: %i", (int)sceAu.pts, (int)ctx->mediaengine->getLastTimeStamp());
mpegRingbuffer.packetsFree = mpegRingbuffer.packets;
Memory::WriteStruct(ctx->mpegRingbufferAddr, &mpegRingbuffer);
@ -1039,7 +1039,7 @@ int sceMpegGetAtracAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
int result = 0;
sceAu.pts = ctx->mediaengine->getAudioTimeStamp();
if (sceAu.pts >= ctx->mediaengine->getLastTimeStamp()) {
if (ctx->mediaengine->IsVideoEnd()) {
INFO_LOG(HLE, "video end reach. pts: %i dts: %i", (int)sceAu.pts, (int)ctx->mediaengine->getLastTimeStamp());
mpegRingbuffer.packetsFree = mpegRingbuffer.packets;
Memory::WriteStruct(ctx->mpegRingbufferAddr, &mpegRingbuffer);

9
Core/HW/MediaEngine.cpp
View File

@ -91,6 +91,7 @@ MediaEngine::MediaEngine(): m_streamSize(0), m_readSize(0), m_pdata(0) {
m_buffer = 0;
m_demux = 0;
m_audioContext = 0;
m_isVideoEnd = false;
}
MediaEngine::~MediaEngine() {
@ -128,6 +129,7 @@ void MediaEngine::closeMedia() {
m_pdata = 0;
m_demux = 0;
Atrac3plus_Decoder::CloseContext(&m_audioContext);
m_isVideoEnd = false;
}
int _MpegReadbuffer(void *opaque, uint8_t *buf, int buf_size)
@ -208,6 +210,7 @@ bool MediaEngine::openContext() {
m_demux->demux();
m_audioPos = 0;
m_audioContext = Atrac3plus_Decoder::OpenContext();
m_isVideoEnd = false;
#endif // USE_FFMPEG
return true;
}
@ -362,13 +365,15 @@ bool MediaEngine::stepVideo(int videoPixelMode) {
if(frameFinished) {
int firstTimeStamp = bswap32(*(int*)(m_pdata + 86));
m_videopts = packet.pts + packet.duration - firstTimeStamp;
m_videopts = pFrame->pkt_dts + pFrame->pkt_duration - firstTimeStamp;
bGetFrame = true;
}
}
av_free_packet(&packet);
if (bGetFrame) break;
}
if (!bGetFrame && m_readSize >= m_streamSize)
m_isVideoEnd = true;
return bGetFrame;
#else
return true;
@ -552,7 +557,7 @@ s64 MediaEngine::getVideoTimeStamp() {
s64 MediaEngine::getAudioTimeStamp() {
if (m_demux)
return m_audiopts;
return std::max(m_audiopts - 4180, (s64)0);
return m_videopts;
}

4
Core/HW/MediaEngine.h
View File

@ -58,6 +58,8 @@ public:
s64 getAudioTimeStamp();
s64 getLastTimeStamp();
bool IsVideoEnd() { return m_isVideoEnd;}
void DoState(PointerWrap &p) {
p.Do(m_streamSize);
p.Do(m_readSize);
@ -93,4 +95,6 @@ public:
int m_audioPos;
void* m_audioContext;
s64 m_audiopts;
bool m_isVideoEnd;
};