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

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +6 -14
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1ffd83cac8 - Show all commits

20
src/Tools/psxcdgen_ex/src/encoder/builder.rs
View File

@ -115,24 +115,15 @@ pub fn create_xa_audio_for(data: &Vec<RawData>) -> Vec<Mode2Form2> {
let mut sectors = vec![Mode2Form2::new(); sectors_to_parse*channel_count]; let mut sectors = vec![Mode2Form2::new(); sectors_to_parse*channel_count];
let mut cur_sector_id = 0; let mut cur_sector_id = 0;
for sector_id in 0..sectors_to_parse { for _sector_id in 0..sectors_to_parse {
let mut channel_id = 0; let mut channel_id = 0;
for channel in &mut channels { for channel in &mut channels {
let sub_mode = { let mut sub_mode = SubMode::default_form2();
let mut sub_mode = SubMode::default_form2();
if sector_id + 1 == sectors_to_parse {
sub_mode.set_eof();
sub_mode.set_eor();
}
else {
sub_mode.set_real_time();
}
sub_mode
};
let (raw_data, coding_info) = { let (raw_data, coding_info) = {
if channel.is_empty() { if channel.is_empty() {
sub_mode.set_eof();
sub_mode.set_eor();
([0xFFu8; Mode2Form2::DATA_SIZE], CodingInfo::default()) ([0xFFu8; Mode2Form2::DATA_SIZE], CodingInfo::default())
} }
@ -149,6 +140,7 @@ pub fn create_xa_audio_for(data: &Vec<RawData>) -> Vec<Mode2Form2> {
// v Skip EDC // v Skip EDC
*channel = &channel[0x4..channel.len()]; *channel = &channel[0x4..channel.len()];
sub_mode.set_real_time();
(raw_data, sub_header.coding_info) (raw_data, sub_header.coding_info)
} }
}; };