diff options
| author | unknown <mdo@.(none)> | 2010-03-25 13:06:42 (GMT) |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@nokia.com> | 2010-03-25 13:16:36 (GMT) |
| commit | 1e6c23469ea78f6ff5a3a546c08ae22a5ba79356 (patch) | |
| tree | eff1a7daec8b47fd9f6b710be6e7ccdda8a4bd5c /src/3rdparty/phonon/ds9 | |
| parent | bd5d323373dbaf9d827126b77895da253128c1e5 (diff) | |
| download | Qt-1e6c23469ea78f6ff5a3a546c08ae22a5ba79356.zip Qt-1e6c23469ea78f6ff5a3a546c08ae22a5ba79356.tar.gz Qt-1e6c23469ea78f6ff5a3a546c08ae22a5ba79356.tar.bz2 | |
Fixes a deadlock with streaming in Phonon.
Deadlock can occur with certain DirectShow filters when stopping a streamed video.
Task-number: QTBUG-8420
Merge-request: 2317
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Diffstat (limited to 'src/3rdparty/phonon/ds9')
| -rw-r--r-- | src/3rdparty/phonon/ds9/iodevicereader.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/3rdparty/phonon/ds9/iodevicereader.cpp b/src/3rdparty/phonon/ds9/iodevicereader.cpp index 695af59..d706c82 100644 --- a/src/3rdparty/phonon/ds9/iodevicereader.cpp +++ b/src/3rdparty/phonon/ds9/iodevicereader.cpp @@ -107,9 +107,6 @@ namespace Phonon HRESULT read(LONGLONG pos, LONG length, BYTE *buffer, LONG *actual) { Q_ASSERT(!m_mutex.tryLock()); - if (m_mediaGraph->isStopping()) { - return VFW_E_WRONG_STATE; - } if(m_size != 1 && pos + length > m_size) { //it tries to read outside of the boundaries @@ -128,9 +125,6 @@ namespace Phonon int oldSize = m_buffer.size(); while (m_buffer.size() < int(length)) { needData(); - if (m_mediaGraph->isStopping()) { - return VFW_E_WRONG_STATE; - } if (oldSize == m_buffer.size()) { break; //we didn't get any data |