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

show proper movie length for cycle based timing (gambatte)

This commit is contained in:
feos 2020-02-08 15:36:06 +03:00
parent 9d0f7568d4
commit 08ee1c8170
6 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/movie/HeaderKeys.cs
View File

@ -19,6 +19,8 @@ namespace BizHawk.Client.Common
public const string BOARDNAME = "BoardName";
public const string SYNCSETTINGS = "SyncSettings";
public const string LOOPOFFSET = "LoopOffset";
public const string VBLANKCOUNT = "VBlankCount";
public const string CYCLECOUNT = "CycleCount";
// Core Setting
public const string CORE = "Core";

7
BizHawk.Client.Common/movie/PlatformFrameRates.cs
View File

@ -38,6 +38,7 @@ namespace BizHawk.Client.Common
["WSWAN"] = (3072000.0 / (159 * 256)), // 75.4716981132
["GB"] = 262144.0 / 4389.0, // 59.7275005696
["GBC"] = 262144.0 / 4389.0, // 59.7275005696
["GB_Clock"] = 2097152.0,
["GBA"] = 262144.0 / 4389.0, // 59.7275005696
["GEN"] = 53693175 / (3420.0 * 262),
["GEN_PAL"] = 53203424 / (3420.0 * 313),
@ -102,9 +103,15 @@ namespace BizHawk.Client.Common
private double Fps(IMovie movie)
{
var system = movie.HeaderEntries[HeaderKeys.PLATFORM];
var core = movie.HeaderEntries[HeaderKeys.CORE];
var pal = movie.HeaderEntries.ContainsKey(HeaderKeys.PAL)
&& movie.HeaderEntries[HeaderKeys.PAL] == "1";
if (movie.HeaderEntries.ContainsKey(HeaderKeys.CYCLECOUNT) && core == "Gambatte")
{
system = "GB_Clock";
}
return this[system, pal];
}

4
BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs
View File

@ -169,12 +169,12 @@ namespace BizHawk.Client.Common
if (Global.Emulator is Emulation.Cores.Nintendo.SubNESHawk.SubNESHawk)
{
var _subnes = (Emulation.Cores.Nintendo.SubNESHawk.SubNESHawk)Global.Emulator;
Header["VBlankCount"] = _subnes.VBL_CNT.ToString();
Header[HeaderKeys.VBLANKCOUNT] = _subnes.VBL_CNT.ToString();
}
else if (Global.Emulator is Emulation.Cores.Nintendo.Gameboy.Gameboy)
{
var _gameboy = (Emulation.Cores.Nintendo.Gameboy.Gameboy)Global.Emulator;
Header["CycleCount"] = _gameboy.CycleCount.ToString();
Header[HeaderKeys.CYCLECOUNT] = _gameboy.CycleCount.ToString();
}
var file = new FileInfo(fn);

18
BizHawk.Client.Common/movie/bk2/Bk2Movie.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
namespace BizHawk.Client.Common
{
@ -69,12 +70,23 @@ namespace BizHawk.Client.Common
public int InputLogLength => Log.Count;
public int TimeLength
public ulong TimeLength
{
get
{
if (Header.ContainsKey("VBlankCount")) { return Convert.ToInt32(Header["VBlankCount"]); }
return Log.Count;
if (Header.ContainsKey(HeaderKeys.VBLANKCOUNT))
{
return Convert.ToUInt64(Header[HeaderKeys.VBLANKCOUNT]);
}
else if (Header.ContainsKey(HeaderKeys.CYCLECOUNT))
{
var gambatteName = ((CoreAttribute)Attribute.GetCustomAttribute(typeof(Gameboy), typeof(CoreAttribute))).CoreName;
if (Header[HeaderKeys.CORE] == gambatteName)
{
return Convert.ToUInt64(Header[HeaderKeys.CYCLECOUNT]);
}
}
return (ulong)Log.Count;
}
}

4
BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
View File

@ -343,7 +343,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
if (Global.Emulator is Gameboy)
{
movie.HeaderEntries.Add("CycleCount", "0");
movie.HeaderEntries.Add(HeaderKeys.CYCLECOUNT, "0");
}
if (Global.Emulator is SMS && ((SMS) Global.Emulator).IsSG1000)
@ -368,7 +368,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
if (Global.Emulator is SubNESHawk)
{
movie.HeaderEntries.Add("VBlankCount", "0");
movie.HeaderEntries.Add(HeaderKeys.VBLANKCOUNT, "0");
}
movie.Core = ((CoreAttribute)Attribute

2
BizHawk.Client.Common/movie/interfaces/IMovie.cs
View File

@ -62,7 +62,7 @@ namespace BizHawk.Client.Common
/// <summary>
/// Gets the actual length of time a movie lasts for. For subframe cores, this will be different then the above two options
/// </summary>
int TimeLength { get; }
ulong TimeLength { get; }
/// <summary>
/// Gets the file extension for the current <see cref="IMovie"/> implementation