Match compression behavior, for real

This commit is contained in:
Diegoisawesome 2018-09-25 01:26:09 -05:00
parent 98e1c1994b
commit 48b65eecee
1 changed files with 10 additions and 4 deletions

View File

@ -773,14 +773,16 @@ void CalculateWaits(std::vector<Event>& events)
} }
} }
// This code is (purposely) buggy as shit, to mimic how the real mid2agb worked
int CalculateCompressionScore(std::vector<Event>& events, int index) int CalculateCompressionScore(std::vector<Event>& events, int index)
{ {
int score = 0; int score = 0;
std::uint8_t lastParam1 = events[index].param1; std::uint8_t lastParam1 = (std::uint8_t)events[index].type;
std::uint8_t lastVelocity = 0x80u; std::uint8_t lastVelocity = 0x80u;
EventType lastType = events[index].type; EventType lastType = events[index].type;
std::int32_t lastDuration = 0x80000000; std::int32_t lastDuration = 0x80000000;
std::uint8_t lastNote = 0x80u; std::uint8_t lastNote = 0x80u;
std::int32_t lastParam2;
if (events[index].time > 0) if (events[index].time > 0)
score++; score++;
@ -791,10 +793,11 @@ int CalculateCompressionScore(std::vector<Event>& events, int index)
{ {
int val = 0; int val = 0;
if (events[i].note != lastNote) // BUG: uses type instead of note
if ((std::uint8_t)events[i].type != lastNote)
{ {
val++; val++;
lastNote = events[i].note; lastNote = (std::uint8_t)events[i].type;
} }
if (events[i].param1 != lastVelocity) if (events[i].param1 != lastVelocity)
@ -840,7 +843,10 @@ int CalculateCompressionScore(std::vector<Event>& events, int index)
} }
} }
lastParam1 = events[i].param1; // BUG: uses type instead of param1
lastParam1 = (std::uint8_t)events[i].type;
// unused
lastParam2 = events[i].param2;
lastType = events[i].type; lastType = events[i].type;
if (events[i].time) if (events[i].time)