[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 05/24] noaudio: port to the new audio backend api
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH v3 05/24] noaudio: port to the new audio backend api |
Date: |
Sun, 15 Sep 2019 21:23:21 +0200 |
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/noaudio.c | 43 +++++++++++++++++--------------------------
1 file changed, 17 insertions(+), 26 deletions(-)
diff --git a/audio/noaudio.c b/audio/noaudio.c
index 0fb2629cf2..b054fd225b 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -41,10 +41,9 @@ typedef struct NoVoiceIn {
int64_t old_ticks;
} NoVoiceIn;
-static size_t no_run_out(HWVoiceOut *hw, size_t live)
+static size_t no_write(HWVoiceOut *hw, void *buf, size_t len)
{
NoVoiceOut *no = (NoVoiceOut *) hw;
- size_t decr, samples;
int64_t now;
int64_t ticks;
int64_t bytes;
@@ -52,13 +51,9 @@ static size_t no_run_out(HWVoiceOut *hw, size_t live)
now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
ticks = now - no->old_ticks;
bytes = muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);
- bytes = MIN(bytes, SIZE_MAX);
- samples = bytes >> hw->info.shift;
no->old_ticks = now;
- decr = MIN (live, samples);
- hw->rpos = (hw->rpos + decr) % hw->samples;
- return decr;
+ return MIN(len, bytes);
}
static int no_init_out(HWVoiceOut *hw, struct audsettings *as, void
*drv_opaque)
@@ -92,25 +87,21 @@ static void no_fini_in (HWVoiceIn *hw)
(void) hw;
}
-static size_t no_run_in(HWVoiceIn *hw)
+static size_t no_read(HWVoiceIn *hw, void *buf, size_t size)
{
+ size_t to_clear;
NoVoiceIn *no = (NoVoiceIn *) hw;
- size_t live = audio_pcm_hw_get_live_in(hw);
- size_t dead = hw->samples - live;
- size_t samples = 0;
-
- if (dead) {
- int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
- int64_t ticks = now - no->old_ticks;
- int64_t bytes =
- muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);
-
- no->old_ticks = now;
- bytes = MIN (bytes, SIZE_MAX);
- samples = bytes >> hw->info.shift;
- samples = MIN (samples, dead);
- }
- return samples;
+
+ int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+ int64_t ticks = now - no->old_ticks;
+ int64_t bytes =
+ muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);
+
+ no->old_ticks = now;
+ to_clear = MIN(bytes, size);
+
+ audio_pcm_info_clear_buf(&hw->info, buf, to_clear >> hw->info.shift);
+ return to_clear;
}
static int no_ctl_in (HWVoiceIn *hw, int cmd, ...)
@@ -133,12 +124,12 @@ static void no_audio_fini (void *opaque)
static struct audio_pcm_ops no_pcm_ops = {
.init_out = no_init_out,
.fini_out = no_fini_out,
- .run_out = no_run_out,
+ .write = no_write,
.ctl_out = no_ctl_out,
.init_in = no_init_in,
.fini_in = no_fini_in,
- .run_in = no_run_in,
+ .read = no_read,
.ctl_in = no_ctl_in
};
--
2.23.0
- [Qemu-devel] [PATCH v3 00/24] Audio: Mixeng-free 5.1/7.1 audio support, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 01/24] audio: api for mixeng code free backends, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 02/24] alsaaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 03/24] coreaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 05/24] noaudio: port to the new audio backend api,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH v3 04/24] dsoundaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 06/24] ossaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 08/24] sdlaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 10/24] wavaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 07/24] paaudio: port to the new audio backend api, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 11/24] audio: remove remains of the old backend api, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 12/24] audio: unify input and output mixeng buffer management, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 13/24] audio: common rate control code for timer based outputs, Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 15/24] audio: add mixeng option (documentation), Kővágó, Zoltán, 2019/09/15
- [Qemu-devel] [PATCH v3 16/24] audio: make mixeng optional, Kővágó, Zoltán, 2019/09/15