tobid7/ctrff-pub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Cleanup Constructors and switch to std::vector

Browse Source
This commit is contained in:
tobid7
2025-12-03 22:50:09 +01:00
parent f6b81d701a
commit a6d5ff56d9
5 changed files with 81 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
include/ctrff/bcstm.hpp
View File

@@ -68,22 +68,28 @@ class CTRFF_API BCSTM {
}; };
struct Reference { struct Reference {
Reference() : TypeID(0), Padding(0), Offset(0) {}
Reference(PD::u16 t, PD::u16 p, PD::u32 o)
: TypeID(t), Padding(p), Offset(o) {}
PD::u16 TypeID; PD::u16 TypeID;
PD::u16 Padding; PD::u16 Padding;
PD::u32 Offset; /** null -> uint32_max */ PD::u32 Offset; /** null -> uint32_max */
}; };
struct ReferenceTable { struct ReferenceTable {
ReferenceTable() : Count(0) {}
PD::u32 Count; PD::u32 Count;
PD::Vec<Reference> Refs; std::vector<Reference> Refs;
}; };
struct SizedReference { struct SizedReference {
SizedReference() : Size(0) {}
Reference Ref; Reference Ref;
PD::u32 Size; PD::u32 Size;
}; };
struct StreamInfo { struct StreamInfo {
StreamInfo();
PD::u8 Encoding; PD::u8 Encoding;
PD::u8 Loop; PD::u8 Loop;
PD::u8 ChannelCount; PD::u8 ChannelCount;
@@ -103,11 +109,14 @@ class CTRFF_API BCSTM {
}; };
struct BlockHeader { struct BlockHeader {
BlockHeader() : Magic(0), Size(0) {}
BlockHeader(PD::u32 m, PD::u32 s) : Magic(m), Size(s) {}
PD::u32 Magic; PD::u32 Magic;
PD::u32 Size; PD::u32 Size;
}; };
struct InfoBlock { struct InfoBlock {
InfoBlock() = default;
BlockHeader Header; BlockHeader Header;
Reference StreamInfoRef; Reference StreamInfoRef;
Reference TrackInfoTabRef; Reference TrackInfoTabRef;
@@ -115,19 +124,27 @@ class CTRFF_API BCSTM {
BCSTM::StreamInfo StreamInfo; BCSTM::StreamInfo StreamInfo;
ReferenceTable TrackInfoTab; ReferenceTable TrackInfoTab;
ReferenceTable ChannelInfoTab; ReferenceTable ChannelInfoTab;
PD::Vec<Reference> ChannelInfoRefs; /** The refs of the refs ?? */ std::vector<Reference> ChannelInfoRefs; /** The refs of the refs ?? */
}; };
/** SeekDataBlock cause they are the same struct */ /** SeekDataBlock cause they are the same struct */
struct SD_Block { struct SD_Block {
SD_Block() {}
BlockHeader Header; BlockHeader Header;
PD::Vec<PD::u8> Data; std::vector<PD::u8> Data;
}; };
struct DSP_ADPCM_Param { struct DSP_ADPCM_Param {
// Lets keep this not clean here :/
DSP_ADPCM_Param() {}
PD::u16 Coefficients[0x10]; PD::u16 Coefficients[0x10];
}; };
struct DSP_ADPCM_Context { struct DSP_ADPCM_Context {
DSP_ADPCM_Context()
: PredictorScale(0),
Reserved(0),
PreviousSample(0),
SecondPreviousSample(0) {}
PD::u8 PredictorScale; PD::u8 PredictorScale;
PD::u8 Reserved; PD::u8 Reserved;
PD::u16 PreviousSample; PD::u16 PreviousSample;
@@ -135,6 +152,7 @@ class CTRFF_API BCSTM {
}; };
struct DSP_ADPCM_Info { struct DSP_ADPCM_Info {
DSP_ADPCM_Info() : Padding(0) {}
DSP_ADPCM_Param Param; DSP_ADPCM_Param Param;
DSP_ADPCM_Context Context; DSP_ADPCM_Context Context;
DSP_ADPCM_Context LoopContext; DSP_ADPCM_Context LoopContext;
@@ -142,11 +160,13 @@ class CTRFF_API BCSTM {
}; };
struct ByteTable { struct ByteTable {
ByteTable(PD::u32 size = 0) : Size(size) {}
PD::u32 Size; PD::u32 Size;
PD::Vec<PD::u8> Table; std::vector<PD::u8> Table;
}; };
struct TrackInfo { struct TrackInfo {
TrackInfo() : Volume(0), Pan(0), Padding(0) {}
PD::u8 Volume; PD::u8 Volume;
PD::u8 Pan; PD::u8 Pan;
PD::u16 Padding; PD::u16 Padding;
@@ -155,6 +175,15 @@ class CTRFF_API BCSTM {
}; };
struct Header { struct Header {
// Warum sieht dass so ~~nicht~~ gut aus...
Header()
: Magic(0),
Endianness(Little),
HeaderSize(0),
Version(0),
FileSize(0),
NumBlocks(0),
Reserved(0) {}
PD::u32 Magic; /** CSTM */ PD::u32 Magic; /** CSTM */
PD::u16 Endianness = Little; /** Default */ PD::u16 Endianness = Little; /** Default */
PD::u16 HeaderSize; /** Header Size probably */ PD::u16 HeaderSize; /** Header Size probably */
@@ -171,7 +200,7 @@ class CTRFF_API BCSTM {
InfoBlock pInfoBlock; InfoBlock pInfoBlock;
SD_Block pSeekBlock; SD_Block pSeekBlock;
SD_Block pDataBlock; SD_Block pDataBlock;
PD::Vec<DSP_ADPCM_Info> pDSP_ADPCM_Info; std::vector<DSP_ADPCM_Info> pDSP_ADPCM_Info;
/** File Stream */ /** File Stream */
std::fstream pFile; std::fstream pFile;
/** Endianness based reader */ /** Endianness based reader */

8
include/ctrff/bcwav.hpp
View File

@@ -46,7 +46,7 @@ class CTRFF_API BCWAV {
struct ReferenceTable { struct ReferenceTable {
PD::u32 Count; PD::u32 Count;
PD::Vec<Reference> Refs; std::vector<Reference> Refs;
}; };
struct SizedReference { struct SizedReference {
@@ -88,13 +88,13 @@ class CTRFF_API BCWAV {
PD::u32 LoopEndFrame; PD::u32 LoopEndFrame;
PD::u32 Reserved; PD::u32 Reserved;
ReferenceTable ChannelInfoTab; ReferenceTable ChannelInfoTab;
PD::Vec<Reference> ChannelInfoRefs; /** The refs of the refs ?? */ std::vector<Reference> ChannelInfoRefs; /** The refs of the refs ?? */
}; };
struct DataBlock { struct DataBlock {
BlockHeader Header; BlockHeader Header;
PD::u32 Padding[3]; PD::u32 Padding[3];
PD::Vec<PD::u8> Data; std::vector<PD::u8> Data;
}; };
struct DSP_ADPCM_Param { struct DSP_ADPCM_Param {
@@ -129,7 +129,7 @@ class CTRFF_API BCWAV {
SizedReference pDataBlockRef; SizedReference pDataBlockRef;
InfoBlock pInfoBlock; InfoBlock pInfoBlock;
DataBlock pDataBlock; DataBlock pDataBlock;
PD::Vec<DSP_ADPCM_Info> pDSP_ADPCM_Info; std::vector<DSP_ADPCM_Info> pDSP_ADPCM_Info;
/** File Stream */ /** File Stream */
std::fstream pFile; std::fstream pFile;
/** Endianness based reader */ /** Endianness based reader */

47
source/bcstm.cpp
View File

@@ -97,9 +97,9 @@ CTRFF_API void BCSTM::ReadInfoBlock(InfoBlock& block) {
std::ios::beg); std::ios::beg);
Reference r; Reference r;
ReadReference(r); ReadReference(r);
block.ChannelInfoRefs.Add(r); block.ChannelInfoRefs.push_back(r);
} }
for (size_t i = 0; i < block.ChannelInfoRefs.Size(); i++) { for (size_t i = 0; i < block.ChannelInfoRefs.size(); i++) {
size_t off = pInfoBlockRef.Ref.Offset; size_t off = pInfoBlockRef.Ref.Offset;
off += sizeof(BlockHeader); off += sizeof(BlockHeader);
off += block.ChannelInfoTabRef.Offset; off += block.ChannelInfoTabRef.Offset;
@@ -108,7 +108,7 @@ CTRFF_API void BCSTM::ReadInfoBlock(InfoBlock& block) {
pFile.seekg(off, std::ios::beg); pFile.seekg(off, std::ios::beg);
DSP_ADPCM_Info t; /** temp */ DSP_ADPCM_Info t; /** temp */
pReader.ReadEx(t); /** This Section gets read normally */ pReader.ReadEx(t); /** This Section gets read normally */
pDSP_ADPCM_Info.Add(t); pDSP_ADPCM_Info.push_back(t);
} }
} }
@@ -119,23 +119,23 @@ CTRFF_API void BCSTM::ReadSeekBlock(SD_Block& block) {
throw std::runtime_error("BCSTM: SeekBlock Size is not 0x20 aligned!"); throw std::runtime_error("BCSTM: SeekBlock Size is not 0x20 aligned!");
} }
pSeekBlock.Data.Reserve(pSeekBlock.Header.Size + 1); pSeekBlock.Data.reserve(pSeekBlock.Header.Size + 1);
for (PD::u32 i = 0; i < pSeekBlock.Header.Size; i++) { for (PD::u32 i = 0; i < pSeekBlock.Header.Size; i++) {
PD::u8 v; PD::u8 v;
pReader.Read(v); pReader.Read(v);
pSeekBlock.Data.Add(v); pSeekBlock.Data.push_back(v);
} }
} }
CTRFF_API void BCSTM::ReadReferenceTab(ReferenceTable& tab) { CTRFF_API void BCSTM::ReadReferenceTab(ReferenceTable& tab) {
pReader.Read(tab.Count); pReader.Read(tab.Count);
tab.Refs.Reserve(tab.Count + 1); tab.Refs.reserve(tab.Count + 1);
for (PD::u32 i = 0; i < tab.Count; i++) { for (PD::u32 i = 0; i < tab.Count; i++) {
Reference r; Reference r;
pReader.Read(r.TypeID); pReader.Read(r.TypeID);
pReader.Read(r.Padding); pReader.Read(r.Padding);
pReader.Read(r.Offset); pReader.Read(r.Offset);
tab.Refs.Add(r); tab.Refs.push_back(r);
} }
} }
@@ -183,11 +183,32 @@ CTRFF_API void BCSTM::CleanUp() {
throw std::runtime_error(e.what()); throw std::runtime_error(e.what());
} }
} }
pInfoBlock.ChannelInfoRefs.Clear(); pInfoBlock = InfoBlock();
pInfoBlock.ChannelInfoTab.Refs.Clear(); pHeader = Header();
pInfoBlock.ChannelInfoTab.Count = 0; pInfoBlockRef = SizedReference();
pInfoBlock.TrackInfoTab.Refs.Clear(); pSeekBlockRef = SizedReference();
pInfoBlock.TrackInfoTab.Count = 0; pDataBlockRef = SizedReference();
pDSP_ADPCM_Info.Clear(); pInfoBlock = InfoBlock();
pSeekBlock = SD_Block();
pDataBlock = SD_Block();
pDSP_ADPCM_Info.clear();
}
CTRFF_API BCSTM::StreamInfo::StreamInfo() {
ChannelCount = 0;
Encoding = 0;
LastSampleBlockPaddedSize = 0;
LastSampleBlockSampleNum = 0;
LastSampleBlockSize = 0;
Loop = 0;
LoopEndFrame = 0;
LoopStartFrame = 0;
Padding = 0;
SampleBlockNum = 0;
SampleBlockSampleNum = 0;
SampleBlockSize = 0;
SampleRate = 0;
SeekDataSize = 0;
SeekIntervalSampleNum = 0;
} }
} // namespace ctrff } // namespace ctrff

