ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Loading savestates now changes the active branch

This commit is contained in:
Jeffrey Pfau 2014-08-05 23:52:08 -07:00
parent 5ee336d274
commit 0389237fc6
3 changed files with 92 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/gba/gba-rr.c
View File

@ -13,8 +13,12 @@ static bool _verifyMagic(struct GBARRContext* rr, struct VFile* vf);
static enum GBARRTag _readTag(struct GBARRContext* rr, struct VFile* vf); static enum GBARRTag _readTag(struct GBARRContext* rr, struct VFile* vf);
static bool _seekTag(struct GBARRContext* rr, struct VFile* vf, enum GBARRTag tag); static bool _seekTag(struct GBARRContext* rr, struct VFile* vf, enum GBARRTag tag);
static bool _emitTag(struct GBARRContext* rr, struct VFile* vf, uint8_t tag); static bool _emitTag(struct GBARRContext* rr, struct VFile* vf, uint8_t tag);
static bool _emitEnd(struct GBARRContext* rr, struct VFile* vf);
static bool _parseMetadata(struct GBARRContext* rr, struct VFile* vf); static bool _parseMetadata(struct GBARRContext* rr, struct VFile* vf);
static bool _markStreamNext(struct GBARRContext* rr, uint32_t newStreamId, bool recursive);
static struct VFile* _openSavedata(struct GBARRContext* rr, int flags); static struct VFile* _openSavedata(struct GBARRContext* rr, int flags);
static struct VFile* _openSavestate(struct GBARRContext* rr, int flags); static struct VFile* _openSavestate(struct GBARRContext* rr, int flags);
@ -113,7 +117,7 @@ bool GBARRInitStream(struct GBARRContext* rr, struct VDir* stream) {
if (!_parseMetadata(rr, rr->metadataFile)) { if (!_parseMetadata(rr, rr->metadataFile)) {
rr->metadataFile->close(rr->metadataFile); rr->metadataFile->close(rr->metadataFile);
rr->metadataFile = 0; rr->metadataFile = 0;
rr->maxStreamId = 1; rr->maxStreamId = 0;
} }
rr->streamId = 1; rr->streamId = 1;
rr->movieStream = 0; rr->movieStream = 0;
@ -136,8 +140,8 @@ bool GBARRReinitStream(struct GBARRContext* rr, enum GBARRInitFrom initFrom) {
rr->initFromOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR); rr->initFromOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR);
_emitTag(rr, rr->metadataFile, TAG_INIT | initFrom); _emitTag(rr, rr->metadataFile, TAG_INIT | initFrom);
rr->streamId = 1; rr->streamId = 0;
rr->maxStreamId = 1; rr->maxStreamId = 0;
rr->maxStreamIdOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR); rr->maxStreamIdOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR);
_emitTag(rr, rr->metadataFile, 1); _emitTag(rr, rr->metadataFile, 1);
return true; return true;
@ -152,11 +156,9 @@ bool GBARRLoadStream(struct GBARRContext* rr, uint32_t streamId) {
char buffer[14]; char buffer[14];
snprintf(buffer, sizeof(buffer), "%u" BINARY_EXT, streamId); snprintf(buffer, sizeof(buffer), "%u" BINARY_EXT, streamId);
if (GBARRIsRecording(rr)) { if (GBARRIsRecording(rr)) {
int flags = O_CREAT | O_WRONLY; int flags = O_CREAT | O_RDWR;
if (streamId > rr->maxStreamId) { if (streamId > rr->maxStreamId) {
flags |= O_TRUNC; flags |= O_TRUNC;
} else {
flags |= O_APPEND;
} }
rr->movieStream = rr->streamDir->openFile(rr->streamDir, buffer, flags); rr->movieStream = rr->streamDir->openFile(rr->streamDir, buffer, flags);
} else if (GBARRIsPlaying(rr)) { } else if (GBARRIsPlaying(rr)) {
@ -171,17 +173,13 @@ bool GBARRLoadStream(struct GBARRContext* rr, uint32_t streamId) {
return true; return true;
} }
bool GBARRIncrementStream(struct GBARRContext* rr) { bool GBARRIncrementStream(struct GBARRContext* rr, bool recursive) {
uint32_t newStreamId = rr->maxStreamId + 1; uint32_t newStreamId = rr->maxStreamId + 1;
uint32_t oldStreamId = rr->streamId; uint32_t oldStreamId = rr->streamId;
if (GBARRIsRecording(rr) && rr->movieStream) { if (GBARRIsRecording(rr) && rr->movieStream) {
_emitTag(rr, rr->movieStream, TAG_END); if (!_markStreamNext(rr, newStreamId, recursive)) {
_emitTag(rr, rr->movieStream, TAG_FRAME_COUNT); return false;
rr->movieStream->write(rr->movieStream, &rr->frames, sizeof(rr->frames)); }
_emitTag(rr, rr->movieStream, TAG_LAG_COUNT);
rr->movieStream->write(rr->movieStream, &rr->lagFrames, sizeof(rr->lagFrames));
_emitTag(rr, rr->movieStream, TAG_NEXT_TIME);
rr->movieStream->write(rr->movieStream, &newStreamId, sizeof(newStreamId));
} }
if (!GBARRLoadStream(rr, newStreamId)) { if (!GBARRLoadStream(rr, newStreamId)) {
return false; return false;
@ -194,6 +192,7 @@ bool GBARRIncrementStream(struct GBARRContext* rr) {
rr->metadataFile->seek(rr->metadataFile, rr->maxStreamIdOffset, SEEK_SET); rr->metadataFile->seek(rr->metadataFile, rr->maxStreamIdOffset, SEEK_SET);
rr->metadataFile->write(rr->movieStream, &rr->maxStreamId, sizeof(rr->maxStreamId)); rr->metadataFile->write(rr->movieStream, &rr->maxStreamId, sizeof(rr->maxStreamId));
rr->previously = oldStreamId;
return true; return true;
} }
@ -216,6 +215,12 @@ bool GBARRStartPlaying(struct GBARRContext* rr, bool autorecord) {
rr->peekedTag = TAG_INVALID; rr->peekedTag = TAG_INVALID;
_readTag(rr, rr->movieStream); // Discard the buffer _readTag(rr, rr->movieStream); // Discard the buffer
enum GBARRTag tag = _readTag(rr, rr->movieStream); enum GBARRTag tag = _readTag(rr, rr->movieStream);
if (tag == TAG_PREVIOUSLY) {
if (rr->previously != 0) {
return false;
}
tag = _readTag(rr, rr->movieStream);
}
if (tag != TAG_BEGIN) { if (tag != TAG_BEGIN) {
rr->movieStream->close(rr->movieStream); rr->movieStream->close(rr->movieStream);
rr->movieStream = 0; rr->movieStream = 0;
@ -242,19 +247,6 @@ bool GBARRStartRecording(struct GBARRContext* rr) {
return false; return false;
} }
char buffer[14];
snprintf(buffer, sizeof(buffer), "%u" BINARY_EXT, rr->streamId);
rr->movieStream = rr->streamDir->openFile(rr->streamDir, buffer, O_TRUNC | O_CREAT | O_WRONLY);
if (!rr->movieStream) {
return false;
}
_emitMagic(rr, rr->movieStream);
if (!_emitTag(rr, rr->movieStream, TAG_BEGIN)) {
rr->movieStream->close(rr->movieStream);
rr->movieStream = 0;
return false;
}
if (!rr->maxStreamIdOffset) { if (!rr->maxStreamIdOffset) {
_emitTag(rr, rr->metadataFile, TAG_MAX_STREAM); _emitTag(rr, rr->metadataFile, TAG_MAX_STREAM);
rr->maxStreamIdOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR); rr->maxStreamIdOffset = rr->metadataFile->seek(rr->metadataFile, 0, SEEK_CUR);
@ -262,7 +254,7 @@ bool GBARRStartRecording(struct GBARRContext* rr) {
} }
rr->isRecording = true; rr->isRecording = true;
return true; return GBARRIncrementStream(rr, false);
} }
void GBARRStopRecording(struct GBARRContext* rr) { void GBARRStopRecording(struct GBARRContext* rr) {
@ -312,7 +304,7 @@ void GBARRNextFrame(struct GBARRContext* rr) {
if (rr->autorecord) { if (rr->autorecord) {
rr->isRecording = true; rr->isRecording = true;
GBARRLoadStream(rr, endStreamId); GBARRLoadStream(rr, endStreamId);
GBARRIncrementStream(rr); GBARRIncrementStream(rr, false);
} }
} }
} }
@ -342,6 +334,15 @@ uint16_t GBARRQueryInput(struct GBARRContext* rr) {
return rr->currentInput; return rr->currentInput;
} }
bool GBARRFinishSegment(struct GBARRContext* rr) {
if (rr->movieStream) {
if (!_emitEnd(rr, rr->movieStream)) {
return false;
}
}
return GBARRIncrementStream(rr, false);
}
bool GBARRSkipSegment(struct GBARRContext* rr) { bool GBARRSkipSegment(struct GBARRContext* rr) {
rr->nextTime = 0; rr->nextTime = 0;
while (_readTag(rr, rr->movieStream) != TAG_EOF); while (_readTag(rr, rr->movieStream) != TAG_EOF);
@ -474,6 +475,59 @@ bool _parseMetadata(struct GBARRContext* rr, struct VFile* vf) {
return true; return true;
} }
bool _emitEnd(struct GBARRContext* rr, struct VFile* vf) {
// TODO: Error check
_emitTag(rr, vf, TAG_END);
_emitTag(rr, vf, TAG_FRAME_COUNT);
vf->write(vf, &rr->frames, sizeof(rr->frames));
_emitTag(rr, vf, TAG_LAG_COUNT);
vf->write(vf, &rr->lagFrames, sizeof(rr->lagFrames));
_emitTag(rr, vf, TAG_NEXT_TIME);
uint32_t newStreamId = 0;
vf->write(vf, &newStreamId, sizeof(newStreamId));
return true;
}
bool _markStreamNext(struct GBARRContext* rr, uint32_t newStreamId, bool recursive) {
if (rr->movieStream->seek(rr->movieStream, -sizeof(newStreamId) - 1, SEEK_END) < 0) {
return false;
}
uint8_t tagBuffer;
if (rr->movieStream->read(rr->movieStream, &tagBuffer, 1) != 1) {
return false;
}
if (tagBuffer != TAG_NEXT_TIME) {
return false;
}
if (rr->movieStream->write(rr->movieStream, &newStreamId, sizeof(newStreamId)) != sizeof(newStreamId)) {
return false;
}
if (recursive) {
if (rr->movieStream->seek(rr->movieStream, 0, SEEK_SET) < 0) {
return false;
}
if (!_verifyMagic(rr, rr->movieStream)) {
return false;
}
_readTag(rr, rr->movieStream);
if (_readTag(rr, rr->movieStream) != TAG_PREVIOUSLY) {
return false;
}
if (rr->previously == 0) {
return true;
}
uint32_t currentStreamId = rr->streamId;
if (!GBARRLoadStream(rr, rr->previously)) {
return false;
}
return _markStreamNext(rr, currentStreamId, rr->previously);
}
return true;
}
struct VFile* _openSavedata(struct GBARRContext* rr, int flags) { struct VFile* _openSavedata(struct GBARRContext* rr, int flags) {
return rr->streamDir->openFile(rr->streamDir, "movie.sav", flags); return rr->streamDir->openFile(rr->streamDir, "movie.sav", flags);
} }

3
src/gba/gba-rr.h
View File

@ -85,7 +85,8 @@ void GBARRLoadState(struct GBA*);
bool GBARRInitStream(struct GBARRContext*, struct VDir*); bool GBARRInitStream(struct GBARRContext*, struct VDir*);
bool GBARRReinitStream(struct GBARRContext*, enum GBARRInitFrom); bool GBARRReinitStream(struct GBARRContext*, enum GBARRInitFrom);
bool GBARRLoadStream(struct GBARRContext*, uint32_t streamId); bool GBARRLoadStream(struct GBARRContext*, uint32_t streamId);
bool GBARRIncrementStream(struct GBARRContext*); bool GBARRIncrementStream(struct GBARRContext*, bool recursive);
bool GBARRFinishSegment(struct GBARRContext*);
bool GBARRSkipSegment(struct GBARRContext*); bool GBARRSkipSegment(struct GBARRContext*);
bool GBARRStartPlaying(struct GBARRContext*, bool autorecord); bool GBARRStartPlaying(struct GBARRContext*, bool autorecord);

10
src/gba/gba-serialize.c
View File

@ -39,7 +39,7 @@ void GBASerialize(struct GBA* gba, struct GBASerializedState* state) {
if (GBARRIsRecording(gba->rr)) { if (GBARRIsRecording(gba->rr)) {
state->associatedStreamId = gba->rr->streamId; state->associatedStreamId = gba->rr->streamId;
GBARRIncrementStream(gba->rr); GBARRFinishSegment(gba->rr);
} else { } else {
state->associatedStreamId = 0; state->associatedStreamId = 0;
} }
@ -80,8 +80,12 @@ void GBADeserialize(struct GBA* gba, struct GBASerializedState* state) {
GBAAudioDeserialize(&gba->audio, state); GBAAudioDeserialize(&gba->audio, state);
if (GBARRIsRecording(gba->rr)) { if (GBARRIsRecording(gba->rr)) {
GBARRLoadStream(gba->rr, state->associatedStreamId); if (state->associatedStreamId != gba->rr->streamId) {
GBARRIncrementStream(gba->rr); GBARRLoadStream(gba->rr, state->associatedStreamId);
GBARRIncrementStream(gba->rr, true);
} else {
GBARRFinishSegment(gba->rr);
}
} else if (GBARRIsPlaying(gba->rr)) { } else if (GBARRIsPlaying(gba->rr)) {
GBARRLoadStream(gba->rr, state->associatedStreamId); GBARRLoadStream(gba->rr, state->associatedStreamId);
GBARRSkipSegment(gba->rr); GBARRSkipSegment(gba->rr);