Skip to content

Commit

Permalink
audio: align audio_generic_read with audio_pcm_hw_run_in
Browse files Browse the repository at this point in the history
The function audio_generic_read should work exactly like
audio_pcm_hw_run_in. It's a very similar function working
on a different buffer.

Signed-off-by: Volker Rümelin <[email protected]>
Message-id: [email protected]
Signed-off-by: Gerd Hoffmann <[email protected]>
  • Loading branch information
Volker Rümelin authored and kraxel committed Sep 23, 2020
1 parent aec6d0d commit b9896dc
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions audio/audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1495,12 +1495,23 @@ size_t audio_generic_write(HWVoiceOut *hw, void *buf, size_t size)

size_t audio_generic_read(HWVoiceIn *hw, void *buf, size_t size)
{
void *src = hw->pcm_ops->get_buffer_in(hw, &size);
size_t total = 0;

memcpy(buf, src, size);
hw->pcm_ops->put_buffer_in(hw, src, size);
while (total < size) {
size_t src_size = size - total;
void *src = hw->pcm_ops->get_buffer_in(hw, &src_size);

return size;
if (src_size == 0) {
hw->pcm_ops->put_buffer_in(hw, src, src_size);
break;
}

memcpy((char *)buf + total, src, src_size);
hw->pcm_ops->put_buffer_in(hw, src, src_size);
total += src_size;
}

return total;
}

static int audio_driver_init(AudioState *s, struct audio_driver *drv,
Expand Down

0 comments on commit b9896dc

Please sign in to comment.