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

many movie fixes (mainly for readonly mode), and some wii input display support

This commit is contained in:
nitsuja 2011-12-14 04:03:05 -08:00
parent f3325036be
commit 9470f9545f
6 changed files with 345 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Core/Src/Core.cpp
View File

@ -101,6 +101,7 @@ std::string g_stateFileName;
std::thread g_EmuThread; std::thread g_EmuThread;
static std::thread g_cpu_thread; static std::thread g_cpu_thread;
static bool g_requestRefreshInfo;
SCoreStartupParameter g_CoreStartupParameter; SCoreStartupParameter g_CoreStartupParameter;
@ -261,7 +262,7 @@ void Stop() // - Hammertime!
SConfig::GetInstance().m_SYSCONF->Reload(); SConfig::GetInstance().m_SYSCONF->Reload();
INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----"); INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----");
Movie::g_InputCounter = 0; Movie::g_currentInputCount = 0;
g_bStopping = false; g_bStopping = false;
} }
@ -537,6 +538,11 @@ void SaveScreenShot()
SetState(CORE_RUN); SetState(CORE_RUN);
} }
void RequestRefreshInfo()
{
g_requestRefreshInfo = true;
}
// Apply Frame Limit and Display FPS info // Apply Frame Limit and Display FPS info
// This should only be called from VI // This should only be called from VI
void VideoThrottle() void VideoThrottle()
@ -561,8 +567,9 @@ void VideoThrottle()
// Update info per second // Update info per second
u32 ElapseTime = (u32)Timer.GetTimeDifference(); u32 ElapseTime = (u32)Timer.GetTimeDifference();
if ((ElapseTime >= 1000 && DrawnVideo > 0) || Movie::g_bFrameStep) if ((ElapseTime >= 1000 && DrawnVideo > 0) || g_requestRefreshInfo)
{ {
g_requestRefreshInfo = false;
SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter; SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
u32 FPS = Common::AtomicLoad(DrawnFrame) * 1000 / ElapseTime; u32 FPS = Common::AtomicLoad(DrawnFrame) * 1000 / ElapseTime;
@ -599,8 +606,10 @@ void VideoThrottle()
#else // Summary information #else // Summary information
std::string SFPS; std::string SFPS;
if (Movie::IsPlayingInput() || Movie::IsRecordingInput()) if (Movie::IsPlayingInput())
SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", Movie::g_frameCounter, Movie::g_InputCounter, FPS, VPS, Speed); SFPS = StringFromFormat("VI: %u/%u - Frame: %u/%u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed);
else if (Movie::IsRecordingInput())
SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, Speed);
else else
SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed); SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed);
#endif #endif

1
Source/Core/Core/Src/Core.h
View File

@ -85,6 +85,7 @@ void StopTrace();
bool ShouldSkipFrame(int skipped); bool ShouldSkipFrame(int skipped);
void VideoThrottle(); void VideoThrottle();
void RequestRefreshInfo();
#ifdef RERECORDING #ifdef RERECORDING

6
Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -637,9 +637,9 @@ void Wiimote::Update()
Movie::SetPolledDevice(); Movie::SetPolledDevice();
if (!Movie::IsPlayingInput() || !Movie::PlayWiimote(m_index, data, rptf_size))
{
const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE]; const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE];
if (!Movie::IsPlayingInput() || !Movie::PlayWiimote(m_index, data, rptf_size, rptf.core?(data+rptf.core):NULL, rptf.accel?(data+rptf.accel):NULL, rptf.ir?(data+rptf.ir):NULL))
{
rptf_size = rptf.size; rptf_size = rptf.size;
data[0] = 0xA1; data[0] = 0xA1;
@ -744,7 +744,7 @@ void Wiimote::Update()
} }
if (Movie::IsRecordingInput()) if (Movie::IsRecordingInput())
{ {
Movie::RecordWiimote(m_index, data, rptf_size); Movie::RecordWiimote(m_index, data, rptf_size, rptf.core?(data+rptf.core):NULL, rptf.accel?(data+rptf.accel):NULL, rptf.ir?(data+rptf.ir):NULL);
} }
} }

409
Source/Core/Core/Src/Movie.cpp
View File

