a_dinosaur/VGM-Tools
1
0
Fork 0
mirror of https://github.com/ScrelliCopter/VGM-Tools synced 2025-02-21 04:09:25 +11:00
Code Issues Releases Wiki Activity

use a lightweight buffer class for in-memory samples

Browse Source
This commit is contained in:
a dinosaur
2019-10-01 23:37:55 +10:00
parent 172174c837
commit c94016e793
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
neotools/neoadpcmextract.cpp
View File

@@ -19,33 +19,41 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <vector> #include <stdlib.h>
#include <cstdint> #include <cstdint>
void DecodeSample(FILE* fin, const char* name, std::vector <uint8_t>& buf)
typedef struct { uint8_t* data; size_t size; } Buffer;
void DecodeSample(FILE* fin, const char* name, Buffer* buf)
{ {
// Set up output vector. // Get sample data length.
uint32_t sampLen = 0; uint32_t sampLen = 0;
fread(&sampLen, sizeof(uint32_t), 1, fin); fread(&sampLen, sizeof(uint32_t), 1, fin);
if (sampLen < sizeof(uint64_t)) if (sampLen < sizeof(uint64_t))
return; return;
sampLen -= sizeof(uint64_t); sampLen -= sizeof(uint64_t);
buf.clear();
buf.resize(sampLen); // Resize buffer if needed.
if (!buf->data || buf->size < sampLen)
{
free(buf->data);
buf->data = (uint8_t*)malloc(sampLen);
buf->size = sampLen;
}
// Ignore 8 bytes. // Ignore 8 bytes.
uint64_t dummy; uint64_t dummy;
fread(&dummy, sizeof(uint64_t), 1, fin); fread(&dummy, sizeof(uint64_t), 1, fin);
// Read adpcm data. // Read adpcm data.
fread(buf.data(), sizeof(uint8_t), sampLen, fin); fread(buf->data, sizeof(uint8_t), sampLen, fin);
FILE* fout = fopen(name, "wb"); FILE* fout = fopen(name, "wb");
if (!fout) if (!fout)
return; return;
fwrite(buf.data(), sizeof(uint8_t), buf.size(), fout); fwrite(buf->data, sizeof(uint8_t), sampLen, fout);
fclose(fout); fclose(fout);
} }
@@ -60,7 +68,7 @@ int main(int argc, char** argv)
return 1; return 1;
// Search for pcm headers. // Search for pcm headers.
std::vector<uint8_t> smpBytes; Buffer smpBytes = {NULL, 0};
char namebuf[32]; char namebuf[32];
int smpaCount = 0, smpbCount = 0; int smpaCount = 0, smpbCount = 0;
while (!feof(file) && !ferror(file)) while (!feof(file) && !ferror(file))
@@ -73,16 +81,17 @@ int main(int argc, char** argv)
{ {
printf("ADPCM-A data found at 0x%08lX\n", ftell(file)); printf("ADPCM-A data found at 0x%08lX\n", ftell(file));
snprintf(namebuf, sizeof(namebuf), "smpa_%x.pcm", smpaCount++); snprintf(namebuf, sizeof(namebuf), "smpa_%x.pcm", smpaCount++);
DecodeSample(file, namebuf, smpBytes); DecodeSample(file, namebuf, &smpBytes);
} }
else if (byte == 0x83) else if (byte == 0x83)
{ {
printf("ADPCM-B data found at 0x%08lX\n", ftell(file)); printf("ADPCM-B data found at 0x%08lX\n", ftell(file));
snprintf(namebuf, sizeof(namebuf), "smpb_%x.pcm", smpbCount++); snprintf(namebuf, sizeof(namebuf), "smpb_%x.pcm", smpbCount++);
DecodeSample(file, namebuf, smpBytes); DecodeSample(file, namebuf, &smpBytes);
} }
} }
free(smpBytes.data);
fclose(file); fclose(file);
return 0; return 0;
} }