16
source/bcwav.cpp
View File

@@ -67,9 +67,9 @@ CTRFF_API void BCWAV::ReadInfoBlock(InfoBlock& block) {
std::ios::beg); std::ios::beg);
Reference r; Reference r;
ReadReference(r); ReadReference(r);
block.ChannelInfoRefs.Add(r); block.ChannelInfoRefs.push_back(r);
} }
for (size_t i = 0; i < block.ChannelInfoRefs.Size(); i++) { for (size_t i = 0; i < block.ChannelInfoRefs.size(); i++) {
size_t off = pInfoBlockRef.Ref.Offset; size_t off = pInfoBlockRef.Ref.Offset;
off += sizeof(BlockHeader); off += sizeof(BlockHeader);
off += block.ChannelInfoTab.Refs[i].Offset; off += block.ChannelInfoTab.Refs[i].Offset;
@@ -77,19 +77,19 @@ CTRFF_API void BCWAV::ReadInfoBlock(InfoBlock& block) {
pFile.seekg(off, std::ios::beg); pFile.seekg(off, std::ios::beg);
DSP_ADPCM_Info t; /** temp */ DSP_ADPCM_Info t; /** temp */
pReader.ReadEx(t); /** This Section gets read normally */ pReader.ReadEx(t); /** This Section gets read normally */
pDSP_ADPCM_Info.Add(t); pDSP_ADPCM_Info.push_back(t);
} }
} }
CTRFF_API void BCWAV::ReadReferenceTab(ReferenceTable& tab) { CTRFF_API void BCWAV::ReadReferenceTab(ReferenceTable& tab) {
pReader.Read(tab.Count); pReader.Read(tab.Count);
tab.Refs.Reserve(tab.Count + 1); tab.Refs.reserve(tab.Count + 1);
for (PD::u32 i = 0; i < tab.Count; i++) { for (PD::u32 i = 0; i < tab.Count; i++) {
Reference r; Reference r;
pReader.Read(r.TypeID); pReader.Read(r.TypeID);
pReader.Read(r.Padding); pReader.Read(r.Padding);
pReader.Read(r.Offset); pReader.Read(r.Offset);
tab.Refs.Add(r); tab.Refs.push_back(r);
} }
} }
@@ -134,9 +134,9 @@ CTRFF_API void BCWAV::CleanUp() {
throw std::runtime_error(e.what()); throw std::runtime_error(e.what());
} }
} }
pInfoBlock.ChannelInfoRefs.Clear(); pInfoBlock.ChannelInfoRefs.clear();
pInfoBlock.ChannelInfoTab.Refs.Clear(); pInfoBlock.ChannelInfoTab.Refs.clear();
pInfoBlock.ChannelInfoTab.Count = 0; pInfoBlock.ChannelInfoTab.Count = 0;
pDSP_ADPCM_Info.Clear(); pDSP_ADPCM_Info.clear();
} }
} // namespace ctrff } // namespace ctrff

2
source/helper.cpp
View File

@@ -148,7 +148,7 @@ CTRFF_API std::string ctrff::U16toU8(PD::u16 *in, size_t max) {
result.push_back(static_cast<char>(0x80 | (c & 0x3F))); result.push_back(static_cast<char>(0x80 | (c & 0x3F)));
} else if (c < 0x10000) { } else if (c < 0x10000) {
result.push_back(static_cast<char>(0xE0 | (c >> 12))); result.push_back(static_cast<char>(0xE0 | (c >> 12)));
result.push_back(static_cast<char>(0x80 | ((c >> 6) & 0x3F))); result.push_back(static_cast<char>(0x80 | ((c >> 6) & 0x3F)));
result.push_back(static_cast<char>(0x80 | (c & 0x3F))); result.push_back(static_cast<char>(0x80 | (c & 0x3F)));
} else { } else {
continue; continue;