Mirrors/psxavenc
2
0
Fork 1
mirror of https://github.com/WonderfulToolchain/psxavenc.git synced 2025-12-17 11:30:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up, implement new SPU-ADPCM looping options

Browse Source
This commit is contained in:
spicyjpeg
2025-03-02 12:12:51 +01:00
parent 4a0d0c55fd
commit 7d537edffb
8 changed files with 198 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
libpsxav/libpsxav.h
View File

@@ -28,8 +28,13 @@ freely, subject to the following restrictions:
// audio.c
#define PSX_AUDIO_XA_FREQ_SINGLE 18900
#define PSX_AUDIO_XA_FREQ_DOUBLE 37800
#define PSX_AUDIO_SPU_BLOCK_SIZE 16
#define PSX_AUDIO_SPU_SAMPLES_PER_BLOCK 28
enum {
PSX_AUDIO_XA_FREQ_SINGLE = 18900,
PSX_AUDIO_XA_FREQ_DOUBLE = 37800
};
typedef enum {
PSX_AUDIO_XA_FORMAT_XA, // .xa file
@@ -56,23 +61,22 @@ typedef struct {
psx_audio_encoder_channel_state_t right;
} psx_audio_encoder_state_t;
#define PSX_AUDIO_SPU_LOOP_END 1
#define PSX_AUDIO_SPU_LOOP_REPEAT 3
#define PSX_AUDIO_SPU_LOOP_START 4
enum {
PSX_AUDIO_SPU_LOOP_END = 1 << 0,
PSX_AUDIO_SPU_LOOP_REPEAT = 3 << 0,
PSX_AUDIO_SPU_LOOP_START = 1 << 2
};
uint32_t psx_audio_xa_get_buffer_size(psx_audio_xa_settings_t settings, int sample_count);
uint32_t psx_audio_spu_get_buffer_size(int sample_count);
uint32_t psx_audio_xa_get_buffer_size_per_sector(psx_audio_xa_settings_t settings);
uint32_t psx_audio_spu_get_buffer_size_per_block(void);
uint32_t psx_audio_xa_get_samples_per_sector(psx_audio_xa_settings_t settings);
uint32_t psx_audio_spu_get_samples_per_block(void);
uint32_t psx_audio_xa_get_sector_interleave(psx_audio_xa_settings_t settings);
int psx_audio_xa_encode(psx_audio_xa_settings_t settings, psx_audio_encoder_state_t *state, int16_t* samples, int sample_count, uint8_t *output);
int psx_audio_xa_encode_simple(psx_audio_xa_settings_t settings, int16_t* samples, int sample_count, uint8_t *output);
int psx_audio_spu_encode(psx_audio_encoder_channel_state_t *state, int16_t* samples, int sample_count, int pitch, uint8_t *output);
int psx_audio_spu_encode_simple(int16_t* samples, int sample_count, uint8_t *output, int loop_start);
void psx_audio_xa_encode_finalize(psx_audio_xa_settings_t settings, uint8_t *output, int output_length);
void psx_audio_spu_set_flag_at_sample(uint8_t* spu_data, int sample_pos, int flag);
// cdrom.c
@@ -115,25 +119,29 @@ _Static_assert(sizeof(psx_cdrom_sector_mode2_t) == PSX_CDROM_SECTOR_SIZE, "Inval
#define PSX_CDROM_SECTOR_XA_CHANNEL_MASK 0x1F
#define PSX_CDROM_SECTOR_XA_SUBMODE_EOR 0x01
#define PSX_CDROM_SECTOR_XA_SUBMODE_VIDEO 0x02
#define PSX_CDROM_SECTOR_XA_SUBMODE_AUDIO 0x04
#define PSX_CDROM_SECTOR_XA_SUBMODE_DATA 0x08
#define PSX_CDROM_SECTOR_XA_SUBMODE_TRIGGER 0x10
#define PSX_CDROM_SECTOR_XA_SUBMODE_FORM2 0x20
#define PSX_CDROM_SECTOR_XA_SUBMODE_RT 0x40
#define PSX_CDROM_SECTOR_XA_SUBMODE_EOF 0x80
enum {
PSX_CDROM_SECTOR_XA_SUBMODE_EOR = 1 << 0,
PSX_CDROM_SECTOR_XA_SUBMODE_VIDEO = 1 << 1,
PSX_CDROM_SECTOR_XA_SUBMODE_AUDIO = 1 << 2,
PSX_CDROM_SECTOR_XA_SUBMODE_DATA = 1 << 3,
PSX_CDROM_SECTOR_XA_SUBMODE_TRIGGER = 1 << 4,
PSX_CDROM_SECTOR_XA_SUBMODE_FORM2 = 1 << 5,
PSX_CDROM_SECTOR_XA_SUBMODE_RT = 1 << 6,
PSX_CDROM_SECTOR_XA_SUBMODE_EOF = 1 << 7
};
#define PSX_CDROM_SECTOR_XA_CODING_MONO 0x00
#define PSX_CDROM_SECTOR_XA_CODING_STEREO 0x01
#define PSX_CDROM_SECTOR_XA_CODING_CHANNEL_MASK 0x03
#define PSX_CDROM_SECTOR_XA_CODING_FREQ_DOUBLE 0x00
#define PSX_CDROM_SECTOR_XA_CODING_FREQ_SINGLE 0x04
#define PSX_CDROM_SECTOR_XA_CODING_FREQ_MASK 0x0C
#define PSX_CDROM_SECTOR_XA_CODING_BITS_4 0x00
#define PSX_CDROM_SECTOR_XA_CODING_BITS_8 0x10
#define PSX_CDROM_SECTOR_XA_CODING_BITS_MASK 0x30
#define PSX_CDROM_SECTOR_XA_CODING_EMPHASIS 0x40
enum {
PSX_CDROM_SECTOR_XA_CODING_MONO = 0 << 0,
PSX_CDROM_SECTOR_XA_CODING_STEREO = 1 << 0,
PSX_CDROM_SECTOR_XA_CODING_CHANNEL_MASK = 3 << 0,
PSX_CDROM_SECTOR_XA_CODING_FREQ_DOUBLE = 0 << 2,
PSX_CDROM_SECTOR_XA_CODING_FREQ_SINGLE = 1 << 2,
PSX_CDROM_SECTOR_XA_CODING_FREQ_MASK = 3 << 2,
PSX_CDROM_SECTOR_XA_CODING_BITS_4 = 0 << 4,
PSX_CDROM_SECTOR_XA_CODING_BITS_8 = 1 << 4,
PSX_CDROM_SECTOR_XA_CODING_BITS_MASK = 3 << 4,
PSX_CDROM_SECTOR_XA_CODING_EMPHASIS = 1 << 6
};
typedef enum {
PSX_CDROM_SECTOR_TYPE_MODE1,