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

Cocoa Port (v0.9.10): 

- Backport changes from r4935 to the 0.9.10 branch.
- Update Cocoa port version to v0.9.10b.
This commit is contained in:
rogerman 2013-12-18 08:19:16 +00:00
parent 50d040a3a1
commit 7b0b1e6c89
6 changed files with 76 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/README.MAC
View File

@ -2,7 +2,7 @@
_________________________________________
Copyright (C) 2006 yopyop
Copyright (C) 2006-2013 DeSmuME team
Last Updated: November 27, 2013
Last Updated: December 17, 2013
Contents:
1) System Requirements ..................................................... 15
@ -248,7 +248,7 @@ possible. The better your descriptions are, the faster we can test and fix
bugs. For example, if you observed a bug in the game Golden Sun: Dark Dawn, then
the bug report could look something like this:
App Version: v0.9.10
App Version: v0.9.10b
Operating System: OS X v10.8.3 (12D78)
Mac Model Identifier: iMac11,2
ROM Name: GOLDENSUN_DD

2
desmume/src/cocoa/Info (Debug).plist
View File

@ -240,7 +240,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>v0.9.10 (Debug)</string>
<string>v0.9.10b (Debug)</string>
<key>CFBundleSignature</key>
<string>DSmM</string>
<key>CFBundleVersion</key>

2
desmume/src/cocoa/Info.plist
View File

@ -240,7 +240,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>v0.9.10</string>
<string>v0.9.10b</string>
<key>CFBundleSignature</key>
<string>DSmM</string>
<key>CFBundleVersion</key>

5
desmume/src/cocoa/cocoa_core.h
View File

@ -35,7 +35,7 @@ typedef struct
int state;
bool isFrameSkipEnabled;
size_t frameCount;
unsigned int framesToSkip;
int framesToSkip;
uint64_t timeBudgetMachAbsTime;
bool exitThread;
pthread_mutex_t mutexCoreExecute;
@ -145,4 +145,5 @@ typedef struct
@end
static void* RunCoreThread(void *arg);
static void CoreFrameSkip(uint64_t timeBudgetMachAbsoluteTime, uint64_t frameStartMachAbsoluteTime, unsigned int *outFramesToSkip);
static int CalculateFrameSkip(uint64_t timeBudgetMachAbsTime, uint64_t frameStartMachAbsTime);
uint64_t GetFrameAbsoluteTime(const double frameTimeScalar);

107
desmume/src/cocoa/cocoa_core.mm
View File

