slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not try to complete flush operation if stream has changed.

Browse Source 
There is a problem when sound effect already has a sound loaded and
we try to load new sound with setSource().
When sampleReady() is called between emptyStream() and emptyComplete()
it unloads the current stream and creates a new stream.
As a result pulse audio crashed in emptyComplete() while calling
pa_operation_unref(pa_stream_cork(
m_pulseStream, 1, stream_cork_callback, m_ref->getRef()))
with the new m_pulseStream.

Change-Id: Idff4fe6037d3f3f116734dc0facabaafa3db14a2
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
This commit is contained in:
Lev Zelenskiy
2012-04-20 17:02:35 +10:00
committed by Qt by Nokia
parent 7c84225cc8
commit c718043588
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/multimedia/audio/qsoundeffect_pulse_p.cpp
View File

@@ -628,11 +628,17 @@ void QSoundEffectPrivate::emptyStream()
pa_operation_unref(pa_stream_flush(m_pulseStream, stream_flush_callback, m_ref->getRef()));
}
void QSoundEffectPrivate::emptyComplete()
void QSoundEffectPrivate::emptyComplete(void *stream)
{
PulseDaemonLocker locker;
#ifdef QT_PA_DEBUG
qDebug() << this << "emptyComplete";
#endif
m_emptying = false;
pa_operation_unref(pa_stream_cork(m_pulseStream, 1, stream_cork_callback, m_ref->getRef()));
if ((pa_stream *)stream == m_pulseStream)
pa_operation_unref(pa_stream_cork(m_pulseStream, 1, stream_cork_callback, m_ref->getRef()));
}
void QSoundEffectPrivate::sampleReady()
@@ -1122,7 +1128,7 @@ void QSoundEffectPrivate::stream_flush_callback(pa_stream *s, int success, void
#ifdef QT_PA_DEBUG
qDebug() << self << "stream_flush_callback";
#endif
QMetaObject::invokeMethod(self, "emptyComplete", Qt::QueuedConnection);
QMetaObject::invokeMethod(self, "emptyComplete", Qt::QueuedConnection, Q_ARG(void*, s));
}
void QSoundEffectPrivate::stream_write_done_callback(void *p)

2
src/multimedia/audio/qsoundeffect_pulse_p.h
View File

@@ -118,7 +118,7 @@ private Q_SLOTS:
void underRun();
void prepare();
void streamReady();
void emptyComplete();
void emptyComplete(void *stream);
void updateVolume();
void updateMuted();