@ -24,6 +24,8 @@
#include "PowerPC/PowerPC.h" #include "PowerPC/PowerPC.h"
#include "HW/SI.h" #include "HW/SI.h"
#include "HW/Wiimote.h" #include "HW/Wiimote.h"
#include "HW/WiimoteEmu/WiimoteEmu.h"
#include "HW/WiimoteEmu/WiimoteHid.h"
#include "IPC_HLE/WII_IPC_HLE_Device_usb.h" #include "IPC_HLE/WII_IPC_HLE_Device_usb.h"
#include "VideoBackendBase.h" #include "VideoBackendBase.h"
#include "State.h" #include "State.h"
@ -46,35 +48,42 @@ u32 g_framesToSkip = 0, g_frameSkipCounter = 0;
u8 g_numPads = 0; u8 g_numPads = 0;
ControllerState g_padState; ControllerState g_padState;
DTMHeader tmpHeader; DTMHeader tmpHeader;
u8 *tmpInput = NULL; u8* tmpInput = NULL;
u64 inputOffset = 0, tmpLength = 0; u64 g_currentByte = 0, g_totalBytes = 0;
u64 g_currentFrame = 0, g_totalFrames = 0; // VI
u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats
u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats
u64 g_frameCounter = 0, g_lagCounter = 0, g_totalFrameCount = 0, g_InputCounter = 0;
bool g_bRecordingFromSaveState = false; bool g_bRecordingFromSaveState = false;
bool g_bPolled = false; bool g_bPolled = false;
int g_currentSaveVersion = 0;
std::string tmpStateFilename = "dtm.sav"; std::string tmpStateFilename = "dtm.sav";
std::string g_InputDisplay[4]; std::string g_InputDisplay[8];
ManipFunction mfunc = NULL; ManipFunction mfunc = NULL;
std::string GetInputDisplay() std::string GetInputDisplay()
{ {
std::string inputDisplay = ""; std::string inputDisplay = "";
for (int i = 0; i < 4; ++i) for (int i = 0; i < 8; ++i)
if ((g_numPads & (1 << i)) != 0)
inputDisplay.append(g_InputDisplay[i]); inputDisplay.append(g_InputDisplay[i]);
return inputDisplay; return inputDisplay;
} }
void FrameUpdate() void FrameUpdate()
{ {
g_frameCounter++; g_currentFrame++;
if (IsRecordingInput())
g_totalFrameCount = g_frameCounter;
if(!g_bPolled) if(!g_bPolled)
g_lagCounter++; g_currentLagCount++;
if (IsRecordingInput())
{
g_totalFrames = g_currentFrame;
g_totalLagCount = g_currentLagCount;
}
if (g_bFrameStep) if (g_bFrameStep)
{ {
@ -95,7 +104,9 @@ void FrameUpdate()
void InputUpdate() void InputUpdate()
{ {
g_InputCounter++; g_currentInputCount++;
if (IsRecordingInput())
g_totalInputCount = g_currentInputCount;
} }
void SetFrameSkipping(unsigned int framesToSkip) void SetFrameSkipping(unsigned int framesToSkip)
@ -122,9 +133,10 @@ void DoFrameStep()
{ {
// if already paused, frame advance for 1 frame // if already paused, frame advance for 1 frame
Core::SetState(Core::CORE_RUN); Core::SetState(Core::CORE_RUN);
Core::RequestRefreshInfo();
g_bFrameStep = true; g_bFrameStep = true;
} }
else else if(!g_bFrameStep)
{ {
// if not paused yet, pause immediately instead // if not paused yet, pause immediately instead
Core::SetState(Core::CORE_PAUSE); Core::SetState(Core::CORE_PAUSE);
@ -169,6 +181,11 @@ bool IsRecordingInputFromSaveState()
return g_bRecordingFromSaveState; return g_bRecordingFromSaveState;
} }
bool IsJustStartingRecordingInputFromSaveState()
{
return IsRecordingInputFromSaveState() && g_currentFrame == 0;
}
bool IsPlayingInput() bool IsPlayingInput()
{ {
return (g_playMode == MODE_PLAYING); return (g_playMode == MODE_PLAYING);
@ -244,89 +261,175 @@ bool BeginRecordingInput(int controllers)
} }
g_numPads = controllers; g_numPads = controllers;
g_currentFrame = g_totalFrames = 0;
g_frameCounter = g_lagCounter = g_InputCounter = 0; g_currentLagCount = g_totalLagCount = 0;
g_currentInputCount = g_totalInputCount = 0;
g_rerecords = 0; g_rerecords = 0;
g_playMode = MODE_RECORDING; g_playMode = MODE_RECORDING;
inputOffset = 0;
delete tmpInput; delete tmpInput;
tmpInput = new u8[MAX_DTM_LENGTH]; tmpInput = new u8[MAX_DTM_LENGTH];
g_currentByte = g_totalBytes = 0;
Core::DisplayMessage("Starting movie recording", 2000); Core::DisplayMessage("Starting movie recording", 2000);
return true; return true;
} }
static void Analog2DToString(u8 x, u8 y, const char* prefix, char* str)
{
if((x <= 1 || x == 128 || x >= 255)
&& (y <= 1 || y == 128 || y >= 255))
{
if(x != 128 || y != 128)
{
if(x != 128 && y != 128)
{
sprintf(str, "%s:%s,%s", prefix, x<128?"LEFT":"RIGHT", y<128?"DOWN":"UP");
}
else if(x != 128)
{
sprintf(str, "%s:%s", prefix, x<128?"LEFT":"RIGHT");
}
else
{
sprintf(str, "%s:%s", prefix, y<128?"DOWN":"UP");
}
}
else
{
str[0] = '\0';
}
}
else
{
sprintf(str, "%s:%d,%d", prefix, x, y);
}
}
static void Analog1DToString(u8 v, const char* prefix, char* str)
{
if(v > 0)
{
if(v == 255)
{
strcpy(str, prefix);
}
else
{
sprintf(str, "%s:%d", prefix, v);
}
}
else
{
str[0] = '\0';
}
}
void SetInputDisplayString(ControllerState padState, int controllerID) void SetInputDisplayString(ControllerState padState, int controllerID)
{ {
char inp[70]; char inp[70];
sprintf(inp, "%dP:", controllerID + 1); sprintf(inp, "P%d:", controllerID + 1);
g_InputDisplay[controllerID] = inp; g_InputDisplay[controllerID] = inp;
sprintf(inp, " X: %d Y: %d rX: %d rY: %d L: %d R: %d",
g_padState.AnalogStickX,
g_padState.AnalogStickY,
g_padState.CStickX,
g_padState.CStickY,
g_padState.TriggerL,
g_padState.TriggerR);
g_InputDisplay[controllerID].append(inp);
if(g_padState.A) if(g_padState.A)
{
g_InputDisplay[controllerID].append(" A"); g_InputDisplay[controllerID].append(" A");
}
if(g_padState.B) if(g_padState.B)
{
g_InputDisplay[controllerID].append(" B"); g_InputDisplay[controllerID].append(" B");
}
if(g_padState.X) if(g_padState.X)
{
g_InputDisplay[controllerID].append(" X"); g_InputDisplay[controllerID].append(" X");
}
if(g_padState.Y) if(g_padState.Y)
{
g_InputDisplay[controllerID].append(" Y"); g_InputDisplay[controllerID].append(" Y");
}
if(g_padState.Z) if(g_padState.Z)
{
g_InputDisplay[controllerID].append(" Z"); g_InputDisplay[controllerID].append(" Z");
}
if(g_padState.Start) if(g_padState.Start)
{
g_InputDisplay[controllerID].append(" START"); g_InputDisplay[controllerID].append(" START");
}
if(g_padState.DPadUp) if(g_padState.DPadUp)
{
g_InputDisplay[controllerID].append(" UP"); g_InputDisplay[controllerID].append(" UP");
}
if(g_padState.DPadDown) if(g_padState.DPadDown)
{
g_InputDisplay[controllerID].append(" DOWN"); g_InputDisplay[controllerID].append(" DOWN");
}
if(g_padState.DPadLeft) if(g_padState.DPadLeft)
{
g_InputDisplay[controllerID].append(" LEFT"); g_InputDisplay[controllerID].append(" LEFT");
}
if(g_padState.DPadRight) if(g_padState.DPadRight)
{
g_InputDisplay[controllerID].append(" RIGHT"); g_InputDisplay[controllerID].append(" RIGHT");
//if(g_padState.L)
//{
// g_InputDisplay[controllerID].append(" L");
//}
//if(g_padState.R)
//{
// g_InputDisplay[controllerID].append(" R");
//}
Analog1DToString(g_padState.TriggerL, " L", inp);
g_InputDisplay[controllerID].append(inp);
Analog1DToString(g_padState.TriggerR, " R", inp);
g_InputDisplay[controllerID].append(inp);
Analog2DToString(g_padState.AnalogStickX, g_padState.AnalogStickY, " ANA", inp);
g_InputDisplay[controllerID].append(inp);
Analog2DToString(g_padState.CStickX, g_padState.CStickY, " C", inp);
g_InputDisplay[controllerID].append(inp);
g_InputDisplay[controllerID].append("\n");
}
void SetWiiInputDisplayString(int remoteID, u8* const coreData, u8* const accelData, u8* const irData)
{
int controllerID = remoteID + 4;
char inp[70];
sprintf(inp, "R%d:", remoteID + 1);
g_InputDisplay[controllerID] = inp;
if(coreData)
{
wm_core buttons = *(wm_core*)coreData;
if(buttons & WiimoteEmu::Wiimote::PAD_LEFT)
g_InputDisplay[controllerID].append(" LEFT");
if(buttons & WiimoteEmu::Wiimote::PAD_RIGHT)
g_InputDisplay[controllerID].append(" RIGHT");
if(buttons & WiimoteEmu::Wiimote::PAD_DOWN)
g_InputDisplay[controllerID].append(" DOWN");
if(buttons & WiimoteEmu::Wiimote::PAD_UP)
g_InputDisplay[controllerID].append(" UP");
if(buttons & WiimoteEmu::Wiimote::BUTTON_A)
g_InputDisplay[controllerID].append(" A");
if(buttons & WiimoteEmu::Wiimote::BUTTON_B)
g_InputDisplay[controllerID].append(" B");
if(buttons & WiimoteEmu::Wiimote::BUTTON_PLUS)
g_InputDisplay[controllerID].append(" +");
if(buttons & WiimoteEmu::Wiimote::BUTTON_MINUS)
g_InputDisplay[controllerID].append(" -");
if(buttons & WiimoteEmu::Wiimote::BUTTON_ONE)
g_InputDisplay[controllerID].append(" 1");
if(buttons & WiimoteEmu::Wiimote::BUTTON_TWO)
g_InputDisplay[controllerID].append(" 2");
if(buttons & WiimoteEmu::Wiimote::BUTTON_HOME)
g_InputDisplay[controllerID].append(" HOME");
} }
if(g_padState.L) if(accelData)
{ {
g_InputDisplay[controllerID].append(" L"); wm_accel* dt = (wm_accel*)accelData;
sprintf(inp, " ACC:%d,%d,%d", dt->x, dt->y, dt->z);
g_InputDisplay[controllerID].append(inp);
} }
if(g_padState.R)
if(irData) // incomplete
{ {
g_InputDisplay[controllerID].append(" R"); sprintf(inp, " IR:%d,%d", ((u8*)irData)[0], ((u8*)irData)[1]);
g_InputDisplay[controllerID].append(inp);
} }
g_InputDisplay[controllerID].append("\n"); g_InputDisplay[controllerID].append("\n");
} }
void RecordInput(SPADStatus *PadStatus, int controllerID) void RecordInput(SPADStatus *PadStatus, int controllerID)
{ {
if(!IsRecordingInput() || !IsUsingPad(controllerID)) if(!IsRecordingInput() || !IsUsingPad(controllerID))
@ -355,20 +458,23 @@ void RecordInput(SPADStatus *PadStatus, int controllerID)
g_padState.CStickX = PadStatus->substickX; g_padState.CStickX = PadStatus->substickX;
g_padState.CStickY = PadStatus->substickY; g_padState.CStickY = PadStatus->substickY;
memcpy(&(tmpInput[inputOffset]), &g_padState, 8); memcpy(&(tmpInput[g_currentByte]), &g_padState, 8);
inputOffset += 8; g_currentByte += 8;
g_totalBytes = g_currentByte;
SetInputDisplayString(g_padState, controllerID); SetInputDisplayString(g_padState, controllerID);
} }
void RecordWiimote(int wiimote, u8 *data, s8 size) void RecordWiimote(int wiimote, u8 *data, s8 size, u8* const coreData, u8* const accelData, u8* const irData)
{ {
if(!IsRecordingInput() || !IsUsingWiimote(wiimote)) if(!IsRecordingInput() || !IsUsingWiimote(wiimote))
return; return;
g_InputCounter++; InputUpdate();
tmpInput[inputOffset++] = (u8) size; tmpInput[g_currentByte++] = (u8) size;
memcpy(&(tmpInput[inputOffset]), data, size); memcpy(&(tmpInput[g_currentByte]), data, size);
inputOffset += size; g_currentByte += size;
g_totalBytes = g_currentByte;
SetWiiInputDisplayString(wiimote, coreData, accelData, irData);
} }
bool PlayInput(const char *filename) bool PlayInput(const char *filename)
@ -415,15 +521,18 @@ bool PlayInput(const char *filename)
g_numPads = tmpHeader.numControllers; g_numPads = tmpHeader.numControllers;
g_rerecords = tmpHeader.numRerecords; g_rerecords = tmpHeader.numRerecords;
g_totalFrameCount = tmpHeader.frameCount;
g_totalFrames = tmpHeader.frameCount;
g_totalLagCount = tmpHeader.lagCount;
g_totalInputCount = tmpHeader.inputCount;
g_playMode = MODE_PLAYING; g_playMode = MODE_PLAYING;
tmpLength = g_recordfd.GetSize() - 256; g_totalBytes = g_recordfd.GetSize() - 256;
delete tmpInput; delete tmpInput;
tmpInput = new u8[MAX_DTM_LENGTH]; tmpInput = new u8[MAX_DTM_LENGTH];
g_recordfd.ReadArray(tmpInput, tmpLength); g_recordfd.ReadArray(tmpInput, (size_t)g_totalBytes);
inputOffset = 0; g_currentByte = 0;
g_recordfd.Close(); g_recordfd.Close();
return true; return true;
@ -433,6 +542,27 @@ cleanup:
return false; return false;
} }
void DoState(PointerWrap &p, bool doNot)
{
if(doNot)
{
if(p.GetMode() == PointerWrap::MODE_READ)
g_currentSaveVersion = 0;
return;
}
static const int MOVIE_STATE_VERSION = 1;
g_currentSaveVersion = MOVIE_STATE_VERSION;
p.Do(g_currentSaveVersion);
// many of these could be useful to save even when no movie is active,
// and the data is tiny, so let's just save it regardless of movie state.
p.Do(g_currentFrame);
p.Do(g_currentByte);
p.Do(g_currentLagCount);
p.Do(g_currentInputCount);
p.Do(g_bPolled);
// other variables (such as g_totalBytes and g_totalFrames) are set in LoadInput
}
void LoadInput(const char *filename) void LoadInput(const char *filename)
{ {
File::IOFile t_record(filename, "r+b"); File::IOFile t_record(filename, "r+b");
@ -452,35 +582,89 @@ void LoadInput(const char *filename)
t_record.Seek(0, SEEK_SET); t_record.Seek(0, SEEK_SET);
t_record.WriteArray(&tmpHeader, 1); t_record.WriteArray(&tmpHeader, 1);
g_frameCounter = tmpHeader.frameCount;
g_totalFrameCount = (tmpHeader.totalFrameCount ? tmpHeader.totalFrameCount : tmpHeader.frameCount);
g_InputCounter = tmpHeader.InputCount;
g_numPads = tmpHeader.numControllers; g_numPads = tmpHeader.numControllers;
ChangePads(true); ChangePads(true);
if (Core::g_CoreStartupParameter.bWii) if (Core::g_CoreStartupParameter.bWii)
ChangeWiiPads(true); ChangeWiiPads(true);
inputOffset = t_record.GetSize() - 256; if (!g_bReadOnly)
{
g_totalFrames = tmpHeader.frameCount;
g_totalLagCount = tmpHeader.lagCount;
g_totalInputCount = tmpHeader.inputCount;
g_totalBytes = t_record.GetSize() - 256;
delete tmpInput; delete tmpInput;
tmpInput = new u8[MAX_DTM_LENGTH]; tmpInput = new u8[MAX_DTM_LENGTH];
t_record.ReadArray(tmpInput, inputOffset); t_record.ReadArray(tmpInput, (size_t)g_totalBytes);
}
else if (g_currentByte > 0)
{
// verify identical up to g_currentByte
if (g_currentByte > g_totalBytes)
{
PanicAlertT("Warning: You loaded a save whose movie ends before the current frame (%u < %u). You should load another save before continuing, or load this state with read-only mode off.", (u32)g_totalFrames, (u32)g_currentFrame);
}
else if(g_currentByte > 0)
{
u32 len = (u32)g_currentByte;
u8* tmpTmpInput = new u8[len];
t_record.ReadArray(tmpTmpInput, (size_t)len);
for (u32 i = 0; i < len; ++i)
{
if (tmpTmpInput[i] != tmpInput[i])
{
if(Core::g_CoreStartupParameter.bWii)
PanicAlertT("Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.", i, i);
else
PanicAlertT("Warning: You loaded a save whose movie mismatches on frame %d. You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.", i/8);
break;
}
}
delete tmpTmpInput;
}
}
t_record.Close(); t_record.Close();
g_rerecords = tmpHeader.numRerecords; g_rerecords = tmpHeader.numRerecords;
if(g_currentSaveVersion == 0)
{
// attempt support for old savestates with movies but without movie-related data in DoState.
// I'm just guessing here and the old logic was kind of broken anyway, so this probably doesn't work well.
g_totalFrames = tmpHeader.frameCount;
if(g_totalFrames < tmpHeader.deprecated_totalFrameCount)
g_totalFrames = tmpHeader.deprecated_totalFrameCount;
u64 frameStart = tmpHeader.deprecated_frameStart ? tmpHeader.deprecated_frameStart : tmpHeader.frameCount;
g_currentFrame = frameStart;
g_currentByte = frameStart * 8;
g_currentLagCount = tmpHeader.lagCount;
g_currentInputCount = tmpHeader.inputCount;
}
if (g_bReadOnly) if (g_bReadOnly)
{ {
tmpLength = inputOffset; if(g_playMode != MODE_PLAYING)
inputOffset = tmpHeader.frameStart; {
Core::DisplayMessage("Resuming movie playback", 2000);
g_playMode = MODE_PLAYING; g_playMode = MODE_PLAYING;
Core::DisplayMessage("Switched to playback", 2000);
}
} }
else else
{ {
Core::DisplayMessage("Resuming movie recording", 2000); if(g_playMode != MODE_RECORDING)
{
g_playMode = MODE_RECORDING; g_playMode = MODE_RECORDING;
Core::DisplayMessage("Switched to recording", 2000);
}
}
}
static void CheckInputEnd()
{
if (g_currentFrame > g_totalFrames || g_currentByte >= g_totalBytes)
{
EndPlayInput(!g_bReadOnly);
} }
} }
@ -491,8 +675,9 @@ void PlayController(SPADStatus *PadStatus, int controllerID)
if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL) if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL)
return; return;
if (inputOffset + 8 > tmpLength) if (g_currentByte + 8 > g_totalBytes)
{ {
PanicAlertT("Premature movie end in PlayController. %u + 8 > %u", (u32)g_currentByte, (u32)g_totalBytes);
EndPlayInput(!g_bReadOnly); EndPlayInput(!g_bReadOnly);
return; return;
} }
@ -503,8 +688,8 @@ void PlayController(SPADStatus *PadStatus, int controllerID)
memset(PadStatus, 0, sizeof(SPADStatus)); memset(PadStatus, 0, sizeof(SPADStatus));
PadStatus->err = e; PadStatus->err = e;
memcpy(&g_padState, &(tmpInput[inputOffset]), 8); memcpy(&g_padState, &(tmpInput[g_currentByte]), 8);
inputOffset += 8; g_currentByte += 8;
PadStatus->triggerLeft = g_padState.TriggerL; PadStatus->triggerLeft = g_padState.TriggerL;
PadStatus->triggerRight = g_padState.TriggerR; PadStatus->triggerRight = g_padState.TriggerR;
@ -528,88 +713,65 @@ void PlayController(SPADStatus *PadStatus, int controllerID)
PadStatus->analogB = 0xFF; PadStatus->analogB = 0xFF;
} }
if(g_padState.X) if(g_padState.X)
{
PadStatus->button |= PAD_BUTTON_X; PadStatus->button |= PAD_BUTTON_X;
}
if(g_padState.Y) if(g_padState.Y)
{
PadStatus->button |= PAD_BUTTON_Y; PadStatus->button |= PAD_BUTTON_Y;
}
if(g_padState.Z) if(g_padState.Z)
{
PadStatus->button |= PAD_TRIGGER_Z; PadStatus->button |= PAD_TRIGGER_Z;
}
if(g_padState.Start) if(g_padState.Start)
{
PadStatus->button |= PAD_BUTTON_START; PadStatus->button |= PAD_BUTTON_START;
}
if(g_padState.DPadUp) if(g_padState.DPadUp)
{
PadStatus->button |= PAD_BUTTON_UP; PadStatus->button |= PAD_BUTTON_UP;
}
if(g_padState.DPadDown) if(g_padState.DPadDown)
{
PadStatus->button |= PAD_BUTTON_DOWN; PadStatus->button |= PAD_BUTTON_DOWN;
}
if(g_padState.DPadLeft) if(g_padState.DPadLeft)
{
PadStatus->button |= PAD_BUTTON_LEFT; PadStatus->button |= PAD_BUTTON_LEFT;
}
if(g_padState.DPadRight) if(g_padState.DPadRight)
{
PadStatus->button |= PAD_BUTTON_RIGHT; PadStatus->button |= PAD_BUTTON_RIGHT;
}
if(g_padState.L) if(g_padState.L)
{
PadStatus->button |= PAD_TRIGGER_L; PadStatus->button |= PAD_TRIGGER_L;
}
if(g_padState.R) if(g_padState.R)
{
PadStatus->button |= PAD_TRIGGER_R; PadStatus->button |= PAD_TRIGGER_R;
}
SetInputDisplayString(g_padState, controllerID); SetInputDisplayString(g_padState, controllerID);
if (g_frameCounter >= g_totalFrameCount) CheckInputEnd();
{
EndPlayInput(!g_bReadOnly);
}
} }
bool PlayWiimote(int wiimote, u8 *data, s8 &size) bool PlayWiimote(int wiimote, u8 *data, s8 &size, u8* const coreData, u8* const accelData, u8* const irData)
{ {
s8 count = 0; s8 count = 0;
if(!IsPlayingInput() || !IsUsingWiimote(wiimote) || tmpInput == NULL) if(!IsPlayingInput() || !IsUsingWiimote(wiimote) || tmpInput == NULL)
return false; return false;
if (inputOffset > tmpLength) if (g_currentByte > g_totalBytes)
{ {
PanicAlertT("Premature movie end in PlayWiimote. %u > %u", (u32)g_currentByte, (u32)g_totalBytes);
EndPlayInput(!g_bReadOnly); EndPlayInput(!g_bReadOnly);
return false; return false;
} }
count = (s8) (tmpInput[inputOffset++]); count = (s8) (tmpInput[g_currentByte++]);
if (inputOffset + count > tmpLength) if (g_currentByte + count > g_totalBytes)
{ {
PanicAlertT("Premature movie end in PlayWiimote. %u + %d > %u", (u32)g_currentByte, count, (u32)g_totalBytes);
EndPlayInput(!g_bReadOnly); EndPlayInput(!g_bReadOnly);
return false; return false;
} }
memcpy(data, &(tmpInput[inputOffset]), count); memcpy(data, &(tmpInput[g_currentByte]), count);
inputOffset += count; g_currentByte += count;
size = (count > size) ? size : count; size = (count > size) ? size : count;
g_InputCounter++; SetWiiInputDisplayString(wiimote, coreData, accelData, irData);
// TODO: merge this with the above so that there's no duplicate code g_currentInputCount++;
if (g_frameCounter >= g_totalFrameCount)
{ CheckInputEnd();
EndPlayInput(!g_bReadOnly);
}
return true; return true;
} }
@ -620,10 +782,10 @@ void EndPlayInput(bool cont)
g_playMode = MODE_RECORDING; g_playMode = MODE_RECORDING;
Core::DisplayMessage("Resuming movie recording", 2000); Core::DisplayMessage("Resuming movie recording", 2000);
} }
else else if(g_playMode != MODE_NONE)
{ {
g_numPads = g_rerecords = 0; g_numPads = g_rerecords = 0;
g_totalFrameCount = g_frameCounter = g_lagCounter = 0; g_totalFrames = g_totalBytes = g_currentByte = 0;
g_playMode = MODE_NONE; g_playMode = MODE_NONE;
delete tmpInput; delete tmpInput;
tmpInput = NULL; tmpInput = NULL;
@ -645,10 +807,10 @@ void SaveRecording(const char *filename)
header.numControllers = g_numPads & (Core::g_CoreStartupParameter.bWii ? 0xFF : 0x0F); header.numControllers = g_numPads & (Core::g_CoreStartupParameter.bWii ? 0xFF : 0x0F);
header.bFromSaveState = g_bRecordingFromSaveState; header.bFromSaveState = g_bRecordingFromSaveState;
header.frameCount = g_frameCounter; header.frameCount = g_totalFrames;
header.lagCount = g_lagCounter; header.lagCount = g_totalLagCount;
header.inputCount = g_totalInputCount;
header.numRerecords = g_rerecords; header.numRerecords = g_rerecords;
header.InputCount = g_InputCounter;
// TODO // TODO
header.uniqueID = 0; header.uniqueID = 0;
@ -656,20 +818,9 @@ void SaveRecording(const char *filename)
// header.videoBackend; // header.videoBackend;
// header.audioEmulator; // header.audioEmulator;
if (g_bReadOnly)
{
header.frameStart = inputOffset;
header.totalFrameCount = g_totalFrameCount;
}
save_record.WriteArray(&header, 1); save_record.WriteArray(&header, 1);
bool success; bool success = save_record.WriteArray(tmpInput, (size_t)g_totalBytes);
if (g_bReadOnly)
success = save_record.WriteArray(tmpInput, tmpLength);
else
success = save_record.WriteArray(tmpInput, inputOffset);
if (success && g_bRecordingFromSaveState) if (success && g_bRecordingFromSaveState)
{ {

22
Source/Core/Core/Src/Movie.h
View File

@ -24,6 +24,8 @@
#include <string> #include <string>
#include "ChunkFile.h"
// Per-(video )Movie actions // Per-(video )Movie actions
namespace Movie { namespace Movie {
@ -62,7 +64,10 @@ extern ControllerState *g_padStates;
extern char g_playingFile[256]; extern char g_playingFile[256];
extern std::string g_recordFile; extern std::string g_recordFile;
extern u64 g_frameCounter, g_lagCounter, g_InputCounter; extern u64 g_currentByte, g_totalBytes;
extern u64 g_currentFrame, g_totalFrames;
extern u64 g_currentLagCount, g_totalLagCount;
extern u64 g_currentInputCount, g_totalInputCount;
extern u32 g_rerecords; extern u32 g_rerecords;
@ -77,7 +82,7 @@ struct DTMHeader {
bool bFromSaveState; // false indicates that the recording started from bootup, true for savestate bool bFromSaveState; // false indicates that the recording started from bootup, true for savestate
u64 frameCount; // Number of frames in the recording u64 frameCount; // Number of frames in the recording
u64 InputCount; // Number of input frames in recording u64 inputCount; // Number of input frames in recording
u64 lagCount; // Number of lag frames in the recording u64 lagCount; // Number of lag frames in the recording
u64 uniqueID; // A Unique ID comprised of: md5(time + Game ID) u64 uniqueID; // A Unique ID comprised of: md5(time + Game ID)
u32 numRerecords; // Number of rerecords/'cuts' of this TAS u32 numRerecords; // Number of rerecords/'cuts' of this TAS
@ -87,9 +92,10 @@ struct DTMHeader {
u8 audioEmulator[16]; // UTF-8 representation of the audio emulator u8 audioEmulator[16]; // UTF-8 representation of the audio emulator
u8 padBackend[16]; // UTF-8 representation of the input backend u8 padBackend[16]; // UTF-8 representation of the input backend
// only used in read-only savestates // hack, data that was only used for savestates and would more properly be stored in the savestate itself
u64 frameStart; // Offset to resume playback on // the hack has been removed, but these remain defined and reserved here for legacy support purposes
u64 totalFrameCount; // Total frames, same as normal dtm's frameCount u64 deprecated_frameStart; // NOT USED ANYMORE (use g_currentFrame)
u64 deprecated_totalFrameCount; // NOT USED ANYMORE (use g_totalFrames or header.frameCount)
u8 reserved[111]; // Make heading 256 bytes, just because we can u8 reserved[111]; // Make heading 256 bytes, just because we can
}; };
@ -103,6 +109,7 @@ void SetPolledDevice();
bool IsAutoFiring(); bool IsAutoFiring();
bool IsRecordingInput(); bool IsRecordingInput();
bool IsRecordingInputFromSaveState(); bool IsRecordingInputFromSaveState();
bool IsJustStartingRecordingInputFromSaveState();
bool IsPlayingInput(); bool IsPlayingInput();
bool IsReadOnly(); bool IsReadOnly();
@ -120,14 +127,15 @@ void FrameSkipping();
bool BeginRecordingInput(int controllers); bool BeginRecordingInput(int controllers);
void RecordInput(SPADStatus *PadStatus, int controllerID); void RecordInput(SPADStatus *PadStatus, int controllerID);
void RecordWiimote(int wiimote, u8* data, s8 size); void RecordWiimote(int wiimote, u8* data, s8 size, u8* const coreData, u8* const accelData, u8* const irData);
bool PlayInput(const char *filename); bool PlayInput(const char *filename);
void LoadInput(const char *filename); void LoadInput(const char *filename);
void PlayController(SPADStatus *PadStatus, int controllerID); void PlayController(SPADStatus *PadStatus, int controllerID);
bool PlayWiimote(int wiimote, u8* data, s8 &size); bool PlayWiimote(int wiimote, u8* data, s8 &size, u8* const coreData, u8* const accelData, u8* const irData);
void EndPlayInput(bool cont); void EndPlayInput(bool cont);
void SaveRecording(const char *filename); void SaveRecording(const char *filename);
void DoState(PointerWrap &p, bool doNot=false);
std::string GetInputDisplay(); std::string GetInputDisplay();

29
Source/Core/Core/Src/State.cpp
View File

@ -74,7 +74,7 @@ static u64 lastCheckedStates[NUM_HOOKS];
static u8 hook; static u8 hook;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
static const int STATE_VERSION = 5; static const int STATE_VERSION = 6;
struct StateHeader struct StateHeader
{ {
@ -98,13 +98,29 @@ void EnableCompression(bool compression)
void DoState(PointerWrap &p) void DoState(PointerWrap &p)
{ {
u32 cookie = 0xBAADBABE + STATE_VERSION; u32 version = STATE_VERSION;
p.Do(cookie);
if (cookie != 0xBAADBABE + STATE_VERSION)
{ {
u32 cookie = version + 0xBAADBABE;
p.Do(cookie);
version = cookie - 0xBAADBABE;
}
if (version != STATE_VERSION)
{
if (version == 5 && STATE_VERSION == 6)
{
// from version 5 to 6, the only difference was the addition of calling Movie::DoState,
// so (because it's easy) let's not break compatibility in this case
}
else
{
// if the version doesn't match, fail.
// this will trigger a message like "Can't load state from other revisions"
p.SetMode(PointerWrap::MODE_MEASURE); p.SetMode(PointerWrap::MODE_MEASURE);
return; return;
} }
}
// Begin with video backend, so that it gets a chance to clear it's caches and writeback modified things to RAM // Begin with video backend, so that it gets a chance to clear it's caches and writeback modified things to RAM
// Pause the video thread in multi-threaded mode // Pause the video thread in multi-threaded mode
g_video_backend->RunLoop(false); g_video_backend->RunLoop(false);
@ -116,6 +132,7 @@ void DoState(PointerWrap &p)
PowerPC::DoState(p); PowerPC::DoState(p);
HW::DoState(p); HW::DoState(p);
CoreTiming::DoState(p); CoreTiming::DoState(p);
Movie::DoState(p, version<6);
// Resume the video thread // Resume the video thread
g_video_backend->RunLoop(true); g_video_backend->RunLoop(true);
@ -253,7 +270,7 @@ void SaveFileStateCallback(u64 userdata, int cyclesLate)
p.SetMode(PointerWrap::MODE_WRITE); p.SetMode(PointerWrap::MODE_WRITE);
DoState(p); DoState(p);
if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsRecordingInputFromSaveState()) if ((Movie::IsRecordingInput() || Movie::IsPlayingInput()) && !Movie::IsJustStartingRecordingInputFromSaveState())
Movie::SaveRecording((g_current_filename + ".dtm").c_str()); Movie::SaveRecording((g_current_filename + ".dtm").c_str());
else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput()) else if (!Movie::IsRecordingInput() && !Movie::IsPlayingInput())
File::Delete(g_current_filename + ".dtm"); File::Delete(g_current_filename + ".dtm");
@ -360,7 +377,7 @@ void LoadFileStateCallback(u64 userdata, int cyclesLate)
if (File::Exists(g_current_filename + ".dtm")) if (File::Exists(g_current_filename + ".dtm"))
Movie::LoadInput((g_current_filename + ".dtm").c_str()); Movie::LoadInput((g_current_filename + ".dtm").c_str());
else if (!Movie::IsRecordingInputFromSaveState()) else if (!Movie::IsJustStartingRecordingInputFromSaveState())
Movie::EndPlayInput(false); Movie::EndPlayInput(false);
} }