On Wed, Oct 22, 2025 at 11:54 AM Philippe Mathieu-Daudé <philmd@linaro.org>
wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> audio/ossaudio.c | 12 ++----------
> audio/sdlaudio.c | 12 ++----------
> 2 files changed, 4 insertions(+), 20 deletions(-)
>
> diff --git a/audio/ossaudio.c b/audio/ossaudio.c
> index ab8791bece9..86c4805675e 100644
> --- a/audio/ossaudio.c
> +++ b/audio/ossaudio.c
> @@ -493,10 +493,8 @@ static int oss_init_out(HWVoiceOut *hw, struct
> audsettings *as,
> {
> OSSVoiceOut *oss = (OSSVoiceOut *) hw;
> struct oss_params req, obt;
> - int endianness;
> int err;
> int fd;
> - AudioFormat effective_fmt;
> struct audsettings obt_as;
> Audiodev *dev = drv_opaque;
> AudiodevOssOptions *oopts = &dev->u.oss;
> @@ -511,7 +509,7 @@ static int oss_init_out(HWVoiceOut *hw, struct
> audsettings *as,
> return -1;
> }
>
> - err = oss_to_audfmt (obt.fmt, &effective_fmt, &endianness);
> + err = oss_to_audfmt(obt.fmt, &obt_as.fmt, &obt_as.endianness);
> if (err) {
> oss_anal_close (&fd);
> return -1;
> @@ -519,8 +517,6 @@ static int oss_init_out(HWVoiceOut *hw, struct
> audsettings *as,
>
> obt_as.freq = obt.freq;
> obt_as.nchannels = obt.nchannels;
> - obt_as.fmt = effective_fmt;
> - obt_as.endianness = endianness;
>
> audio_pcm_init_info (&hw->info, &obt_as);
> oss->nfrags = obt.nfrags;
> @@ -628,10 +624,8 @@ static int oss_init_in(HWVoiceIn *hw, struct
> audsettings *as, void *drv_opaque)
> {
> OSSVoiceIn *oss = (OSSVoiceIn *) hw;
> struct oss_params req, obt;
> - int endianness;
> int err;
> int fd;
> - AudioFormat effective_fmt;
> struct audsettings obt_as;
> Audiodev *dev = drv_opaque;
>
> @@ -644,7 +638,7 @@ static int oss_init_in(HWVoiceIn *hw, struct
> audsettings *as, void *drv_opaque)
> return -1;
> }
>
> - err = oss_to_audfmt (obt.fmt, &effective_fmt, &endianness);
> + err = oss_to_audfmt(obt.fmt, &obt_as.fmt, &obt_as.endianness);
> if (err) {
> oss_anal_close (&fd);
> return -1;
> @@ -652,8 +646,6 @@ static int oss_init_in(HWVoiceIn *hw, struct
> audsettings *as, void *drv_opaque)
>
> obt_as.freq = obt.freq;
> obt_as.nchannels = obt.nchannels;
> - obt_as.fmt = effective_fmt;
> - obt_as.endianness = endianness;
>
> audio_pcm_init_info (&hw->info, &obt_as);
> oss->nfrags = obt.nfrags;
> diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
> index a7a9652d29d..707110973ac 100644
> --- a/audio/sdlaudio.c
> +++ b/audio/sdlaudio.c
> @@ -338,9 +338,7 @@ static int sdl_init_out(HWVoiceOut *hw, struct
> audsettings *as,
> {
> SDLVoiceOut *sdl = (SDLVoiceOut *)hw;
> SDL_AudioSpec req, obt;
> - int endianness;
> int err;
> - AudioFormat effective_fmt;
> Audiodev *dev = drv_opaque;
> AudiodevSdlPerDirectionOptions *spdo = dev->u.sdl.out;
> struct audsettings obt_as;
> @@ -360,7 +358,7 @@ static int sdl_init_out(HWVoiceOut *hw, struct
> audsettings *as,
> return -1;
> }
>
> - err = sdl_to_audfmt(obt.format, &effective_fmt, &endianness);
> + err = sdl_to_audfmt(obt.format, &obt_as.fmt, &obt_as.endianness);
> if (err) {
> sdl_close_out(sdl);
> return -1;
> @@ -368,8 +366,6 @@ static int sdl_init_out(HWVoiceOut *hw, struct
> audsettings *as,
>
> obt_as.freq = obt.freq;
> obt_as.nchannels = obt.channels;
> - obt_as.fmt = effective_fmt;
> - obt_as.endianness = endianness;
>
> audio_pcm_init_info (&hw->info, &obt_as);
> hw->samples = (spdo->has_buffer_count ? spdo->buffer_count : 4) *
> @@ -398,9 +394,7 @@ static int sdl_init_in(HWVoiceIn *hw, audsettings *as,
> void *drv_opaque)
> {
> SDLVoiceIn *sdl = (SDLVoiceIn *)hw;
> SDL_AudioSpec req, obt;
> - int endianness;
> int err;
> - AudioFormat effective_fmt;
> Audiodev *dev = drv_opaque;
> AudiodevSdlPerDirectionOptions *spdo = dev->u.sdl.in;
> struct audsettings obt_as;
> @@ -420,7 +414,7 @@ static int sdl_init_in(HWVoiceIn *hw, audsettings *as,
> void *drv_opaque)
> return -1;
> }
>
> - err = sdl_to_audfmt(obt.format, &effective_fmt, &endianness);
> + err = sdl_to_audfmt(obt.format, &obt_as.fmt, &obt_as.endianness);
> if (err) {
> sdl_close_in(sdl);
> return -1;
> @@ -428,8 +422,6 @@ static int sdl_init_in(HWVoiceIn *hw, audsettings *as,
> void *drv_opaque)
>
> obt_as.freq = obt.freq;
> obt_as.nchannels = obt.channels;
> - obt_as.fmt = effective_fmt;
> - obt_as.endianness = endianness;
>
> audio_pcm_init_info(&hw->info, &obt_as);
> hw->samples = (spdo->has_buffer_count ? spdo->buffer_count : 4) *
> --
> 2.51.0
>
>