Bug#247905: marked as done (Arts has bad interactivity with alsa + dmix in kde 3.2.2)
Your message dated Tue, 7 Dec 2004 20:45:02 +0200
with message-id <20041207184502.GA22565@uittosatama.fi>
and subject line upstream arts bug closed some time ago
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 7 May 2004 21:23:44 +0000
>From christian.mayrhuber@gmx.net Fri May 07 14:23:44 2004
Return-path: <christian.mayrhuber@gmx.net>
Received: from mailrelay.tu-graz.ac.at (mailrelay01.tugraz.at) [129.27.3.7]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BMCoq-00019Y-00; Fri, 07 May 2004 14:23:44 -0700
Received: from [] (fiicmgk01.tu-graz.ac.at [129.27.200.50])
by mailrelay01.tugraz.at (8.12.11/8.12.11) with ESMTP id i47LNBoP023075
for <submit@bugs.debian.org>; Fri, 7 May 2004 23:23:11 +0200 (CEST)
From: Christian Mayrhuber <christian.mayrhuber@gmx.net>
To: submit@bugs.debian.org
Subject: Arts has bad interactivity with alsa + dmix in kde 3.2.2
Date: Fri, 7 May 2004 23:29:31 +0200
User-Agent: KMail/1.6.2
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: Multipart/Mixed;
boundary="Boundary-00=_7+/mAGfWLhuK+qK"
Message-Id: <200405072329.32073.christian.mayrhuber@gmx.net>
X-Scanned-By: MIMEDefang 2.42
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_20,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
X-CrossAssassin-Score: 1
--Boundary-00=_7+/mAGfWLhuK+qK
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Package: libarts1
Version: 1.2.2
Severity: important
Tags: patch
When playing audio trough arts the reaction time of artsd can
increase to around 1s if the alsa output plugin is used together with
dmix.
Attached is a fix from Allen Sandfeld. This fix is already in kde cvs.
The patch must be applied in the arts-1.2.2/flow directory and does not
interfere with arts_1.2.2-1.diff.gz.
Full information on the bug is available on
http://bugs.kde.org/show_bug.cgi?id=81095
--
lg, Chris
--Boundary-00=_7+/mAGfWLhuK+qK
Content-Type: text/x-diff;
charset="us-ascii";
name="dmix-interactivity.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="dmix-interactivity.diff"
Index: audioioalsa9.cc
===================================================================
RCS file: /home/kde/arts/flow/audioioalsa9.cc,v
retrieving revision 1.4.2.3
diff -u -3 -p -r1.4.2.3 audioioalsa9.cc
--- audioioalsa9.cc 2 Apr 2004 11:21:49 -0000 1.4.2.3
+++ audioioalsa9.cc 7 May 2004 19:29:35 -0000
@@ -63,20 +63,18 @@ namespace Arts {
class AudioIOALSA : public AudioIO, public IONotify {
protected:
- int audio_read_fd;
- int audio_write_fd;
+ struct pollfd m_audio_read_pfd, m_audio_write_pfd;
snd_pcm_t *m_pcm_playback;
snd_pcm_t *m_pcm_capture;
snd_pcm_format_t m_format;
int m_period_size, m_periods;
- bool inProgress;
- bool restartIOHandling;
void startIO();
- int poll2iomanager(int pollTypes);
+ static int poll2iomanager(int pollTypes);
+ static int iomanager2poll(int pollTypes);
int setPcmParams(snd_pcm_t *pcm);
- int watchDescriptor(snd_pcm_t *pcm);
+ void watchDescriptor(snd_pcm_t *pcm, struct pollfd *pfd);
void notifyIO(int fd, int types);
@@ -118,9 +116,6 @@ AudioIOALSA::AudioIOALSA()
m_format = SND_PCM_FORMAT_S16_LE;
m_pcm_playback = NULL;
m_pcm_capture = NULL;
- inProgress = false;
- restartIOHandling = false;
- audio_read_fd = audio_write_fd = -1;
}
bool AudioIOALSA::open()
@@ -309,10 +304,10 @@ void AudioIOALSA::startIO()
{
/* watch PCM file descriptor(s) */
if (m_pcm_playback) {
- audio_write_fd = watchDescriptor(m_pcm_playback);
+ watchDescriptor(m_pcm_playback, &m_audio_write_pfd);
}
if (m_pcm_capture) {
- audio_read_fd = watchDescriptor(m_pcm_capture);
+ watchDescriptor(m_pcm_capture, &m_audio_read_pfd);
}
}
@@ -328,28 +323,40 @@ int AudioIOALSA::poll2iomanager(int poll
if(pollTypes & POLLERR)
types |= IOType::except;
- return types | IOType::reentrant;
+ return types;
}
-int AudioIOALSA::watchDescriptor(snd_pcm_t *pcm)
+int AudioIOALSA::iomanager2poll(int pollTypes)
+{
+ int types = 0;
+
+ if(pollTypes & IOType::read)
+ types |= POLLIN;
+ if(pollTypes & IOType::write)
+ types |= POLLOUT;
+ if(pollTypes & IOType::except)
+ types |= POLLERR;
+
+ return types;
+}
+
+void AudioIOALSA::watchDescriptor(snd_pcm_t *pcm, struct pollfd *pfd)
{
- struct pollfd pfds;
if (snd_pcm_poll_descriptors_count(pcm) != 1) {
- arts_info("Can't handle more than one poll descriptor\n");
- return -1;
+ arts_fatal("Can't handle more than one poll descriptor\n");
+ return;
}
- if (snd_pcm_poll_descriptors(pcm, &pfds, 1) != 1) {
- arts_info("Cannot get poll descriptor\n");
- return -1;
+ if (snd_pcm_poll_descriptors(pcm, pfd, 1) != 1) {
+ arts_fatal("Cannot get poll descriptor\n");
+ return;
}
// See though the crack-fumes from the ALSA-developers and try to
// figure out which way this handle is supposed to be polled.
- int types = poll2iomanager(pfds.events);
+ int types = poll2iomanager(pfd->events);
- Dispatcher::the()->ioManager()->watchFD(pfds.fd, types, this);
+ Dispatcher::the()->ioManager()->watchFD(pfd->fd, types, this);
- return pfds.fd;
}
int AudioIOALSA::xrun(snd_pcm_t *pcm)
@@ -399,9 +406,6 @@ int AudioIOALSA::read(void *buffer, int
int AudioIOALSA::write(void *buffer, int size)
{
- // DMix has an annoying habit of returning instantantly on the returned
- // poll-descriptor. So we block here to avoid an infinity loop.
- snd_pcm_wait(m_pcm_playback, 5);
int frames = snd_pcm_bytes_to_frames(m_pcm_playback, size);
int length;
@@ -428,29 +432,28 @@ void AudioIOALSA::notifyIO(int fd, int t
{
int todo = 0;
- if(inProgress)
- {
- if(!restartIOHandling)
- {
- Dispatcher::the()->ioManager()->remove(this,IOType::all);
- restartIOHandling = true;
- }
- return;
+ // Call pcm_poll_desciptors_revents to translate the event safely for us.
+ // This is necassary even if we know what the event is, because _revents
+ // might have side-effects (dmix have)
+ unsigned short revents;
+ if(fd == m_audio_write_pfd.fd) {
+ m_audio_write_pfd.revents = iomanager2poll(type);
+ snd_pcm_poll_descriptors_revents(m_pcm_playback, &m_audio_write_pfd, 1, &revents);
+ if (revents & POLLOUT)
+ todo |= AudioSubSystem::ioWrite;
+
+ }
+ if(fd == m_audio_read_pfd.fd) {
+ m_audio_read_pfd.revents = iomanager2poll(type);
+ snd_pcm_poll_descriptors_revents(m_pcm_capture, &m_audio_read_pfd, 1, &revents);
+ if (revents & POLLIN)
+ todo |= AudioSubSystem::ioRead;
}
- // We can't trust the type as ALSA might have read-type events,
- // that are really meant to be write-type event!
- if(fd == audio_write_fd) todo |= AudioSubSystem::ioWrite;
- if(fd == audio_read_fd) todo |= AudioSubSystem::ioRead;
-
if (type & IOType::except) todo |= AudioSubSystem::ioExcept;
- restartIOHandling = false;
- inProgress = true;
- AudioSubSystem::the()->handleIO(todo);
- inProgress = false;
+ if (todo) AudioSubSystem::the()->handleIO(todo);
- if (restartIOHandling) startIO();
}
int AudioIOALSA::setPcmParams(snd_pcm_t *pcm)
Index: audiosubsys.cc
===================================================================
RCS file: /home/kde/arts/flow/audiosubsys.cc,v
retrieving revision 1.46
diff -u -3 -p -r1.46 audiosubsys.cc
--- audiosubsys.cc 29 Aug 2003 21:02:06 -0000 1.46
+++ audiosubsys.cc 7 May 2004 19:29:36 -0000
@@ -7,12 +7,12 @@
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
-
+
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -100,7 +100,7 @@ AudioSubSystem::AudioSubSystem()
d = new AudioSubSystemPrivate;
d->audioIO = 0;
d->audioIOInit = false;
-
+
_running = false;
consumer = 0;
producer = 0;
@@ -338,7 +338,7 @@ int AudioSubSystem::selectWriteFD()
bool AudioSubSystem::check()
{
- bool ok = open();
+ bool ok = open();
if(ok) close();
return ok;
@@ -353,7 +353,7 @@ bool AudioSubSystem::open()
{
if(d->audioIOName == "")
_error = "couldn't auto detect which audio I/O method to use";
- else
+ else
_error = "unable to select '"+d->audioIOName+"' style audio I/O";
return false;
}
@@ -422,6 +422,7 @@ void AudioSubSystem::handleIO(int type)
/*
* make sure that we have a fragment full of data at least
*/
+Rewrite:
while(wBuffer.size() < _fragmentSize)
{
long wbsz = wBuffer.size();
@@ -477,6 +478,9 @@ void AudioSubSystem::handleIO(int type)
}
}
}
+
+ // If we can write a fragment more, then do so right now:
+ if (space >= _fragmentSize*2) goto Rewrite;
}
assert((type & ioExcept) == 0);
--Boundary-00=_7+/mAGfWLhuK+qK--
---------------------------------------
Received: (at 247905-done) by bugs.debian.org; 7 Dec 2004 18:45:06 +0000
>From nchip@uittosatama.fi Tue Dec 07 10:45:06 2004
Return-path: <nchip@uittosatama.fi>
Received: from uittosatama.fi [217.30.179.138] (postfix)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1CbkKg-00029t-00; Tue, 07 Dec 2004 10:45:06 -0800
Received: by uittosatama.fi (Postfix, from userid 573)
id 75827EE8089; Tue, 7 Dec 2004 20:45:02 +0200 (EET)
Date: Tue, 7 Dec 2004 20:45:02 +0200
From: Riku Voipio <riku.voipio@iki.fi>
To: 247905-done@bugs.debian.org
Subject: upstream arts bug closed some time ago
Message-ID: <20041207184502.GA22565@uittosatama.fi>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-message-flag: Warning: message not sent with a DRM-Certified client
User-Agent: Mutt/1.5.6+20040907i
Delivered-To: 247905-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no
version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
This bug was fixed in kde 3.2.3 release, and we are at 3.3.1
now.
Reply to: