diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio.c | 9 | ||||
| -rw-r--r-- | audio/audio.h | 5 | ||||
| -rw-r--r-- | audio/mixeng.c | 32 |
3 files changed, 44 insertions, 2 deletions
diff --git a/audio/audio.c b/audio/audio.c index c845a44f0a..21f7b0b0e6 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -28,6 +28,7 @@ #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "qemu/cutils.h" +#include "sysemu/replay.h" #define AUDIO_CAP "audio" #include "audio_int.h" @@ -1387,6 +1388,7 @@ static void audio_run_out (AudioState *s) prev_rpos = hw->rpos; played = hw->pcm_ops->run_out (hw, live); + replay_audio_out(&played); if (audio_bug (AUDIO_FUNC, hw->rpos >= hw->samples)) { dolog ("hw->rpos=%d hw->samples=%d played=%d\n", hw->rpos, hw->samples, played); @@ -1450,9 +1452,12 @@ static void audio_run_in (AudioState *s) while ((hw = audio_pcm_hw_find_any_enabled_in (hw))) { SWVoiceIn *sw; - int captured, min; + int captured = 0, min; - captured = hw->pcm_ops->run_in (hw); + if (replay_mode != REPLAY_MODE_PLAY) { + captured = hw->pcm_ops->run_in(hw); + } + replay_audio_in(&captured, hw->conv_buf, &hw->wpos, hw->samples); min = audio_pcm_hw_find_min_in (hw); hw->total_samples_captured += captured - min; diff --git a/audio/audio.h b/audio/audio.h index c3c51988f5..f4339a185e 100644 --- a/audio/audio.h +++ b/audio/audio.h @@ -166,4 +166,9 @@ int wav_start_capture (CaptureState *s, const char *path, int freq, bool audio_is_cleaning_up(void); void audio_cleanup(void); +void audio_sample_to_uint64(void *samples, int pos, + uint64_t *left, uint64_t *right); +void audio_sample_from_uint64(void *samples, int pos, + uint64_t left, uint64_t right); + #endif /* QEMU_AUDIO_H */ diff --git a/audio/mixeng.c b/audio/mixeng.c index 66c0328d42..0bf9b5360f 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/bswap.h" +#include "qemu/error-report.h" #include "audio.h" #define AUDIO_CAP "mixeng" @@ -267,6 +268,37 @@ f_sample *mixeng_clip[2][2][2][3] = { } }; + +void audio_sample_to_uint64(void *samples, int pos, + uint64_t *left, uint64_t *right) +{ + struct st_sample *sample = samples; + sample += pos; +#ifdef FLOAT_MIXENG + error_report( + "Coreaudio and floating point samples are not supported by replay yet"); + abort(); +#else + *left = sample->l; + *right = sample->r; +#endif +} + +void audio_sample_from_uint64(void *samples, int pos, + uint64_t left, uint64_t right) +{ + struct st_sample *sample = samples; + sample += pos; +#ifdef FLOAT_MIXENG + error_report( + "Coreaudio and floating point samples are not supported by replay yet"); + abort(); +#else + sample->l = left; + sample->r = right; +#endif +} + /* * August 21, 1998 * Copyright 1998 Fabrice Bellard. |