jaby/jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Reduce CDFileProcessor size and add configuratable buffer size

Browse Source
This commit is contained in:
jaby
2023-04-16 21:11:10 +02:00
parent e21d7c5d50
commit e4657337f9
2 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/PSX/File/Processor/cd_file_processor.hpp
View File

@@ -12,6 +12,18 @@ extern "C" uint32_t __heap_base;
namespace JabyEngine {
class CDFileProcessor {
public:
struct BufferConfiguration {
static constexpr size_t SmallSectorCount = 5;
static constexpr size_t MediumSectorCount = 16;
uint32_t* adr = nullptr;
size_t sector_count = 0;
static constexpr BufferConfiguration new_default() {
return {&__heap_base, BufferConfiguration::MediumSectorCount};
}
};
struct JobArray {
const CDFile* files = nullptr;
size_t size = 0;
@@ -29,27 +41,25 @@ namespace JabyEngine {
CircularBuffer<CD_IO::DataSector> circular_buffer;
LZ4Decompressor lz4_decomp;
JobArray jobs;
const AutoLBAEntry* lba = nullptr;
uint32_t* tmp_area = nullptr;
void start_cur_job();
void start_cur_job(const AutoLBAEntry* lba, const BufferConfiguration& buf_cfg);
bool process_data();
public:
CDFileProcessor() = default;
void setup(const volatile AutoLBAEntry* lba, JobArray jobs, uint32_t* tmp_area = &__heap_base);
void setup(const volatile AutoLBAEntry* lba, JobArray jobs, const BufferConfiguration& buf_cfg);
template<size_t N>
void setup(const volatile AutoLBAEntry* lba, const CDFile (&file_array)[N], uint32_t* tmp_area = &__heap_base) {
CDFileProcessor::setup(lba, JobArray{file_array, N}, tmp_area);
void setup(const volatile AutoLBAEntry* lba, const CDFile (&file_array)[N], const BufferConfiguration& buf_cfg) {
CDFileProcessor::setup(lba, JobArray{file_array, N}, buf_cfg);
}
Progress process();
bool next() {
bool next(const volatile AutoLBAEntry* lba, const BufferConfiguration& buf_cfg) {
if(this->jobs.next()) {
CDFileProcessor::start_cur_job();
CDFileProcessor::start_cur_job(const_cast<const AutoLBAEntry*>(lba), buf_cfg);
return true;
}
@@ -58,8 +68,4 @@ namespace JabyEngine {
};
}
// This will be used as the file processor but will work on cd types
// Will probably use file_processor
// Will also setup the circular buffer for the CD code
#endif //!__JABYENGINE_CD_FILE_PROCESSOR_HPP__