Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

parse SGB movie files to use the GB label #1125

Merged
merged 4 commits into from
Mar 16, 2022
Merged

parse SGB movie files to use the GB label #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f150d6
parse SGB movie files to use the GB label
Fortranm Feb 25, 2022
a545d55
add frame rate override for LLE SGB movie files
Fortranm Feb 26, 2022
5650d6a
misc cleanups + fix style issues + fix tests
CasualPokePlayer Mar 16, 2022
f66e14d
fix pal snes framerate assignment
Fortranm Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions TASVideos.Parsers/Parsers/Bk2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ internal class Bk2 : ParserBase, IParser
private const string HeaderFile = "header";
private const string InputFile = "input log";

// hacky framerate fields, taken from platform framerates
private const double NtscNesFramerate = 60.0988138974405;
private const double NtscSnesFramerate = 60.0988138974405;
private const double PalSnesFramerate = 50.0069789081886;

public override string FileExtension => "bk2";

public async Task<IParseResult> Parse(Stream file)
Expand Down Expand Up @@ -53,6 +58,11 @@ await using (var stream = headerEntry.Open())
result.WarnNoRerecords();
}

if (header.GetValueFor(Keys.Pal).ToBool())
{
result.Region = RegionType.Pal;
}

// Some biz system ids do not match tasvideos, convert if needed
if (BizToTasvideosSystemIds.ContainsKey(platform))
{
Expand All @@ -72,6 +82,23 @@ await using (var stream = headerEntry.Open())
{
platform = SystemCodes.Fds;
}
else if (header.GetValueFor(Keys.ModeVs).ToBool())
{
platform = SystemCodes.Arcade;
result.FrameRateOverride = NtscNesFramerate;
}
else if (header.GetValueFor(Keys.Board) == SystemCodes.Sgb)
{
platform = SystemCodes.GameBoy;
if (result.Region == RegionType.Pal)
{
result.FrameRateOverride = PalSnesFramerate;
}
else
{
result.FrameRateOverride = NtscSnesFramerate;
}
}
else if (header.GetValueFor(Keys.ModeSegaCd).ToBool())
{
platform = SystemCodes.SegaCd;
Expand All @@ -84,23 +111,13 @@ await using (var stream = headerEntry.Open())
{
platform = SystemCodes.Sg;
}
else if (header.GetValueFor(Keys.ModeVs).ToBool())
{
platform = SystemCodes.Arcade;
result.FrameRateOverride = 60.0988138974405;
}
else if (header.GetValueFor(Keys.ModeDsi).ToBool())
{
platform = SystemCodes.Dsi;
}

result.SystemCode = platform;

if (header.GetValueFor(Keys.Pal).ToBool())
{
result.Region = RegionType.Pal;
}

if (header.GetValueFor(Keys.StartsFromSavestate).ToBool())
{
result.StartType = MovieStartType.Savestate;
Expand Down Expand Up @@ -157,6 +174,7 @@ await using (var stream = headerEntry.Open())
["gen"] = SystemCodes.Genesis,
["sat"] = SystemCodes.Saturn,
["dgb"] = SystemCodes.GameBoy,
["sgb"] = SystemCodes.GameBoy,
["gb3x"] = SystemCodes.GameBoy,
["gb4x"] = SystemCodes.GameBoy,
["gbl"] = SystemCodes.GameBoy,
Expand Down
10 changes: 8 additions & 2 deletions TASVideos.Parsers/Parsers/Lsmv.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ internal class Lsmv : ParserBase, IParser
private const string SavestateAnchor = "savestate.anchor";
private const string Sram = "moviesram";

// hacky framerate fields, taken from platform framerates
private const double NtscSnesFramerate = 60.0988138974405;
private const double PalSnesFramerate = 50.0069789081886;

public override string FileExtension => "lsmv";

public async Task<IParseResult> Parse(Stream file)
Expand Down Expand Up @@ -73,12 +77,14 @@ await using (var stream = gameTypeFile.Open())
result.Region = RegionType.Pal;
break;
case "sgb_ntsc":
result.SystemCode = SystemCodes.Sgb;
result.SystemCode = SystemCodes.GameBoy;
result.Region = RegionType.Ntsc;
result.FrameRateOverride = NtscSnesFramerate;
break;
case "sgb_pal":
result.SystemCode = SystemCodes.Sgb;
result.SystemCode = SystemCodes.GameBoy;
result.Region = RegionType.Pal;
result.FrameRateOverride = PalSnesFramerate;
break;
case "gdmg":
result.SystemCode = SystemCodes.GameBoy;
Expand Down
4 changes: 0 additions & 4 deletions TASVideos.Parsers/Parsers/Vbm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ public async Task<IParseResult> Parse(Stream file)
{
result.SystemCode = SystemCodes.Gbc;
}
else if (system.Bit(2))
{
result.SystemCode = SystemCodes.Sgb;
}
else
{
result.SystemCode = SystemCodes.GameBoy;
Expand Down
3 changes: 2 additions & 1 deletion tests/TASVideos.MovieParsers.Tests/Bk2ParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ public async Task PalFlag_True(string fileName, RegionType expected)
[DataRow("System-Gb3x.bk2", SystemCodes.GameBoy)]
[DataRow("System-Gb4x.bk2", SystemCodes.GameBoy)]
[DataRow("System-Gbl.bk2", SystemCodes.GameBoy)]
[DataRow("System-Sgb.bk2", SystemCodes.Sgb)]
[DataRow("System-Sgb.bk2", SystemCodes.GameBoy)]
[DataRow("System-Sgb-Snes.bk2", SystemCodes.GameBoy)]
[DataRow("System-Gba.bk2", SystemCodes.Gba)]
[DataRow("System-Gbc.bk2", SystemCodes.Gbc)]
[DataRow("System-Genesis.bk2", SystemCodes.Genesis)]
Expand Down
Binary file added tests/TASVideos.MovieParsers.Tests/Bk2SampleFiles/System-Sgb-Snes.bk2
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions tests/TASVideos.MovieParsers.Tests/LsmvTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ public async Task InvalidGameType_DefaultsSnesNtsc()
[DataRow("gametype-bsx.lsmv", SystemCodes.Snes, RegionType.Ntsc)]
[DataRow("gametype-bsxslotted.lsmv", SystemCodes.Snes, RegionType.Ntsc)]
[DataRow("gametype-sufamiturbo.lsmv", SystemCodes.Snes, RegionType.Ntsc)]
[DataRow("gametype-sgb_ntsc.lsmv", SystemCodes.Sgb, RegionType.Ntsc)]
[DataRow("gametype-sgb_pal.lsmv", SystemCodes.Sgb, RegionType.Pal)]
[DataRow("gametype-sgb_ntsc.lsmv", SystemCodes.GameBoy, RegionType.Ntsc)]
[DataRow("gametype-sgb_pal.lsmv", SystemCodes.GameBoy, RegionType.Pal)]
[DataRow("gametype-gdmg.lsmv", SystemCodes.GameBoy, RegionType.Ntsc)]
[DataRow("gametype-ggbc.lsmv", SystemCodes.Gbc, RegionType.Ntsc)]
[DataRow("gametype-ggbca.lsmv", SystemCodes.Gbc, RegionType.Ntsc)]
Expand Down
1 change: 1 addition & 0 deletions tests/TASVideos.MovieParsers.Tests/TASVideos.MovieParsers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
<EmbeddedResource Include="Bk2SampleFiles\System-SegaCd.bk2" />
<EmbeddedResource Include="Bk2SampleFiles\System-Sg.bk2" />
<EmbeddedResource Include="Bk2SampleFiles\System-Sgb.bk2" />
<EmbeddedResource Include="Bk2SampleFiles\System-Sgb-Snes.bk2" />
<EmbeddedResource Include="Bk2SampleFiles\System-Sgx.bk2" />
<EmbeddedResource Include="Bk2SampleFiles\System-Sms.bk2" />
<EmbeddedResource Include="Bk2SampleFiles\System-Snes.bk2" />
Expand Down