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

Movie loading now faster: 

* TAS Savestates moved from MovieRecord to MovieData. 
* Calls to LoadFM2() no longer provide INT_MAX as the size, and now use the actual size of the file.
This commit is contained in:
mart0258 2010-06-07 21:39:10 +00:00
parent 3bfa40572e
commit f0cda70dea
5 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -1,3 +1,4 @@
07-june-2010 - mart0258 - Movie loading now faster - TAS savestates moved from class MovieRecord to class MovieData
07-june-2010 - adelikat - Lua - new function: gui.screenshotas()
07-june-2010 - Deign/adelikat - Win32 - Added a SavestateAs Menu item
06-june-2010 - FatRatKnight - Added a return value to gui.text: The X position where the function would paint the next character.

16
src/drivers/win/tasedit.cpp
View File

@ -106,11 +106,11 @@ static LONG CustomDraw(NMLVCUSTOMDRAW* msg)
SelectObject(msg->nmcd.hdc,debugSystem->hFixedFont);
if((msg->iSubItem-2)/8==0)
if((int)msg->nmcd.dwItemSpec < currMovieData.greenZoneCount &&
!currMovieData.records[msg->nmcd.dwItemSpec].savestate.empty())
!currMovieData.savestates[msg->nmcd.dwItemSpec].empty())
msg->clrTextBk = RGB(192,255,192);
else {}
else if((int)msg->nmcd.dwItemSpec < currMovieData.greenZoneCount &&
!currMovieData.records[msg->nmcd.dwItemSpec].savestate.empty())
!currMovieData.savestates[msg->nmcd.dwItemSpec].empty())
msg->clrTextBk = RGB(144,192,144);
else msg->clrTextBk = RGB(192,192,192);
return CDRF_DODEFAULT;
@ -238,7 +238,7 @@ void LockGreenZone(int newstart)
{
for (int i=1; i<newstart; ++i)
{
currMovieData.records[i].savestate.clear();
currMovieData.savestates[i].clear();
}
}
@ -273,8 +273,7 @@ bool JumpToFrame(int index)
}
if (static_cast<unsigned int>(index)<currMovieData.records.size() &&
!currMovieData.records[index].savestate.empty() &&
MovieData::loadSavestateFrom(&currMovieData.records[index].savestate))
currMovieData.loadTasSavestate(index))
{
currFrameCounter = index;
return true;
@ -292,8 +291,7 @@ bool JumpToFrame(int index)
/* Search for an earlier frame, and try warping to the current. */
for (; i>0; --i)
{
if (!currMovieData.records[i].savestate.empty() &&
MovieData::loadSavestateFrom(&currMovieData.records[i].savestate))
if (currMovieData.loadTasSavestate(i))
{
currFrameCounter=i;
turbo=i+60<index; // turbo unless close
@ -304,7 +302,7 @@ bool JumpToFrame(int index)
poweron(true);
currFrameCounter=0;
MovieData::dumpSavestateTo(&currMovieData.records[0].savestate,0);
MovieData::dumpSavestateTo(&currMovieData.savestates[0],0);
turbo = index>60;
pauseframe=index+1;
}
@ -314,7 +312,7 @@ bool JumpToFrame(int index)
{
poweron(false);
currFrameCounter=0;
MovieData::dumpSavestateTo(&currMovieData.records[0].savestate,0);
MovieData::dumpSavestateTo(&currMovieData.savestates[0],0);
return true;
}

2
src/drivers/win/taseditlib/taseditproj.cpp
View File

@ -81,7 +81,7 @@ bool TASEDIT_PROJECT::LoadProject(std::string PFN)
SetProjectName(PFN);
EMUFILE_FILE ifs(filename, "rb");
LoadFM2(currMovieData, &ifs, INT_MAX, false);
LoadFM2(currMovieData, &ifs, ifs.size(), false);
LoadSubtitles(currMovieData);
char branchname;

46
src/movie.cpp
View File

@ -129,7 +129,7 @@ void MovieData::TryDumpIncremental()
{
if (turbo && pauseframe-256>currFrameCounter && ((currFrameCounter-pauseframe)&0xff))
return;
MovieData::dumpSavestateTo(&currMovieData.records[currFrameCounter].savestate,Z_DEFAULT_COMPRESSION);
currMovieData.storeTasSavestate(currFrameCounter, Z_DEFAULT_COMPRESSION);
}
if(currFrameCounter == currMovieData.greenZoneCount)
{
@ -138,15 +138,15 @@ void MovieData::TryDumpIncremental()
currMovieData.insertEmpty(-1,1);
}
MovieData::dumpSavestateTo(&currMovieData.records[currFrameCounter].savestate,Z_DEFAULT_COMPRESSION);
currMovieData.storeTasSavestate(currFrameCounter, Z_DEFAULT_COMPRESSION);
currMovieData.greenZoneCount++;
} else if (currFrameCounter < currMovieData.greenZoneCount || !movie_readonly)
{
MovieData::dumpSavestateTo(&currMovieData.records[currFrameCounter].savestate,Z_DEFAULT_COMPRESSION);
currMovieData.storeTasSavestate(currFrameCounter, Z_DEFAULT_COMPRESSION);
} else if (currFrameCounter > currMovieData.greenZoneCount && static_cast<unsigned int>(currMovieData.greenZoneCount)<currMovieData.records.size())
{
/* May be required in some malformed TAS projects. */
MovieData::dumpSavestateTo(&currMovieData.records[currFrameCounter].savestate,Z_DEFAULT_COMPRESSION);
currMovieData.storeTasSavestate(currFrameCounter, Z_DEFAULT_COMPRESSION);
currMovieData.greenZoneCount= currFrameCounter+1;
}
}
@ -515,16 +515,16 @@ int MovieData::dumpGreenzone(EMUFILE *os, bool binary)
{
int start = os->ftell();
int frame, size;
for (int i=0; i<(int)records.size(); ++i)
for (int i=0; i<(int)savestates.size(); ++i)
{
if (records[i].savestate.empty())
if (savestates[i].empty())
continue;
frame=i;
size=records[i].savestate.size();
size=savestates[i].size();
write32le(frame, os);
write32le(size, os);
os->fwrite(&records[i].savestate[0], size);
os->fwrite(&savestates[i][0], size);
}
frame=-1;
size=currMovieData.greenZoneCount;
@ -546,6 +546,7 @@ int MovieData::loadGreenzone(EMUFILE *is, bool binary)
if (frame==-1) break;
int pos = is->ftell();
FCEUSS_LoadFP(is, SSLOADPARAM_NOBACKUP);
storeTasSavestate(frame, Z_DEFAULT_COMPRESSION);
is->fseek(pos+size,SEEK_SET);
}
greenZoneCount=size;
@ -887,6 +888,24 @@ void MovieData::dumpSavestateTo(std::vector<uint8>* buf, int compressionLevel)
ms.trim();
}
bool MovieData::loadTasSavestate(int frame)
{
if (frame<0 || frame>=currMovieData.records.size())
return false;
if (savestates.size()<=frame || savestates[frame].empty())
return false;
return MovieData::loadSavestateFrom(&savestates[frame]);
}
void MovieData::storeTasSavestate(int frame, int compression_level)
{
if (savestates.size()<=frame)
savestates.resize(frame+1);
MovieData::dumpSavestateTo(&savestates[frame],compression_level);
}
//begin playing an existing movie
bool FCEUI_LoadMovie(const char *fname, bool _read_only, bool tasedit, int _pauseframe)
{
@ -906,7 +925,6 @@ bool FCEUI_LoadMovie(const char *fname, bool _read_only, bool tasedit, int _paus
strcpy(curMovieFilename, fname);
FCEUFILE *fp = FCEU_fopen(fname,0,"rb",0);
fp->stream = EMUFILE::memwrap(fp->stream);
if (!fp) return false;
if(fp->isArchive() && !_read_only) {
FCEU_PrintError("Cannot open a movie in read+write from an archive.");
@ -925,7 +943,7 @@ bool FCEUI_LoadMovie(const char *fname, bool _read_only, bool tasedit, int _paus
AddRecentMovieFile(name.c_str());
#endif
LoadFM2(currMovieData, fp->stream, INT_MAX, false);
LoadFM2(currMovieData, fp->stream, fp->size, false);
LoadSubtitles(currMovieData);
delete fp;
@ -1354,7 +1372,7 @@ bool FCEUMOV_ReadState(EMUFILE* is, uint32 size)
FCEUI_StopMovie();
}
else
FCEU_PrintError("Mismatch between savestate's movie and current movie.\ncurrent: %s\nsavestate: %s\n",currMovieData.guid.toString().c_str(),tempMovieData.guid.toString().c_str());
FCEU_PrintError("Mismatch between savestate's movie and current movie.\ncurrent: %s\nsavestate: %s\n",currMovieData.guid.toString().c_str(),tempMovieData.guid.toString().c_str());
return false;
#endif
@ -1382,7 +1400,7 @@ bool FCEUMOV_ReadState(EMUFILE* is, uint32 size)
FCEUI_StopMovie();
}
else
FCEU_PrintError("Savestate is from a frame (%d) after the final frame in the movie (%d). This is not permitted.", tempMovieData.records.size(), currMovieData.records.size()-1);
FCEU_PrintError("Savestate is from a frame (%d) after the final frame in the movie (%d). This is not permitted.", tempMovieData.records.size(), currMovieData.records.size()-1);
return false;
}
@ -1413,7 +1431,7 @@ bool FCEUMOV_ReadState(EMUFILE* is, uint32 size)
FCEUI_StopMovie();
}
else
FCEU_PrintError("Error: Savestate not in the same timeline as movie!\nFrame %d branches from current timeline", errorFrame);
FCEU_PrintError("Error: Savestate not in the same timeline as movie!\nFrame %d branches from current timeline", errorFrame);
return false;
}
@ -1585,7 +1603,7 @@ string FCEUI_GetMovieName(void)
bool FCEUI_MovieGetInfo(FCEUFILE* fp, MOVIE_INFO& info, bool skipFrameCount)
{
MovieData md;
if(!LoadFM2(md, fp->stream, INT_MAX, skipFrameCount))
if(!LoadFM2(md, fp->stream, fp->size, skipFrameCount))
return false;
info.movie_version = md.version;

7
src/movie.h
View File

@ -142,9 +142,6 @@ public:
bool Compare(MovieRecord& compareRec);
void clear();
//a waste of memory in lots of cases.. maybe make it a pointer later?
std::vector<uint8> savestate;
void parse(MovieData* md, EMUFILE* is);
bool parseBinary(MovieData* md, EMUFILE* is);
void dump(MovieData* md, EMUFILE* os, int index);
@ -174,6 +171,7 @@ public:
std::string romFilename;
std::vector<uint8> savestate;
std::vector<MovieRecord> records;
std::vector<std::vector<uint8>> savestates;
std::vector<std::wstring> comments;
std::vector<std::string> subtitles;
//this is the RERECORD COUNT. please rename variable.
@ -236,6 +234,9 @@ public:
static bool loadSavestateFrom(std::vector<uint8>* buf);
static void dumpSavestateTo(std::vector<uint8>* buf, int compressionLevel);
bool loadTasSavestate(int frame);
void storeTasSavestate(int frame, int compression_level);
void TryDumpIncremental();
private: