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

c io for input

Browse Source
This commit is contained in:
a dinosaur
2019-09-29 11:51:14 +10:00
parent 0a26bc8998
commit fbf887b534
2 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neotools/neoadpcmextract.Makefile
View File

@@ -1,6 +1,6 @@
TARGET := neoadpcmextract TARGET := neoadpcmextract
SOURCE := neoadpcmextract.cpp SOURCE := neoadpcmextract.cpp
CXXFLAGS := -O2 -pipe -Wall -Wextra CXXFLAGS := -O2 -pipe -Wall -Wextra -pedantic
all: $(TARGET) all: $(TARGET)

43
neotools/neoadpcmextract.cpp
View File

@@ -1,5 +1,5 @@
/* neoadpcmextract.cpp /* neoadpcmextract.cpp
Copyright (C) 2017 Nicholas Curtis Copyright (C) 2017, 2019 Nicholas Curtis
This software is provided 'as-is', without any express or implied This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages warranty. In no event will the authors be held liable for any damages
@@ -25,11 +25,11 @@
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>
void DecodeSample(std::ifstream& a_file, std::vector<uint8_t>& a_out) void DecodeSample(FILE* file, std::vector <uint8_t>& a_out)
{ {
// Set up output vector. // Set up output vector.
uint32_t sampLen = 0; uint32_t sampLen = 0;
a_file.read((char*)&sampLen, sizeof(uint32_t)); fread(&sampLen, sizeof(uint32_t), 1, file);
if (sampLen < sizeof(uint64_t)) if (sampLen < sizeof(uint64_t))
return; return;
@@ -39,10 +39,10 @@ void DecodeSample(std::ifstream& a_file, std::vector<uint8_t>& a_out)
// Ignore 8 bytes. // Ignore 8 bytes.
uint64_t dummy; uint64_t dummy;
a_file.read((char*)&dummy, sizeof(uint64_t)); fread(&dummy, sizeof(uint64_t), 1, file);
// Read adpcm data. // Read adpcm data.
a_file.read((char*)a_out.data(), sampLen); fread(a_out.data(), sizeof(uint8_t), sampLen, file);
} }
void DumpBytes(std::string a_path, const std::vector<uint8_t>& a_bytes) void DumpBytes(std::string a_path, const std::vector<uint8_t>& a_bytes)
@@ -58,45 +58,38 @@ int main(int argc, char** argv)
return -1; return -1;
// Open file. // Open file.
std::ifstream file(argv[1], std::ios::binary); FILE* file = fopen(argv[1], "rb");
if (!file.is_open()) if (!file)
return -1; return -1;
// Search for pcm headers. // Search for pcm headers.
std::vector<uint8_t> smpBytes; std::vector<uint8_t> smpBytes;
int smpA = 0, smpB = 0; int smpaCount = 0, smpbCount = 0;
while (!file.eof() && !file.fail()) while (!feof(file) && !ferror(file))
{ {
uint8_t byte; if (fgetc(file) != 0x67 &&
fgetc(file) != 0x66)
continue;
file >> byte; uint8_t byte = fgetc(file);
if (byte == 0x67)
{
file >> byte;
if (byte == 0x66)
{
file >> byte;
if (byte == 0x82) if (byte == 0x82)
{ {
std::cout << "ADPCM-A data found at 0x" << std::hex << file.tellg() << std::endl; std::cout << "ADPCM-A data found at 0x" << std::hex << ftell(file) << std::endl;
DecodeSample(file, smpBytes); DecodeSample(file, smpBytes);
std::stringstream path; std::stringstream path;
path << std::hex << "smpa_" << (smpA++) << ".pcm"; path << std::hex << "smpa_" << (smpaCount++) << ".pcm";
DumpBytes(path.str(), smpBytes); DumpBytes(path.str(), smpBytes);
} }
else if (byte == 0x83) else if (byte == 0x83)
{ {
std::cout << "ADPCM-B data found at 0x" << std::hex << file.tellg() << std::endl; std::cout << "ADPCM-B data found at 0x" << std::hex << ftell(file) << std::endl;
DecodeSample(file, smpBytes); DecodeSample(file, smpBytes);
std::stringstream path; std::stringstream path;
path << std::hex << "smpb_" << (smpB++) << ".pcm"; path << std::hex << "smpb_" << (smpbCount++) << ".pcm";
DumpBytes(path.str(), smpBytes); DumpBytes(path.str(), smpBytes);
} }
} }
}
}
file.close();
fclose(file);
return 0; return 0;
} }