Hi
On Thu, Jul 20, 2023 at 4:59 PM Emmanouil Pitsidianakis <
manos.pitsidiana...@linaro.org> wrote:
> After setting PCM parameters, instantiate ("prepare") each stream in
> virtio_snd_pcm_prepare_impl().
>
> Signed-off-by: Emmanouil Pitsidianakis <manos.pitsidiana...@linaro.org>
> ---
> hw/virtio/virtio-snd.c | 133 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 133 insertions(+)
>
> diff --git a/hw/virtio/virtio-snd.c b/hw/virtio/virtio-snd.c
> index 62d9bf557c..ca09c937c7 100644
> --- a/hw/virtio/virtio-snd.c
> +++ b/hw/virtio/virtio-snd.c
> @@ -200,6 +200,132 @@ uint32_t virtio_snd_pcm_set_params_impl(VirtIOSound
> *s,
> return VIRTIO_SND_S_OK;
> }
>
> +/*
> + * Get a QEMU Audiosystem compatible format value from a
> VIRTIO_SND_PCM_FMT_*
> + */
> +static AudioFormat virtio_snd_get_qemu_format(uint32_t format)
> +{
> + #define CASE(FMT) \
> + case VIRTIO_SND_PCM_FMT_##FMT: \
> + return AUDIO_FORMAT_##FMT;
> +
> + switch (format) {
> + CASE(U8)
> + CASE(S8)
> + CASE(U16)
> + CASE(S16)
> + CASE(U32)
> + CASE(S32)
> + case VIRTIO_SND_PCM_FMT_FLOAT:
> + return AUDIO_FORMAT_F32;
> + default:
> + g_assert_not_reached();
> + }
> +
> + #undef CASE
> +}
> +
> +/*
> + * Get a QEMU Audiosystem compatible frequency value from a
> + * VIRTIO_SND_PCM_RATE_*
> + */
> +static uint32_t virtio_snd_get_qemu_freq(uint32_t rate)
> +{
> + #define CASE(RATE) \
> + case VIRTIO_SND_PCM_RATE_##RATE: \
> + return RATE;
> +
> + switch (rate) {
> + CASE(5512)
> + CASE(8000)
> + CASE(11025)
> + CASE(16000)
> + CASE(22050)
> + CASE(32000)
> + CASE(44100)
> + CASE(48000)
> + CASE(64000)
> + CASE(88200)
> + CASE(96000)
> + CASE(176400)
> + CASE(192000)
> + CASE(384000)
> + default:
> + g_assert_not_reached();
> + }
> +
> + #undef CASE
> +}
> +
> +/*
> + * Get QEMU Audiosystem compatible audsettings from virtio based pcm
> stream
> + * params.
> + */
> +static void virtio_snd_get_qemu_audsettings(audsettings *as,
> + VirtIOSoundPCMParams *params)
> +{
> + as->nchannels = MIN(AUDIO_MAX_CHANNELS, params->channels);
> + as->fmt = virtio_snd_get_qemu_format(params->format);
> + as->freq = virtio_snd_get_qemu_freq(params->rate);
> + as->endianness = AUDIO_HOST_ENDIANNESS;
> +}
> +
> +/*
> + * Prepares a VirtIOSound card stream.
> + * Returns the response status code. (VIRTIO_SND_S_*).
> + *
> + * @s: VirtIOSound device
> + * @stream_id: stream id
> + */
> +static uint32_t virtio_snd_pcm_prepare_impl(VirtIOSound *s, uint32_t
> stream_id)
> +{
> + audsettings as;
> + VirtIOSoundPCMParams *params;
> + VirtIOSoundPCMStream *stream;
> +
> + if (!s->pcm->streams ||
> + !s->pcm->pcm_params ||
> + !s->pcm->pcm_params[stream_id]) {
> + return VIRTIO_SND_S_BAD_MSG;
> + }
> +
> + params = virtio_snd_pcm_get_params(s, stream_id);
> + if (!params) {
> + return VIRTIO_SND_S_BAD_MSG;
> + }
> +
> + virtio_snd_get_qemu_audsettings(&as, params);
> +
> + stream = g_new0(VirtIOSoundPCMStream, 1);
> +
> + stream->id = stream_id;
> + stream->pcm = s->pcm;
> + stream->direction = stream_id < s->snd_conf.streams / 2 +
> + (s->snd_conf.streams & 1) ? VIRTIO_SND_D_OUTPUT :
> VIRTIO_SND_D_INPUT;
> + stream->info.hdr.hda_fn_nid = VIRTIO_SOUND_HDA_FN_NID;
> + stream->features = 0;
> + stream->channels_min = 1;
> + stream->channels_max = as.nchannels;
> + stream->formats = supported_formats;
> + stream->rates = supported_rates;
> + stream->s = s;
> +
> + stream->buffer_bytes = params->buffer_bytes;
> + stream->period_bytes = params->period_bytes;
> +
> + stream->positions[0] = VIRTIO_SND_CHMAP_FL;
> + stream->positions[1] = VIRTIO_SND_CHMAP_FR;
> +
> + stream->as = as;
> + stream->desired_as = stream->as;
> + qemu_mutex_init(&stream->queue_mutex);
> + QSIMPLEQ_INIT(&stream->queue);
> +
> + s->pcm->streams[stream_id] = stream;
>
Shouldn't it close & free the existing stream? Or return an error?
> +
> + return VIRTIO_SND_S_OK;
> +}
> +
> /*
> * The actual processing done in virtio_snd_process_cmdq().
> *
> @@ -432,6 +558,13 @@ static void virtio_snd_common_realize(DeviceState
> *dev,
> print_code(status));
> return;
> }
> + status = virtio_snd_pcm_prepare_impl(vsnd, i);
> + if (status != VIRTIO_SND_S_OK) {
> + error_setg(errp,
> + "Can't prepare streams, device responded with %s.",
> + print_code(status));
> + return;
> + }
> }
> }
>
> --
> 2.39.2
>
>
>
--
Marc-André Lureau
