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

Support XA-Audio (buggy)

Browse Source
This commit is contained in:
jaby
2024-05-26 14:49:48 +02:00
parent 43c534cf9b
commit c1ce4d95ac
4 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,13 +49,14 @@ pub fn create_xa_data_for_raw(mut sub_mode: SubMode, data: &[u8; Mode2Form1::DAT
sector
}
pub fn create_xa_audio_for_raw(mut sub_mode: SubMode, channel: u8, data: &[u8; Mode2Form2::DATA_SIZE]) -> Mode2Form2 {
pub fn create_xa_audio_for_raw(mut sub_mode: SubMode, coding_info: CodingInfo, channel: u8, data: &[u8; Mode2Form2::DATA_SIZE]) -> Mode2Form2 {
let mut sector = Mode2Form2::new();
sub_mode.set_audio();
sector.sub_header.channel_number = channel;
sector.sub_header.sub_mode = sub_mode;
sector.sub_header.coding_info = coding_info;
sector.data = *data;
sector
}
@@ -124,6 +125,7 @@ pub fn create_xa_audio_for(data: &Vec<RawData>) -> Vec<Mode2Form2> {
let mut channel_id = 0;
let sub_mode = {
let mut sub_mode = SubMode::default_form2();
sub_mode.set_real_time();
if sector_id + 1 == sectors_to_parse {
sub_mode.set_eof();
@@ -133,24 +135,28 @@ pub fn create_xa_audio_for(data: &Vec<RawData>) -> Vec<Mode2Form2> {
};
for channel in &mut channels {
let raw_data = {
let (raw_data, coding_info) = {
if channel.is_empty() {
[0u8; Mode2Form2::DATA_SIZE]
([0u8; Mode2Form2::DATA_SIZE], CodingInfo::default())
}
else {
let mut raw_data = [0u8; Mode2Form2::DATA_SIZE];
let mut sub_header = SubHeader::default();
let mut raw_data = [0u8; Mode2Form2::DATA_SIZE];
// v Skip header stuff
*channel = &channel[0x18..channel.len()];
*channel = copy_array(&mut raw_data, &channel);
// v Skip sync and header
*channel = &channel[0x10..channel.len()];
*channel = copy_object(&mut sub_header, &channel);
// v Copy of sub-header
*channel = &channel[0x4..channel.len()];
// ^ Skip EDC
raw_data
*channel = copy_array(&mut raw_data, &channel);
// v Skip EDC
*channel = &channel[0x4..channel.len()];
(raw_data, sub_header.coding_info)
}
};
sectors[cur_sector_id] = create_xa_audio_for_raw(sub_mode, channel_id, &raw_data);
sectors[cur_sector_id] = create_xa_audio_for_raw(sub_mode, coding_info, channel_id, &raw_data);
channel_id += 1;
cur_sector_id += 1;
}
@@ -163,7 +169,16 @@ pub fn create_xa_data_zero() -> Mode2Form1 {
}
pub fn create_xa_audio_zero(channel: u8) -> Mode2Form2 {
create_xa_audio_for_raw(SubMode::default_form2(), channel, &[0u8; Mode2Form2::DATA_SIZE])
create_xa_audio_for_raw(SubMode::default_form2(), CodingInfo::default_form2(), channel, &[0u8; Mode2Form2::DATA_SIZE])
}
fn copy_object<'a, T, S>(dst: &mut T, src: &'a [S]) -> &'a [S] {
let data_size = std::mem::size_of::<T>();
unsafe{
let dst:*mut T = &mut *dst;
std::ptr::copy_nonoverlapping(src.as_ptr(), dst as *mut S, data_size)
};
&src[data_size..src.len()]
}
fn copy_array<'a, T, const SIZE:usize>(dst: &mut [T; SIZE], src: &'a [T]) -> &'a [T] {