Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 01:48:29 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

k573dio: timing fixes

Browse Source 
- k573dio now correctly reports the actual number of samples already
played (instead of rounding up by one discrete mpeg frame in advance and
disregarding samples that have been copied to the stream but not yet
actually played).
This commit is contained in:
Eric Vidal 2019-07-12 17:27:03 +08:00
parent a5fdcb40f8
commit 3a19b4dcc3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/sound/mas3507d.cpp
View File

@ -48,6 +48,7 @@ void mas3507d_device::device_reset()
mp3_count = 0; mp3_count = 0;
sample_count = 0; sample_count = 0;
total_frame_count = 0; total_frame_count = 0;
buffered_frame_count = 0;
} }
void mas3507d_device::i2c_scl_w(bool line) void mas3507d_device::i2c_scl_w(bool line)
@ -356,8 +357,6 @@ void mas3507d_device::fill_buffer()
current_rate = mp3_info.hz; current_rate = mp3_info.hz;
stream->set_sample_rate(current_rate); stream->set_sample_rate(current_rate);
} }
total_frame_count += scount;
} }
void mas3507d_device::append_buffer(stream_sample_t **outputs, int &pos, int scount) void mas3507d_device::append_buffer(stream_sample_t **outputs, int &pos, int scount)
@ -365,6 +364,8 @@ void mas3507d_device::append_buffer(stream_sample_t **outputs, int &pos, int sco
if(!sample_count) if(!sample_count)
return; return;
buffered_frame_count = scount;
int s1 = scount - pos; int s1 = scount - pos;
if(s1 > sample_count) if(s1 > sample_count)
s1 = sample_count; s1 = sample_count;
@ -385,6 +386,7 @@ void mas3507d_device::append_buffer(stream_sample_t **outputs, int &pos, int sco
if(s1 == sample_count) { if(s1 == sample_count) {
pos += s1; pos += s1;
sample_count = 0; sample_count = 0;
total_frame_count += s1;
return; return;
} }
@ -395,6 +397,7 @@ void mas3507d_device::append_buffer(stream_sample_t **outputs, int &pos, int sco
pos += s1; pos += s1;
sample_count -= s1; sample_count -= s1;
total_frame_count += s1;
} }
void mas3507d_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int csamples) void mas3507d_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int csamples)
@ -414,6 +417,7 @@ void mas3507d_device::sound_stream_update(sound_stream &stream, stream_sample_t
mp3_count = 0; mp3_count = 0;
sample_count = 0; sample_count = 0;
total_frame_count = 0; total_frame_count = 0;
buffered_frame_count = 0;
for(int i=pos; i != csamples; i++) { for(int i=pos; i != csamples; i++) {
outputs[0][i] = 0; outputs[0][i] = 0;

4
src/devices/sound/mas3507d.h
View File

@ -22,7 +22,7 @@ public:
void i2c_scl_w(bool line); void i2c_scl_w(bool line);
void i2c_sda_w(bool line); void i2c_sda_w(bool line);
u32 get_frame_count() const { return total_frame_count; } u32 get_frame_count() const { return total_frame_count - buffered_frame_count; }
protected: protected:
virtual void device_start() override; virtual void device_start() override;
@ -41,7 +41,7 @@ private:
int i2c_bus_curbit; int i2c_bus_curbit;
uint8_t i2c_bus_curval; uint8_t i2c_bus_curval;
int mp3_count, sample_count, current_rate; int mp3_count, sample_count, current_rate;
u32 total_frame_count; u32 total_frame_count, buffered_frame_count;
mp3dec_t mp3_dec; mp3dec_t mp3_dec;
mp3dec_frame_info_t mp3_info; mp3dec_frame_info_t mp3_info;