[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 31/51] noaudio: port to the new audio backend api
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH 31/51] noaudio: port to the new audio backend api |
Date: |
Thu, 14 Jan 2016 14:45:44 +0100 |
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/noaudio.c | 39 +++++++++++++++------------------------
1 file changed, 15 insertions(+), 24 deletions(-)
diff --git a/audio/noaudio.c b/audio/noaudio.c
index 28c72d5..c7e47ae 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -38,10 +38,9 @@ typedef struct NoVoiceIn {
int64_t old_ticks;
} NoVoiceIn;
-static int no_run_out (HWVoiceOut *hw, int live)
+static size_t no_write(HWVoiceOut *hw, void *buf, size_t len)
{
NoVoiceOut *no = (NoVoiceOut *) hw;
- int decr, samples;
int64_t now;
int64_t ticks;
int64_t bytes;
@@ -49,13 +48,9 @@ static int no_run_out (HWVoiceOut *hw, int live)
now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
ticks = now - no->old_ticks;
bytes = muldiv64 (ticks, hw->info.bytes_per_second, get_ticks_per_sec ());
- bytes = MIN (bytes, INT_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)
@@ -89,25 +84,21 @@ static void no_fini_in (HWVoiceIn *hw)
(void) hw;
}
-static int 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;
- int live = audio_pcm_hw_get_live_in (hw);
- int dead = hw->samples - live;
- int 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, get_ticks_per_sec ());
+ 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, get_ticks_per_sec ());
- no->old_ticks = now;
- bytes = MIN (bytes, INT_MAX);
- samples = bytes >> hw->info.shift;
- samples = MIN (samples, dead);
- }
- return samples;
+ 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, ...)
@@ -130,12 +121,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.7.0
- [Qemu-devel] [PATCH 14/51] spiceaudio: port to -audiodev config, (continued)
- [Qemu-devel] [PATCH 14/51] spiceaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 09/51] dsoundaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 12/51] paaudio: port to -audiodev config, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 06/51] audio: -audiodev command line option basic implementation, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 22/51] paaudio: properly disconnect streams in fini_*, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 34/51] sdlaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 21/51] paaudio: do not move stream when sink/source name is specified, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 19/51] audio: add audiodev properties to frontends, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 28/51] audio: api for mixeng code free backends, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 29/51] alsaaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 31/51] noaudio: port to the new audio backend api,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH 26/51] audio: remove read and write pcm_ops, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 27/51] audio: use size_t where makes sense, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 30/51] coreaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 25/51] paaudio: fix playback glitches, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 36/51] wavaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 33/51] paaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 17/51] audio: reduce glob_audio_state usage, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 44/51] paaudio: get/put_buffer functions, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 45/51] audio: support more than two channels in volume setting, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 18/51] audio: basic support for multi backend audio, Kővágó, Zoltán, 2016/01/14