murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check for trailing byte in speed

Browse source
This commit is contained in:
TheEssem 2021-05-17 23:44:28 -05:00
parent 7aa684eae6
commit 55a150c0c9
No known key found for this signature in database
GPG key ID: A3F9F02129092FCA
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
natives/speed.cc
View file

@ -31,7 +31,7 @@ Napi::Value Speed(const Napi::CallbackInfo &info) {
char *fileData = data.Data(); char *fileData = data.Data();
char *match = "\x21\xF9\x04"; char *match = "\x00\x21\xF9\x04";
// if passed a delay, use that. otherwise iterate over every frame. // if passed a delay, use that. otherwise iterate over every frame.
if (delay == 0) { if (delay == 0) {
@ -41,26 +41,26 @@ Napi::Value Speed(const Napi::CallbackInfo &info) {
int amount = 0; int amount = 0;
lastPos = (char *)memchr(fileData, '\x21', data.Length()); lastPos = (char *)memchr(fileData, '\x00', data.Length());
while (lastPos != NULL) { while (lastPos != NULL) {
if (memcmp(lastPos, match, 3) != 0) { if (memcmp(lastPos, match, 4) != 0) {
lastPos = (char *)memchr(lastPos + 1, '\x21', lastPos = (char *)memchr(lastPos + 1, '\x00',
(data.Length() - (lastPos - fileData)) - 1); (data.Length() - (lastPos - fileData)) - 1);
continue; continue;
} }
++amount; ++amount;
uint16_t old_delay; uint16_t old_delay;
memcpy(&old_delay, lastPos + 4, 2); memcpy(&old_delay, lastPos + 5, 2);
old_delays.push_back(old_delay); old_delays.push_back(old_delay);
lastPos = (char *)memchr(lastPos + 1, '\x21', lastPos = (char *)memchr(lastPos + 1, '\x00',
(data.Length() - (lastPos - fileData)) - 1); (data.Length() - (lastPos - fileData)) - 1);
} }
int currentFrame = 0; int currentFrame = 0;
lastPos = (char *)memchr(fileData, '\x21', data.Length()); lastPos = (char *)memchr(fileData, '\x00', data.Length());
while (lastPos != NULL) { while (lastPos != NULL) {
if (memcmp(lastPos, match, 3) != 0) { if (memcmp(lastPos, match, 4) != 0) {
lastPos = (char *)memchr(lastPos + 1, '\x21', lastPos = (char *)memchr(lastPos + 1, '\x00',
(data.Length() - (lastPos - fileData)) - 1); (data.Length() - (lastPos - fileData)) - 1);
continue; continue;
} }
@ -70,8 +70,8 @@ Napi::Value Speed(const Napi::CallbackInfo &info) {
removeFrames = true; removeFrames = true;
break; break;
} }
memset16(lastPos + 4, new_delay, 1); memset16(lastPos + 5, new_delay, 1);
lastPos = (char *)memchr(lastPos + 1, '\x21', lastPos = (char *)memchr(lastPos + 1, '\x00',
(data.Length() - (lastPos - fileData)) - 1); (data.Length() - (lastPos - fileData)) - 1);
++currentFrame; ++currentFrame;
} }
@ -106,15 +106,15 @@ Napi::Value Speed(const Napi::CallbackInfo &info) {
bool removeFrames = false; bool removeFrames = false;
lastPos = (char *)memchr(fileData, '\x21', data.Length()); lastPos = (char *)memchr(fileData, '\x00', data.Length());
while (lastPos != NULL) { while (lastPos != NULL) {
if (memcmp(lastPos, match, 3) != 0) { if (memcmp(lastPos, match, 4) != 0) {
lastPos = (char *)memchr(lastPos + 1, '\x21', lastPos = (char *)memchr(lastPos + 1, '\x00',
(data.Length() - (lastPos - fileData)) - 1); (data.Length() - (lastPos - fileData)) - 1);
continue; continue;
} }
uint16_t old_delay; uint16_t old_delay;
memcpy(&old_delay, lastPos + 4, 2); memcpy(&old_delay, lastPos + 5, 2);
int new_delay = slow ? delay * speed : delay / speed; int new_delay = slow ? delay * speed : delay / speed;
if (!slow && new_delay <= 1) { if (!slow && new_delay <= 1) {
removeFrames = true; removeFrames = true;
@ -140,17 +140,17 @@ Napi::Value Speed(const Napi::CallbackInfo &info) {
blob.length())); blob.length()));
} else { } else {
while (lastPos != NULL) { while (lastPos != NULL) {
if (memcmp(lastPos, match, 3) != 0) { if (memcmp(lastPos, match, 4) != 0) {
lastPos = lastPos =
(char *)memchr(lastPos + 1, '\x21', (char *)memchr(lastPos + 1, '\x00',
(data.Length() - (lastPos - fileData)) - 1); (data.Length() - (lastPos - fileData)) - 1);
continue; continue;
} }
uint16_t old_delay; uint16_t old_delay;
memcpy(&old_delay, lastPos + 4, 2); memcpy(&old_delay, lastPos + 5, 2);
int new_delay = slow ? delay * speed : delay / speed; int new_delay = slow ? delay * speed : delay / speed;
memset16(lastPos + 4, new_delay, 1); memset16(lastPos + 5, new_delay, 1);
lastPos = (char *)memchr(lastPos + 1, '\x21', lastPos = (char *)memchr(lastPos + 1, '\x00',
(data.Length() - (lastPos - fileData)) - 1); (data.Length() - (lastPos - fileData)) - 1);
} }
} }