From: "Kővágó Zoltán" <dirty.ice.hu@gmail.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
Michael Walle <michael@walle.cc>,
qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2 5/6] audio: use qapi AudioFormat instead of audfmt_e
Date: Wed, 17 Jun 2015 13:05:24 +0200 [thread overview]
Message-ID: <55815474.6060909@gmail.com> (raw)
In-Reply-To: <87a8vyg3wi.fsf@blackfin.pond.sub.org>
2015-06-17 10:01 keltezéssel, Markus Armbruster írta:
> "Kővágó, Zoltán" <dirty.ice.hu@gmail.com> writes:
>
>> I had to include an enum for audio sampling formats into qapi, but that meant
>> duplicating the audfmt_e enum. This patch replaces audfmt_e and associated
>> values with the qapi generated AudioFormat enum.
>>
>> This patch is mostly a search-and-replace, except for switches where the qapi
>> generated AUDIO_FORMAT_MAX caused problems.
> [...]
>> diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
>> index 6315b2d..4d38f5d 100644
>> --- a/audio/alsaaudio.c
>> +++ b/audio/alsaaudio.c
> [...]
>> @@ -639,19 +639,22 @@ static int alsa_open (int in, struct alsa_params_req *req,
>> bytes_per_sec = freq << (nchannels == 2);
>>
>> switch (obt->fmt) {
>> - case AUD_FMT_S8:
>> - case AUD_FMT_U8:
>> + case AUDIO_FORMAT_S8:
>> + case AUDIO_FORMAT_U8:
>> break;
>>
>> - case AUD_FMT_S16:
>> - case AUD_FMT_U16:
>> + case AUDIO_FORMAT_S16:
>> + case AUDIO_FORMAT_U16:
>> bytes_per_sec <<= 1;
>> break;
>>
>> - case AUD_FMT_S32:
>> - case AUD_FMT_U32:
>> + case AUDIO_FORMAT_S32:
>> + case AUDIO_FORMAT_U32:
>> bytes_per_sec <<= 2;
>> break;
>> +
>> + case AUDIO_FORMAT_MAX:
>> + break;
>
> Can this happen?
Not under normal circumstances, but gcc warns otherwise.
>> }
>>
>> threshold = (conf->threshold * bytes_per_sec) / 1000;
>> diff --git a/audio/audio.c b/audio/audio.c
>> index 5be4b15..112b57b 100644
>> --- a/audio/audio.c
>> +++ b/audio/audio.c
>> @@ -75,7 +75,7 @@ static struct {
>> .settings = {
>> .freq = 44100,
>> .nchannels = 2,
>> - .fmt = AUD_FMT_S16,
>> + .fmt = AUDIO_FORMAT_S16,
>> .endianness = AUDIO_HOST_ENDIANNESS,
>> }
>> },
>> @@ -87,7 +87,7 @@ static struct {
>> .settings = {
>> .freq = 44100,
>> .nchannels = 2,
>> - .fmt = AUD_FMT_S16,
>> + .fmt = AUDIO_FORMAT_S16,
>> .endianness = AUDIO_HOST_ENDIANNESS,
>> }
>> },
>> @@ -219,58 +219,61 @@ static char *audio_alloc_prefix (const char *s)
>> return r;
>> }
>>
>> -static const char *audio_audfmt_to_string (audfmt_e fmt)
>> +static const char *audio_audfmt_to_string (AudioFormat fmt)
>> {
>> switch (fmt) {
>> - case AUD_FMT_U8:
>> + case AUDIO_FORMAT_U8:
>> return "U8";
>>
>> - case AUD_FMT_U16:
>> + case AUDIO_FORMAT_U16:
>> return "U16";
>>
>> - case AUD_FMT_S8:
>> + case AUDIO_FORMAT_S8:
>> return "S8";
>>
>> - case AUD_FMT_S16:
>> + case AUDIO_FORMAT_S16:
>> return "S16";
>>
>> - case AUD_FMT_U32:
>> + case AUDIO_FORMAT_U32:
>> return "U32";
>>
>> - case AUD_FMT_S32:
>> + case AUDIO_FORMAT_S32:
>> return "S32";
>> +
>> + case AUDIO_FORMAT_MAX:
>
> default: would be more defensive. Same elsewhere.
Ok, I'll change them to default.
>> + abort();
>> }
>>
>> dolog ("Bogus audfmt %d returning S16\n", fmt);
>> return "S16";
>> }
> [...]
>
next prev parent reply other threads:[~2015-06-17 11:05 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 12:49 [Qemu-devel] [PATCH v2 0/6] -audiodev option Kővágó, Zoltán
2015-06-16 12:49 ` [Qemu-devel] [PATCH v2 1/6] qapi: qapi for audio backends Kővágó, Zoltán
2015-06-17 7:46 ` Markus Armbruster
2015-06-17 10:54 ` Kővágó Zoltán
2015-06-17 11:48 ` Markus Armbruster
2015-06-17 12:07 ` Kővágó Zoltán
2015-06-17 13:37 ` Markus Armbruster
2015-06-17 13:53 ` Kővágó Zoltán
2015-06-17 16:06 ` Markus Armbruster
2015-06-18 0:21 ` Kővágó Zoltán
2015-06-18 8:51 ` Markus Armbruster
2015-06-17 15:50 ` Eric Blake
2015-06-16 12:49 ` [Qemu-devel] [PATCH v2 2/6] qapi: support nested structs in OptsVisitor Kővágó, Zoltán
2015-06-17 7:50 ` Markus Armbruster
2015-06-17 8:41 ` Gerd Hoffmann
2015-06-17 11:01 ` Kővágó Zoltán
2015-06-17 11:50 ` Markus Armbruster
2015-06-17 15:47 ` Eric Blake
2015-06-17 11:18 ` Markus Armbruster
2015-06-17 12:11 ` Kővágó Zoltán
2015-06-17 13:41 ` Markus Armbruster
2015-06-17 14:02 ` Kővágó Zoltán
2015-06-17 16:10 ` Markus Armbruster
2015-06-16 12:49 ` [Qemu-devel] [PATCH v2 3/6] opts: do not print separator before first item in qemu_opts_print Kővágó, Zoltán
2015-06-17 7:53 ` Markus Armbruster
2015-06-17 9:02 ` Kevin Wolf
2015-06-16 12:49 ` [Qemu-devel] [PATCH v2 4/6] qapi: AllocVisitor Kővágó, Zoltán
2015-06-17 7:56 ` Markus Armbruster
2015-06-17 12:01 ` Kővágó Zoltán
2015-06-17 13:42 ` Markus Armbruster
2015-06-16 12:49 ` [Qemu-devel] [PATCH v2 5/6] audio: use qapi AudioFormat instead of audfmt_e Kővágó, Zoltán
2015-06-17 8:01 ` Markus Armbruster
2015-06-17 11:05 ` Kővágó Zoltán [this message]
2015-06-17 11:51 ` Markus Armbruster
2015-06-17 16:01 ` Eric Blake
2015-06-16 12:49 ` [Qemu-devel] [PATCH v2 6/6] audio: -audiodev command line option Kővágó, Zoltán
2015-06-17 8:13 ` Markus Armbruster
2015-06-17 11:18 ` Kővágó Zoltán
2015-06-17 12:27 ` Markus Armbruster
2015-06-17 13:25 ` Kővágó Zoltán
2015-06-17 16:13 ` Markus Armbruster
2015-06-18 6:54 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55815474.6060909@gmail.com \
--to=dirty.ice.hu@gmail.com \
--cc=armbru@redhat.com \
--cc=kraxel@redhat.com \
--cc=michael@walle.cc \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.