@ -620,16 +620,9 @@ static BOOL isCoreStarted = NO;
{
if (self.isSpeedLimitEnabled)
{
CGFloat theSpeed = self.speedScalar;
if(theSpeed <= SPEED_SCALAR_MIN)
{
theSpeed = SPEED_SCALAR_MIN;
}
const CGFloat theSpeed = ([self speedScalar] > SPEED_SCALAR_MIN) ? [self speedScalar] : SPEED_SCALAR_MIN;
pthread_mutex_lock(&threadParam.mutexThreadExecute);
uint64_t timeBudgetNanoseconds = (uint64_t)(DS_SECONDS_PER_FRAME * 1000000000.0 / theSpeed);
AbsoluteTime timeBudgetAbsTime = NanosecondsToAbsolute(*(Nanoseconds *)&timeBudgetNanoseconds);
threadParam.timeBudgetMachAbsTime = *(uint64_t *)&timeBudgetAbsTime;
threadParam.timeBudgetMachAbsTime = GetFrameAbsoluteTime(1.0/theSpeed);
pthread_mutex_unlock(&threadParam.mutexThreadExecute);
}
else
@ -893,7 +886,15 @@ static void* RunCoreThread(void *arg)
// we owe on timeBudget.
if (param->isFrameSkipEnabled)
{
CoreFrameSkip(timeBudget, startTime, &param->framesToSkip);
if (param->framesToSkip > 0)
{
NDS_SkipNextFrame();
param->framesToSkip--;
}
else
{
param->framesToSkip = CalculateFrameSkip(timeBudget, startTime);
}
}
pthread_mutex_unlock(&param->mutexThreadExecute);
@ -906,52 +907,76 @@ static void* RunCoreThread(void *arg)
return nil;
}
static void CoreFrameSkip(uint64_t timeBudgetMachAbsTime, uint64_t frameStartMachAbsTime, unsigned int *outFramesToSkip)
static int CalculateFrameSkip(uint64_t timeBudgetMachAbsTime, uint64_t frameStartMachAbsTime)
{
if (*outFramesToSkip > 0)
{
NDS_SkipNextFrame();
(*outFramesToSkip)--;
}
else
{
static const double skipCurve[10] = {0.60, 0.58, 0.55, 0.51, 0.46, 0.40, 0.30, 0.20, 0.10, 0.00};
static const double unskipCurve[10] = {0.75, 0.70, 0.65, 0.60, 0.50, 0.40, 0.30, 0.20, 0.10, 0.00};
static size_t skipStep = 0;
static size_t unskipStep = 0;
static int lastSetFrameSkip = 0;
// Calculate the time remaining.
uint64_t elapsed = mach_absolute_time() - frameStartMachAbsTime;
const uint64_t elapsed = mach_absolute_time() - frameStartMachAbsTime;
int framesToSkip = 0;
if (elapsed > timeBudgetMachAbsTime)
{
static unsigned int lastSetFrameSkip = 0;
unsigned int framesToSkip = 0;
if (timeBudgetMachAbsTime > 0)
{
framesToSkip = (unsigned int)( (((double)(elapsed - timeBudgetMachAbsTime) * FRAME_SKIP_AGGRESSIVENESS) / (double)timeBudgetMachAbsTime) + FRAME_SKIP_BIAS );
if (framesToSkip < lastSetFrameSkip)
{
framesToSkip += (unsigned int)((double)(lastSetFrameSkip - framesToSkip) * FRAME_SKIP_SMOOTHNESS);
}
framesToSkip = (int)( (((double)(elapsed - timeBudgetMachAbsTime) * FRAME_SKIP_AGGRESSIVENESS) / (double)timeBudgetMachAbsTime) + FRAME_SKIP_BIAS );
lastSetFrameSkip = framesToSkip;
if (framesToSkip > lastSetFrameSkip)
{
framesToSkip -= (int)((double)(framesToSkip - lastSetFrameSkip) * skipCurve[skipStep]);
if (skipStep < 9)
{
skipStep++;
}
}
else
{
framesToSkip = (unsigned int)( (((double)(elapsed - timeBudgetMachAbsTime) * FRAME_SKIP_AGGRESSIVENESS * 100.0) / DS_SECONDS_PER_FRAME) + FRAME_SKIP_BIAS );
// Don't need to save lastSetFrameSkip here since this code path assumes that
// the frame limiter is disabled.
framesToSkip += (int)((double)(lastSetFrameSkip - framesToSkip) * skipCurve[skipStep]);
if (skipStep > 0)
{
skipStep--;
}
}
}
else
{
static const double frameRate100x = (double)FRAME_SKIP_AGGRESSIVENESS / (double)GetFrameAbsoluteTime(1.0/100.0);
framesToSkip = (int)((double)elapsed * frameRate100x);
}
unskipStep = 0;
}
else
{
framesToSkip = (int)((double)lastSetFrameSkip * unskipCurve[unskipStep]);
if (unskipStep < 9)
{
unskipStep++;
}
skipStep = 0;
}
// Bound the frame skip.
if (framesToSkip > (unsigned int)MAX_FRAME_SKIP)
static const int kMaxFrameSkip = (int)MAX_FRAME_SKIP;
if (framesToSkip > kMaxFrameSkip)
{
framesToSkip = (unsigned int)MAX_FRAME_SKIP;
lastSetFrameSkip = framesToSkip;
framesToSkip = kMaxFrameSkip;
}
*outFramesToSkip = framesToSkip;
}
else
{
*outFramesToSkip = 0;
}
}
lastSetFrameSkip = framesToSkip;
return framesToSkip;
}
uint64_t GetFrameAbsoluteTime(const double frameTimeScalar)
{
const uint64_t frameTimeNanoseconds = (uint64_t)(DS_SECONDS_PER_FRAME * 1000000000.0 * frameTimeScalar);
const AbsoluteTime frameTimeAbsTime = NanosecondsToAbsolute(*(Nanoseconds *)&frameTimeNanoseconds);
return *(uint64_t *)&frameTimeAbsTime;
}

7
desmume/src/cocoa/cocoa_globals.h
View File

@ -194,12 +194,9 @@
#define DS_FRAMES_PER_SECOND 59.8261 // Number of DS frames per second.
#define DS_SECONDS_PER_FRAME (1.0 / DS_FRAMES_PER_SECOND) // The length of time in seconds that, ideally, a frame should be processed within.
#define FRAME_SKIP_AGGRESSIVENESS 10.0 // Must be a value between 0.0 (inclusive) and positive infinity.
#define FRAME_SKIP_AGGRESSIVENESS 9.0 // Must be a value between 0.0 (inclusive) and positive infinity.
// This value acts as a scalar multiple of the frame skip.
#define FRAME_SKIP_SMOOTHNESS 0.90 // Must be a value between 0.00 (inclusive) and 1.00 (exclusive).
// Values closer to 0.00 give better video smoothness, but makes the emulation timing more "jumpy."
// Values closer to 1.00 makes the emulation timing more accurate, but makes the video look more "choppy."
#define FRAME_SKIP_BIAS 0.5 // May be any real number. This value acts as a vector addition to the frame skip.
#define FRAME_SKIP_BIAS 0.1 // May be any real number. This value acts as a vector addition to the frame skip.
#define MAX_FRAME_SKIP (DS_FRAMES_PER_SECOND / 3.0)
#define SPU_SAMPLE_RATE 44100.0 // Samples per second