Commit be1092af authored by Volker Rümelin's avatar Volker Rümelin Committed by Gerd Hoffmann
Browse files

audio: fix audio timer rate conversion bug 



Currently the default audio timer frequency is 10000Hz instead of
a period of 10000us. Also the audiodev timer-period property gets
converted like a frequency. Only handling of the legacy
QEMU_AUDIO_TIMER_PERIOD environment variable is correct because
it's actually a frequency.

With this patch the property timer-period is really a timer period
and QEMU_AUDIO_TIMER_PERIOD remains a frequency.

Fixes: 71830221 "-audiodev command line option basic implementation."
Signed-off-by: default avatarVolker Rümelin <vr_qemu@t-online.de>
Reviewed-by: default avatarZoltán Kővágó <DirtY.iCE.hu@gmail.com>
Message-id: 90b95e4f-39ef-2b01-da6a-857ebaee1ec5@t-online.de
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent b396733d

audio/audio.c

+1 −1
Original line number Diff line number Diff line
@@ -1471,7 +1471,7 @@ static int audio_init(Audiodev *dev) 
    if (dev->timer_period <= 0) {

        s->period_ticks = 1;

    } else {

        s->period_ticks = NANOSECONDS_PER_SECOND / dev->timer_period;

        s->period_ticks = dev->timer_period * SCALE_US;

    }



    e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s);

audio/audio_legacy.c

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "audio_int.h"

#include "qemu-common.h"

#include "qemu/cutils.h"

#include "qemu/timer.h"

#include "qapi/error.h"

#include "qapi/qapi-visit-audio.h"

#include "qapi/visitor-impl.h"
@@ -338,8 +339,13 @@ static AudiodevListEntry *legacy_opt(const char *drvname) 
    handle_per_direction(audio_get_pdo_in(e->dev), "QEMU_AUDIO_ADC_");

    handle_per_direction(audio_get_pdo_out(e->dev), "QEMU_AUDIO_DAC_");



    /* Original description: Timer period in HZ (0 - use lowest possible) */

    get_int("QEMU_AUDIO_TIMER_PERIOD",

            &e->dev->timer_period, &e->dev->has_timer_period);

    if (e->dev->has_timer_period && e->dev->timer_period) {

        e->dev->timer_period = NANOSECONDS_PER_SECOND / 1000 /

                               e->dev->timer_period;

    }



    switch (e->dev->driver) {

    case AUDIODEV_DRIVER_ALSA: