thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Can't just do that, might get the vtbl. Arg.

Browse source
This commit is contained in:
Unknown W. Brackets 2012-12-29 03:19:13 -08:00
parent 7509a2b83a
commit cb0538c4db
3 changed files with 76 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Core/HLE/sceMpeg.cpp
View file

@ -86,8 +86,39 @@ struct StreamInfo
int num;
};
typedef std::map<u32, StreamInfo> StreamInfoMap;
// Internal structure
struct MpegContextSimple {
struct MpegContext {
void DoState(PointerWrap &p) {
p.Do(defaultFrameWidth);
p.Do(videoFrameCount);
p.Do(audioFrameCount);
p.Do(endOfAudioReached);
p.Do(endOfVideoReached);
p.Do(videoPixelMode);
p.Do(mpegMagic);
p.Do(mpegVersion);
p.Do(mpegRawVersion);
p.Do(mpegOffset);
p.Do(mpegStreamSize);
p.Do(mpegFirstTimestamp);
p.Do(mpegLastTimestamp);
p.Do(mpegFirstDate);
p.Do(mpegLastDate);
p.Do(mpegRingbufferAddr);
p.Do(mpegStreamAddr);
p.DoArray(esBuffers, NUM_ES_BUFFERS);
p.Do(avc);
p.Do(avcRegistered);
p.Do(atracRegistered);
p.Do(pcmRegistered);
p.Do(isAnalyzed);
p.Do<StreamInfo>(streamMap);
mediaengine->DoState(p);
p.DoMarker("MpegContext");
}
u32 defaultFrameWidth;
int videoFrameCount;
int audioFrameCount;
@ -113,17 +144,6 @@ struct MpegContextSimple {
bool pcmRegistered;
bool isAnalyzed;
};
typedef std::map<u32, StreamInfo> StreamInfoMap;
struct MpegContext : public MpegContextSimple {
void DoState(PointerWrap &p) {
p.Do<MpegContextSimple>(*this);
p.Do<StreamInfo>(streamMap);
// Media engine has nothing exotic.
p.Do<MediaEngine>(*mediaengine);
p.DoMarker("MpegContext");
}
StreamInfoMap streamMap;
MediaEngine *mediaengine;