[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 37/51] audio: remove remains of the old backend api
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH 37/51] audio: remove remains of the old backend api |
Date: |
Thu, 14 Jan 2016 14:45:50 +0100 |
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
audio/audio.c | 42 ++++++------------------------------------
audio/audio_int.h | 7 -------
2 files changed, 6 insertions(+), 43 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index 0823170..f7d8d30 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -512,7 +512,7 @@ static size_t audio_pcm_hw_find_min_in (HWVoiceIn *hw)
return m;
}
-size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw)
+static size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw)
{
size_t live = hw->total_samples_captured - audio_pcm_hw_find_min_in (hw);
if (audio_bug(AUDIO_FUNC, live > hw->samples)) {
@@ -522,29 +522,7 @@ size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw)
return live;
}
-size_t audio_pcm_hw_clip_out(HWVoiceOut *hw, void *pcm_buf,
- size_t live, size_t pending)
-{
- size_t left = hw->samples - pending;
- size_t len = MIN (left, live);
- size_t clipped = 0;
-
- while (len) {
- struct st_sample *src = hw->mix_buf + hw->rpos;
- uint8_t *dst = advance (pcm_buf, hw->rpos << hw->info.shift);
- size_t samples_till_end_of_buf = hw->samples - hw->rpos;
- size_t samples_to_clip = MIN (len, samples_till_end_of_buf);
-
- hw->clip (dst, src, samples_to_clip);
-
- hw->rpos = (hw->rpos + samples_to_clip) % hw->samples;
- len -= samples_to_clip;
- clipped += samples_to_clip;
- }
- return clipped;
-}
-
-static void audio_pcm_hw_clip_out2(HWVoiceOut *hw, void *pcm_buf, size_t len)
+static void audio_pcm_hw_clip_out(HWVoiceOut *hw, void *pcm_buf, size_t len)
{
size_t clipped = 0;
size_t pos = hw->rpos;
@@ -1033,7 +1011,7 @@ static size_t audio_pcm_hw_run_out(HWVoiceOut *hw, size_t
live)
void *buf = hw->pcm_ops->get_buffer_out(hw, &size);
decr = MIN(size >> hw->info.shift, live);
- audio_pcm_hw_clip_out2(hw, buf, decr);
+ audio_pcm_hw_clip_out(hw, buf, decr);
proc = hw->pcm_ops->put_buffer_out(hw, buf, decr << hw->info.shift) >>
hw->info.shift;
@@ -1096,11 +1074,7 @@ static void audio_run_out (AudioState *s)
}
prev_rpos = hw->rpos;
- if (hw->pcm_ops->run_out) {
- played = hw->pcm_ops->run_out(hw, live);
- } else {
- played = audio_pcm_hw_run_out(hw, live);
- }
+ played = audio_pcm_hw_run_out(hw, live);
if (audio_bug(AUDIO_FUNC, hw->rpos >= hw->samples)) {
dolog("rpos=%zu samples=%zu played=%zu\n",
hw->rpos, hw->samples, played);
@@ -1195,12 +1169,8 @@ static void audio_run_in (AudioState *s)
SWVoiceIn *sw;
size_t captured, min;
- if (hw->pcm_ops->run_in) {
- captured = hw->pcm_ops->run_in(hw);
- } else {
- captured = audio_pcm_hw_run_in(
- hw, hw->samples - audio_pcm_hw_get_live_in(hw));
- }
+ captured = audio_pcm_hw_run_in(
+ hw, hw->samples - audio_pcm_hw_get_live_in(hw));
min = audio_pcm_hw_find_min_in (hw);
hw->total_samples_captured += captured - min;
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 469fe5e..487867c 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -149,7 +149,6 @@ struct audio_driver {
struct audio_pcm_ops {
int (*init_out)(HWVoiceOut *hw, audsettings *as, void *drv_opaque);
void (*fini_out)(HWVoiceOut *hw);
- int (*run_out) (HWVoiceOut *hw, int live);
size_t (*write) (HWVoiceOut *hw, void *buf, size_t size);
/* get a buffer that after later can be passed to put_buffer_out; optional
* returns the buffer, and writes it's size to size (in bytes)
@@ -163,7 +162,6 @@ struct audio_pcm_ops {
int (*init_in) (HWVoiceIn *hw, audsettings *as, void *drv_opaque);
void (*fini_in) (HWVoiceIn *hw);
- int (*run_in) (HWVoiceIn *hw);
size_t (*read) (HWVoiceIn *hw, void *buf, size_t size);
void *(*get_buffer_in)(HWVoiceIn *hw, size_t *size);
void (*put_buffer_in)(HWVoiceIn *hw, void *buf, size_t size);
@@ -232,11 +230,6 @@ extern struct audio_driver *drvtab[];
void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as);
void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int
len);
-size_t audio_pcm_hw_get_live_in(HWVoiceIn *hw);
-
-size_t audio_pcm_hw_clip_out(HWVoiceOut *hw, void *pcm_buf,
- size_t live, size_t pending);
-
int audio_bug (const char *funcname, int cond);
void *audio_calloc (const char *funcname, int nmemb, size_t size);
--
2.7.0
- [Qemu-devel] [PATCH 26/51] audio: remove read and write pcm_ops, (continued)
- [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
- [Qemu-devel] [PATCH 37/51] audio: remove remains of the old backend api,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH 20/51] audio: audiodev= parameters no longer optional when -audiodev present, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 32/51] ossaudio: port to the new audio backend api, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 42/51] audio: add mixeng option (documentation), Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 43/51] audio: make mixeng optional, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 47/51] audio: basic support for multichannel audio, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 39/51] audio: remove hw->samples, buffer_size_in/out pcm_ops, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 41/51] audio: split ctl_* functions into enable_* and volume_*, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 49/51] usb-audio: do not count on avail bytes actually available, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 40/51] audio: common rate control code for timer based outputs, Kővágó, Zoltán, 2016/01/14
- [Qemu-devel] [PATCH 51/51] usbaudio: change playback counters to 64 bit, Kővágó, Zoltán, 2016/01/14