* [PULL 0/3] Fixes 20191121 patches
@ 2019-11-21 10:16 Gerd Hoffmann
2019-11-21 10:16 ` [PULL 1/3] audio: fix audio recording Gerd Hoffmann
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2019-11-21 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Edgar E. Iglesias, qemu-arm, Gerd Hoffmann, Alistair Francis,
Peter Maydell
The following changes since commit 39e2821077e6dcf788b7c2a9ef50970ec7995437:
Update version for v4.2.0-rc2 release (2019-11-19 19:34:10 +0000)
are available in the Git repository at:
git://git.kraxel.org/qemu tags/fixes-20191121-pull-request
for you to fetch changes up to c55c974486b0dadf97fe47e2e789d5dba9b77138:
ui/gtk: fix gettext message's charset. (2019-11-21 09:42:30 +0100)
----------------------------------------------------------------
two audio fixes and one gtk message fix.
----------------------------------------------------------------
Sai Pavan Boddu (1):
display: xlnx_dp: Provide sufficient bytes for silent audio channel
Volker Rümelin (1):
audio: fix audio recording
yanminhui (1):
ui/gtk: fix gettext message's charset.
audio/audio.c | 1 +
hw/display/xlnx_dp.c | 9 +++++++--
ui/gtk.c | 1 +
po/zh_CN.po | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
--
2.18.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL 1/3] audio: fix audio recording
2019-11-21 10:16 [PULL 0/3] Fixes 20191121 patches Gerd Hoffmann
@ 2019-11-21 10:16 ` Gerd Hoffmann
2019-11-21 10:16 ` [PULL 2/3] display: xlnx_dp: Provide sufficient bytes for silent audio channel Gerd Hoffmann
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2019-11-21 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Alistair Francis, Volker Rümelin, qemu-arm,
Gerd Hoffmann, Edgar E. Iglesias
From: Volker Rümelin <vr_qemu@t-online.de>
With current code audio recording with all audio backends
except PulseAudio and DirectSound is broken. The generic audio
recording buffer management forgot to update the current read
position after a read.
Fixes: ff095e5231 "audio: api for mixeng code free backends"
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Zoltán Kővágó <DirtY.iCE.hu@gmail.com>
Message-id: 2fc947cf-7b42-de68-3f11-cbcf1c096be9@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
audio/audio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/audio/audio.c b/audio/audio.c
index 7fc3aa9d1637..56fae5504710 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1390,6 +1390,7 @@ void *audio_generic_get_buffer_in(HWVoiceIn *hw, size_t *size)
size_t read = hw->pcm_ops->read(hw, hw->buf_emul + hw->pos_emul,
read_len);
hw->pending_emul += read;
+ hw->pos_emul = (hw->pos_emul + read) % hw->size_emul;
if (read < read_len) {
break;
}
--
2.18.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PULL 2/3] display: xlnx_dp: Provide sufficient bytes for silent audio channel
2019-11-21 10:16 [PULL 0/3] Fixes 20191121 patches Gerd Hoffmann
2019-11-21 10:16 ` [PULL 1/3] audio: fix audio recording Gerd Hoffmann
@ 2019-11-21 10:16 ` Gerd Hoffmann
2019-11-21 10:16 ` [PULL 3/3] ui/gtk: fix gettext message's charset Gerd Hoffmann
2019-11-21 17:18 ` [PULL 0/3] Fixes 20191121 patches Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2019-11-21 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Sai Pavan Boddu, Alistair Francis, qemu-arm,
Gerd Hoffmann, Edgar E. Iglesias
From: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
Fill the audio channel with required number of bytes to cover the
elapsed time. This prevents rate control reset, and avoids debug prints
like below
log:
Resetting rate control (65692 samples)
...
Resetting rate control (65721 samples)
...
Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 1573833408-2388-1-git-send-email-sai.pavan.boddu@xilinx.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/xlnx_dp.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index fde3b21ea5f4..705844379794 100644
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -394,13 +394,18 @@ static void xlnx_dp_audio_callback(void *opaque, int avail)
written = AUD_write(s->amixer_output_stream,
&s->out_buffer[s->data_ptr], s->byte_left);
} else {
+ int len_to_copy;
/*
* There is nothing to play.. We don't have any data! Fill the
* buffer with zero's and send it.
*/
written = 0;
- memset(s->out_buffer, 0, 1024);
- AUD_write(s->amixer_output_stream, s->out_buffer, 1024);
+ while (avail) {
+ len_to_copy = MIN(AUD_CHBUF_MAX_DEPTH, avail);
+ memset(s->out_buffer, 0, len_to_copy);
+ avail -= AUD_write(s->amixer_output_stream, s->out_buffer,
+ len_to_copy);
+ }
}
} else {
written = AUD_write(s->amixer_output_stream,
--
2.18.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PULL 3/3] ui/gtk: fix gettext message's charset.
2019-11-21 10:16 [PULL 0/3] Fixes 20191121 patches Gerd Hoffmann
2019-11-21 10:16 ` [PULL 1/3] audio: fix audio recording Gerd Hoffmann
2019-11-21 10:16 ` [PULL 2/3] display: xlnx_dp: Provide sufficient bytes for silent audio channel Gerd Hoffmann
@ 2019-11-21 10:16 ` Gerd Hoffmann
2019-11-21 17:18 ` [PULL 0/3] Fixes 20191121 patches Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2019-11-21 10:16 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, yanminhui, Alistair Francis, qemu-arm,
Gerd Hoffmann, Edgar E. Iglesias
From: yanminhui <yanminhui163@163.com>
Signed-off-by: yanminhui <yanminhui163@163.com>
Message-Id: <20191116031037.1207-1-yanminhui163@163.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/gtk.c | 1 +
po/zh_CN.po | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 2f23922afc6a..692ccc7bbb90 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -2215,6 +2215,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts)
setlocale(LC_MESSAGES, "");
setlocale(LC_CTYPE, "C.UTF-8");
bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR);
+ bind_textdomain_codeset("qemu", "UTF-8");
textdomain("qemu");
window_display = gtk_widget_get_display(s->window);
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b25e8e3c0207..38de6a4f2a7f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -66,7 +66,7 @@ msgid "Detach Tab"
msgstr "分离标签页"
msgid "Show Menubar"
-msgstr ""
+msgstr "显示菜单栏"
msgid "_Machine"
msgstr "虚拟机(_M)"
--
2.18.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PULL 0/3] Fixes 20191121 patches
2019-11-21 10:16 [PULL 0/3] Fixes 20191121 patches Gerd Hoffmann
` (2 preceding siblings ...)
2019-11-21 10:16 ` [PULL 3/3] ui/gtk: fix gettext message's charset Gerd Hoffmann
@ 2019-11-21 17:18 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2019-11-21 17:18 UTC (permalink / raw)
To: Gerd Hoffmann
Cc: Edgar E. Iglesias, qemu-arm, QEMU Developers, Alistair Francis
On Thu, 21 Nov 2019 at 10:16, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 39e2821077e6dcf788b7c2a9ef50970ec7995437:
>
> Update version for v4.2.0-rc2 release (2019-11-19 19:34:10 +0000)
>
> are available in the Git repository at:
>
> git://git.kraxel.org/qemu tags/fixes-20191121-pull-request
>
> for you to fetch changes up to c55c974486b0dadf97fe47e2e789d5dba9b77138:
>
> ui/gtk: fix gettext message's charset. (2019-11-21 09:42:30 +0100)
>
> ----------------------------------------------------------------
> two audio fixes and one gtk message fix.
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-21 17:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-21 10:16 [PULL 0/3] Fixes 20191121 patches Gerd Hoffmann
2019-11-21 10:16 ` [PULL 1/3] audio: fix audio recording Gerd Hoffmann
2019-11-21 10:16 ` [PULL 2/3] display: xlnx_dp: Provide sufficient bytes for silent audio channel Gerd Hoffmann
2019-11-21 10:16 ` [PULL 3/3] ui/gtk: fix gettext message's charset Gerd Hoffmann
2019-11-21 17:18 ` [PULL 0/3] Fixes 20191121 patches Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).