diff options
| author | Peter Maydell | 2020-03-16 14:06:14 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-03-16 14:06:14 +0100 |
| commit | 509f61798b5d1056dfbcbbc64a7c2998740f10d6 (patch) | |
| tree | 140d946d714d87d8574eeb43f099a2fd9dc669e3 /qemu-options.hx | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200313a'... (diff) | |
| parent | audio: add audiodev format=f32 option documentation (diff) | |
| download | qemu-509f61798b5d1056dfbcbbc64a7c2998740f10d6.tar.gz qemu-509f61798b5d1056dfbcbbc64a7c2998740f10d6.tar.xz qemu-509f61798b5d1056dfbcbbc64a7c2998740f10d6.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20200316-pull-request' into staging
audio: float fixes
# gpg: Signature made Mon 16 Mar 2020 11:30:00 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/audio-20200316-pull-request:
audio: add audiodev format=f32 option documentation
audio: fix saturation nonlinearity in clip_* functions
audio: change mixing engine float range to [-1.f, 1.f]
audio: consistency changes
audio: change naming scheme of FLOAT_CONV macros
qapi/audio: add documentation for AudioFormat
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 1d8f852d89..962a5ebaa6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -551,7 +551,7 @@ DEF("audiodev", HAS_ARG, QEMU_OPTION_audiodev, " in|out.frequency= frequency to use with fixed settings\n" " in|out.channels= number of channels to use with fixed settings\n" " in|out.format= sample format to use with fixed settings\n" - " valid values: s8, s16, s32, u8, u16, u32\n" + " valid values: s8, s16, s32, u8, u16, u32, f32\n" " in|out.voices= number of voices to use\n" " in|out.buffer-length= length of buffer in microseconds\n" "-audiodev none,id=id,[,prop[=value][,...]]\n" @@ -647,7 +647,7 @@ SRST ``in|out.format=format`` Specify the sample format to use when using fixed-settings. Valid values are: ``s8``, ``s16``, ``s32``, ``u8``, ``u16``, - ``u32``. Default is ``s16``. + ``u32``, ``f32``. Default is ``s16``. ``in|out.voices=voices`` Specify the number of voices to use. Default is 1. |