[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/30] audio: split pcm_ops function get_buffer_in
From: |
Gerd Hoffmann |
Subject: |
[PULL 08/30] audio: split pcm_ops function get_buffer_in |
Date: |
Fri, 15 Jan 2021 14:21:24 +0100 |
From: Volker RĂ¼melin <vr_qemu@t-online.de>
Split off pcm_ops function run_buffer_in from get_buffer_in and
call run_buffer_in before get_buffer_in.
The next patch only needs the generic buffer management part
from audio_generic_get_buffer_in().
Signed-off-by: Volker RĂ¼melin <vr_qemu@t-online.de>
Message-id: 9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de
Message-Id: <20210110100239.27588-8-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
audio/audio_int.h | 2 ++
audio/alsaaudio.c | 1 +
audio/audio.c | 18 ++++++++++++++----
audio/jackaudio.c | 1 +
audio/noaudio.c | 1 +
audio/ossaudio.c | 1 +
audio/spiceaudio.c | 1 +
7 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 4775857bf245..06f0913835b0 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -172,12 +172,14 @@ struct audio_pcm_ops {
int (*init_in) (HWVoiceIn *hw, audsettings *as, void *drv_opaque);
void (*fini_in) (HWVoiceIn *hw);
size_t (*read) (HWVoiceIn *hw, void *buf, size_t size);
+ void (*run_buffer_in)(HWVoiceIn *hw);
void *(*get_buffer_in)(HWVoiceIn *hw, size_t *size);
void (*put_buffer_in)(HWVoiceIn *hw, void *buf, size_t size);
void (*enable_in)(HWVoiceIn *hw, bool enable);
void (*volume_in)(HWVoiceIn *hw, Volume *vol);
};
+void audio_generic_run_buffer_in(HWVoiceIn *hw);
void *audio_generic_get_buffer_in(HWVoiceIn *hw, size_t *size);
void audio_generic_put_buffer_in(HWVoiceIn *hw, void *buf, size_t size);
void audio_generic_run_buffer_out(HWVoiceOut *hw);
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 6787e91bc198..5a871aaf6b48 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -929,6 +929,7 @@ static struct audio_pcm_ops alsa_pcm_ops = {
.init_in = alsa_init_in,
.fini_in = alsa_fini_in,
.read = alsa_read,
+ .run_buffer_in = audio_generic_run_buffer_in,
.enable_in = alsa_enable_in,
};
diff --git a/audio/audio.c b/audio/audio.c
index d048d262835e..480b3cce1ffb 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1241,6 +1241,10 @@ static size_t audio_pcm_hw_run_in(HWVoiceIn *hw, size_t
samples)
size_t conv = 0;
STSampleBuffer *conv_buf = hw->conv_buf;
+ if (hw->pcm_ops->run_buffer_in) {
+ hw->pcm_ops->run_buffer_in(hw);
+ }
+
while (samples) {
size_t proc;
size_t size = samples * hw->info.bytes_per_frame;
@@ -1381,10 +1385,8 @@ void audio_run(AudioState *s, const char *msg)
#endif
}
-void *audio_generic_get_buffer_in(HWVoiceIn *hw, size_t *size)
+void audio_generic_run_buffer_in(HWVoiceIn *hw)
{
- ssize_t start;
-
if (unlikely(!hw->buf_emul)) {
size_t calc_size = hw->conv_buf->size * hw->info.bytes_per_frame;
hw->buf_emul = g_malloc(calc_size);
@@ -1403,8 +1405,12 @@ void *audio_generic_get_buffer_in(HWVoiceIn *hw, size_t
*size)
break;
}
}
+}
+
+void *audio_generic_get_buffer_in(HWVoiceIn *hw, size_t *size)
+{
+ ssize_t start = (ssize_t)hw->pos_emul - hw->pending_emul;
- start = ((ssize_t) hw->pos_emul) - hw->pending_emul;
if (start < 0) {
start += hw->size_emul;
}
@@ -1505,6 +1511,10 @@ size_t audio_generic_read(HWVoiceIn *hw, void *buf,
size_t size)
{
size_t total = 0;
+ if (hw->pcm_ops->run_buffer_in) {
+ hw->pcm_ops->run_buffer_in(hw);
+ }
+
while (total < size) {
size_t src_size = size - total;
void *src = hw->pcm_ops->get_buffer_in(hw, &src_size);
diff --git a/audio/jackaudio.c b/audio/jackaudio.c
index 3b7c18443dbe..f8afb5cc318c 100644
--- a/audio/jackaudio.c
+++ b/audio/jackaudio.c
@@ -657,6 +657,7 @@ static struct audio_pcm_ops jack_pcm_ops = {
.init_in = qjack_init_in,
.fini_in = qjack_fini_in,
.read = qjack_read,
+ .run_buffer_in = audio_generic_run_buffer_in,
.enable_in = qjack_enable_in
};
diff --git a/audio/noaudio.c b/audio/noaudio.c
index 05798ea21032..aac87dbc93fb 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -124,6 +124,7 @@ static struct audio_pcm_ops no_pcm_ops = {
.init_in = no_init_in,
.fini_in = no_fini_in,
.read = no_read,
+ .run_buffer_in = audio_generic_run_buffer_in,
.enable_in = no_enable_in
};
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index a7dcaa31adeb..c1db89f23300 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -762,6 +762,7 @@ static struct audio_pcm_ops oss_pcm_ops = {
.init_in = oss_init_in,
.fini_in = oss_fini_in,
.read = oss_read,
+ .run_buffer_in = audio_generic_run_buffer_in,
.enable_in = oss_enable_in
};
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 8967cca12925..999bfbde47c5 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -293,6 +293,7 @@ static struct audio_pcm_ops audio_callbacks = {
.init_in = line_in_init,
.fini_in = line_in_fini,
.read = line_in_read,
+ .run_buffer_in = audio_generic_run_buffer_in,
.enable_in = line_in_enable,
#if ((SPICE_INTERFACE_RECORD_MAJOR >= 2) && (SPICE_INTERFACE_RECORD_MINOR >=
2))
.volume_in = line_in_volume,
--
2.29.2
- [PULL 00/30] Audio 20210115 patches, Gerd Hoffmann, 2021/01/15
- [PULL 02/30] audio: fix bit-rotted code, Gerd Hoffmann, 2021/01/15
- [PULL 01/30] sdlaudio: remove leftover SDL1.2 code, Gerd Hoffmann, 2021/01/15
- [PULL 10/30] audio: break generic buffer dependency on mixing-engine, Gerd Hoffmann, 2021/01/15
- [PULL 20/30] dsoundaudio: replace GetForegroundWindow(), Gerd Hoffmann, 2021/01/15
- [PULL 11/30] sdlaudio: enable (in|out).mixing-engine=off, Gerd Hoffmann, 2021/01/15
- [PULL 08/30] audio: split pcm_ops function get_buffer_in,
Gerd Hoffmann <=
- [PULL 18/30] paaudio: limit minreq to 75% of audio timer_rate, Gerd Hoffmann, 2021/01/15
- [PULL 03/30] sdlaudio: add -audiodev sdl,out.buffer-count option, Gerd Hoffmann, 2021/01/15
- [PULL 22/30] dsoundaudio: enable f32 audio sample format, Gerd Hoffmann, 2021/01/15
- [PULL 05/30] sdlaudio: always clear the sample buffer, Gerd Hoffmann, 2021/01/15
- [PULL 04/30] sdlaudio: don't start playback in init routine, Gerd Hoffmann, 2021/01/15
- [PULL 12/30] audio: remove remaining unused plive code, Gerd Hoffmann, 2021/01/15
- [PULL 15/30] paaudio: wait until the playback stream is ready, Gerd Hoffmann, 2021/01/15
- [PULL 21/30] dsoundaudio: rename dsound_open(), Gerd Hoffmann, 2021/01/15
- [PULL 09/30] sdlaudio: add recording functions, Gerd Hoffmann, 2021/01/15
- [PULL 07/30] sdlaudio: replace legacy functions with modern ones, Gerd Hoffmann, 2021/01/15