fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audio/replay: fix type punning

Browse source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Marc-André Lureau 2025-10-14 14:43:36 +04:00
parent d2b15ae407
commit 04536d7045
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
audio/audio.h
View file

@ -171,9 +171,11 @@ int wav_start_capture(AudioState *state, CaptureState *s, const char *path,
void audio_cleanup(void); void audio_cleanup(void);
void audio_sample_to_uint64(const void *samples, int pos, typedef struct st_sample st_sample;
void audio_sample_to_uint64(const st_sample *sample, int pos,
uint64_t *left, uint64_t *right); uint64_t *left, uint64_t *right);
void audio_sample_from_uint64(void *samples, int pos, void audio_sample_from_uint64(st_sample *sample, int pos,
uint64_t left, uint64_t right); uint64_t left, uint64_t right);
void audio_add_audiodev(Audiodev *audio); void audio_add_audiodev(Audiodev *audio);

6
audio/mixeng.c
View file

@ -404,7 +404,7 @@ f_sample *mixeng_clip_float[2][2] = {
} }
}; };
void audio_sample_to_uint64(const void *samples, int pos, void audio_sample_to_uint64(const st_sample *sample, int pos,
uint64_t *left, uint64_t *right) uint64_t *left, uint64_t *right)
{ {
#ifdef FLOAT_MIXENG #ifdef FLOAT_MIXENG
@ -412,14 +412,13 @@ void audio_sample_to_uint64(const void *samples, int pos,
"Coreaudio and floating point samples are not supported by replay yet"); "Coreaudio and floating point samples are not supported by replay yet");
abort(); abort();
#else #else
const struct st_sample *sample = samples;
sample += pos; sample += pos;
*left = sample->l; *left = sample->l;
*right = sample->r; *right = sample->r;
#endif #endif
} }
void audio_sample_from_uint64(void *samples, int pos, void audio_sample_from_uint64(st_sample *sample, int pos,
uint64_t left, uint64_t right) uint64_t left, uint64_t right)
{ {
#ifdef FLOAT_MIXENG #ifdef FLOAT_MIXENG
@ -427,7 +426,6 @@ void audio_sample_from_uint64(void *samples, int pos,
"Coreaudio and floating point samples are not supported by replay yet"); "Coreaudio and floating point samples are not supported by replay yet");
abort(); abort();
#else #else
struct st_sample *sample = samples;
sample += pos; sample += pos;
sample->l = left; sample->l = left;
sample->r = right; sample->r = right;

1
audio/mixeng.h
View file

@ -33,7 +33,6 @@ struct st_sample { mixeng_real l; mixeng_real r; };
struct mixeng_volume { int mute; int64_t r; int64_t l; }; struct mixeng_volume { int mute; int64_t r; int64_t l; };
struct st_sample { int64_t l; int64_t r; }; struct st_sample { int64_t l; int64_t r; };
#endif #endif
typedef struct st_sample st_sample;
typedef void (t_sample) (struct st_sample *dst, const void *src, int samples); typedef void (t_sample) (struct st_sample *dst, const void *src, int samples);
typedef void (f_sample) (void *dst, const struct st_sample *src, int samples); typedef void (f_sample) (void *dst, const struct st_sample *src, int samples);

3
include/system/replay.h
View file

@ -16,6 +16,7 @@
#include "qapi/qapi-types-run-state.h" #include "qapi/qapi-types-run-state.h"
#include "qapi/qapi-types-ui.h" #include "qapi/qapi-types-ui.h"
#include "block/aio.h" #include "block/aio.h"
#include "audio/audio.h"
/* replay clock kinds */ /* replay clock kinds */
enum ReplayClockKind { enum ReplayClockKind {
@ -165,7 +166,7 @@ void replay_net_packet_event(ReplayNetState *rns, unsigned flags,
/*! Saves/restores number of played samples of audio out operation. */ /*! Saves/restores number of played samples of audio out operation. */
void replay_audio_out(size_t *played); void replay_audio_out(size_t *played);
/*! Saves/restores recorded samples of audio in operation. */ /*! Saves/restores recorded samples of audio in operation. */
void replay_audio_in(size_t *recorded, void *samples, size_t *wpos, size_t size); void replay_audio_in(size_t *recorded, st_sample *samples, size_t *wpos, size_t size);
/* VM state operations */ /* VM state operations */

2
replay/replay-audio.c
View file

@ -35,7 +35,7 @@ void replay_audio_out(size_t *played)
} }
} }
void replay_audio_in(size_t *recorded, void *samples, size_t *wpos, size_t size) void replay_audio_in(size_t *recorded, st_sample *samples, size_t *wpos, size_t size)
{ {
int pos; int pos;
uint64_t left, right; uint64_t left, right;

2
replay/stubs-system.c
View file

@ -15,7 +15,7 @@ void replay_input_sync_event(void)
void replay_add_blocker(const char *feature) void replay_add_blocker(const char *feature)
{ {
} }
void replay_audio_in(size_t *recorded, void *samples, size_t *wpos, size_t size) void replay_audio_in(size_t *recorded, st_sample *samples, size_t *wpos, size_t size)
{ {
} }
void replay_audio_out(size_t *played) void replay_audio_out(size_t *played)