From: "Kővágó, Zoltán" <dirty.ice.hu@gmail.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH v2 05/24] noaudio: port to the new audio backend api
Date: Sun, 8 Sep 2019 23:22:05 +0200 [thread overview]
Message-ID: <5f8b1296074b596be487c6fbd04699650a5b094f.1567965065.git.DirtY.iCE.hu@gmail.com> (raw)
In-Reply-To: <cover.1567965065.git.DirtY.iCE.hu@gmail.com>
Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
---
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
next prev parent reply other threads:[~2019-09-08 21:25 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-08 21:22 [Qemu-devel] [PATCH v2 00/24] Audio: Mixeng-free 5.1/7.1 audio support Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 01/24] audio: api for mixeng code free backends Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 02/24] alsaaudio: port to the new audio backend api Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 03/24] coreaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 04/24] dsoundaudio: " Kővágó, Zoltán
2019-09-11 7:00 ` Gerd Hoffmann
2019-09-08 21:22 ` Kővágó, Zoltán [this message]
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 06/24] ossaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 07/24] paaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 08/24] sdlaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 10/24] wavaudio: " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 11/24] audio: remove remains of the old " Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 12/24] audio: unify input and output mixeng buffer management Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 13/24] audio: common rate control code for timer based outputs Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 14/24] audio: split ctl_* functions into enable_* and volume_* Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 15/24] audio: add mixeng option (documentation) Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 16/24] audio: make mixeng optional Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 18/24] audio: support more than two channels in volume setting Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 19/24] audio: replace shift in audio_pcm_info with bytes_per_frame Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 20/24] audio: basic support for multichannel audio Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 21/24] paaudio: channel-map option Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 22/24] usb-audio: do not count on avail bytes actually available Kővágó, Zoltán
2019-09-08 21:22 ` [Qemu-devel] [PATCH v2 24/24] usbaudio: change playback counters to 64 bit Kővágó, Zoltán
2019-09-12 10:20 ` [Qemu-devel] [PATCH v2 00/24] Audio: Mixeng-free 5.1/7.1 audio support Gerd Hoffmann
2019-09-15 1:08 ` Zoltán Kővágó
2019-09-17 11:38 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5f8b1296074b596be487c6fbd04699650a5b094f.1567965065.git.DirtY.iCE.hu@gmail.com \
--to=dirty.ice.hu@gmail.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).