Merge pull request #5343 from ericvids/k573latency

k573dio: timing fixes
This commit is contained in:
R. Belmont 2019-07-14 17:29:50 -04:00 committed by GitHub
commit 5ed21f87ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions

View File

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

View File

@ -22,7 +22,7 @@ public:
void i2c_scl_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:
virtual void device_start() override;
@ -41,7 +41,7 @@ private:
int i2c_bus_curbit;
uint8_t i2c_bus_curval;
int mp3_count, sample_count, current_rate;
u32 total_frame_count;
u32 total_frame_count, buffered_frame_count;
mp3dec_t mp3_dec;
mp3dec_frame_info_t mp3_info;