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

Shuffle code in AvFrameAdvance to eliminate goto

This commit is contained in:
YoshiRulz 2020-07-08 01:51:31 +10:00
parent 33d8f4a62c
commit b0f38a4d91
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3265,20 +3265,14 @@ namespace BizHawk.Client.EmuHawk
private void AvFrameAdvance()
{
if (_currAviWriter != null)
if (_currAviWriter == null) return;
// is this the best time to handle this? or deeper inside?
if (_argParser._currAviWriterFrameList?.Contains(Emulator.Frame) != false)
{
// TODO ZERO - this code is pretty jacked. we'll want to frugalize buffers better for speedier dumping, and we might want to rely on the GL layer for padding
try
{
// is this the best time to handle this? or deeper inside?
if (_argParser._currAviWriterFrameList != null)
{
if (!_argParser._currAviWriterFrameList.Contains(Emulator.Frame))
{
goto HANDLE_AUTODUMP;
}
}
IVideoProvider output;
IDisposable disposableOutput = null;
if (_avwriterResizew > 0 && _avwriterResizeh > 0)
@ -3311,7 +3305,7 @@ namespace BizHawk.Client.EmuHawk
}
output = new BmpVideoProvider(bmpOut, _currentVideoProvider.VsyncNumerator, _currentVideoProvider.VsyncDenominator);
disposableOutput = (IDisposable)output;
disposableOutput = (IDisposable) output;
}
finally
{
@ -3324,7 +3318,7 @@ namespace BizHawk.Client.EmuHawk
if (Config.AviCaptureOsd)
{
output = new BitmapBufferVideoProvider(CaptureOSD());
disposableOutput = (IDisposable)output;
disposableOutput = (IDisposable) output;
}
else
{
@ -3338,11 +3332,11 @@ namespace BizHawk.Client.EmuHawk
int nsamp;
if (_dumpaudiosync)
{
((VideoStretcher)_currAviWriter).DumpAV(output, _currentSoundProvider, out samp, out nsamp);
((VideoStretcher) _currAviWriter).DumpAV(output, _currentSoundProvider, out samp, out nsamp);
}
else
{
((AudioStretcher)_currAviWriter).DumpAV(output, _aviSoundInputAsync, out samp, out nsamp);
((AudioStretcher) _currAviWriter).DumpAV(output, _aviSoundInputAsync, out samp, out nsamp);
}
disposableOutput?.Dispose();
@ -3354,18 +3348,17 @@ namespace BizHawk.Client.EmuHawk
MessageBox.Show($"Video dumping died:\n\n{e}");
AbortAv();
}
}
HANDLE_AUTODUMP:
if (_argParser._autoDumpLength > 0)
if (_argParser._autoDumpLength > 0)
{
_argParser._autoDumpLength--;
if (_argParser._autoDumpLength == 0) // finish
{
_argParser._autoDumpLength--;
if (_argParser._autoDumpLength == 0) // finish
StopAv();
if (_argParser._autoCloseOnDump)
{
StopAv();
if (_argParser._autoCloseOnDump)
{
_exitRequestPending = true;
}
_exitRequestPending = true;
}
}
}