ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CDROM: Reset XA resampler state on read 

Should get rid of pops when switching files.
This commit is contained in:
Connor McLaughlin 2020-05-12 12:36:08 +10:00
parent 634880b5e3
commit d866bd9cb8
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/cdrom.cpp
View File

@ -80,14 +80,7 @@ void CDROM::SoftReset()
m_next_cd_audio_volume_matrix[1][0] = 0x00; m_next_cd_audio_volume_matrix[1][0] = 0x00;
m_next_cd_audio_volume_matrix[1][1] = 0x80; m_next_cd_audio_volume_matrix[1][1] = 0x80;
m_cd_audio_volume_matrix = m_next_cd_audio_volume_matrix; m_cd_audio_volume_matrix = m_next_cd_audio_volume_matrix;
ResetXAResampler();
m_xa_last_samples.fill(0);
for (u32 i = 0; i < 2; i++)
{
m_xa_resample_ring_buffer[i].fill(0);
m_xa_resample_p = 0;
m_xa_resample_sixstep = 6;
}
m_param_fifo.Clear(); m_param_fifo.Clear();
m_response_fifo.Clear(); m_response_fifo.Clear();
@ -1192,9 +1185,8 @@ void CDROM::BeginReading(TickCount ticks_late /* = 0 */, bool after_seek /* = fa
m_drive_event->Schedule(first_sector_ticks); m_drive_event->Schedule(first_sector_ticks);
m_current_read_sector_buffer = 0; m_current_read_sector_buffer = 0;
m_current_write_sector_buffer = 0; m_current_write_sector_buffer = 0;
m_xa_current_file_number = 0; ResetCurrentXAFile();
m_xa_current_channel_number = 0; ResetXAResampler();
m_xa_current_set = false;
m_reader.QueueReadSector(m_last_requested_sector); m_reader.QueueReadSector(m_last_requested_sector);
} }
@ -1722,6 +1714,17 @@ void CDROM::ResetCurrentXAFile()
m_xa_current_set = false; m_xa_current_set = false;
} }
void CDROM::ResetXAResampler()
{
m_xa_last_samples.fill(0);
for (u32 i = 0; i < 2; i++)
{
m_xa_resample_ring_buffer[i].fill(0);
m_xa_resample_p = 0;
m_xa_resample_sixstep = 6;
}
}
void CDROM::ProcessXAADPCMSector(const u8* raw_sector, const CDImage::SubChannelQ& subq) void CDROM::ProcessXAADPCMSector(const u8* raw_sector, const CDImage::SubChannelQ& subq)
{ {
// Check for automatic ADPCM filter. // Check for automatic ADPCM filter.

1
src/core/cdrom.h
View File

@ -237,6 +237,7 @@ private:
void StopReadingWithDataEnd(); void StopReadingWithDataEnd();
void BeginSeeking(bool logical, bool read_after_seek, bool play_after_seek); void BeginSeeking(bool logical, bool read_after_seek, bool play_after_seek);
void ResetCurrentXAFile(); void ResetCurrentXAFile();
void ResetXAResampler();
void LoadDataFIFO(); void LoadDataFIFO();
void ClearSectorBuffers(); void ClearSectorBuffers();