| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Surround support requires ALSA lib >= 1.0.14
Task-number: QTBUG-15205
Reviewed-by: Andrew den Exter
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
Fixed tst_qpixmap::grabWidget autotest failure on QWS.
Doc: Fixing typo
Doc: Fixing typo
Doc: Fixing typo
Fixed tst_qwidget::testContentsPropagation auto-test failure.
Fixed text rendering bug in raster engine when opacity != 1.0.
Prevented race condition on texture destruction.
More fix for QTBUG-14640:oci performance problem with qlonglong
Doc: Fixing typo
Fixed grabWidget sometimes returning uninitialized memory.
Fix Malayalam Rendering - 'Ra' is PreBase
Update .def files for QtGui and QtOpenVG
Use 32bit textures for alpha textures after all.
One more fix for dithering.
Doc: Fixing typo
Fix QTBUG-14640:oci performance problem with qlonglong
32bit => 16bit conversion has 4byte-aligned output.
Fix gcc bug in qReallocAligned
Prevented threading related crash in OpenGL module.
Fix possible crash in QStaticText and QDeclarativeTextLayout
...
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fix potential buffer overrun in ALSA QAudioInput implementation.
Fix potential buffer overrun in QAudioInput windows implementation.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Don't write more than the supplied max buffer size to the output buffer.
Task-number: QTBUG-14549 QTBUG-8578
Reviewed-by: Derick Hawcroft
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Don't write more than len bytes to the output buffer.
Task-number: QTBUG-14549 QTBUG-8578
Reviewed-by: Derick Hawcroft
|
|/ /
| |
| |
| | |
RevBy: Miikka Heikkinen
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.cpp
|
| |
| |
| |
| |
| |
| |
| | |
QAudioFormat::sampleRate() and QAudioFormat::channelCount() weren't
introduced until 4.7. Use frequency() and channels() instead.
Reviewed-by: Justin McPherson
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was causing a crash on windows because the buffer and period sizes
were worked out to 0 with an invalid sample size and dividing one by the
other is division by 0.
Task-number: QTMOBILITY-438
Reviewed-by: Justin McPherson
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As with playback mode, lack of support for CMMFDevSound::Pause() in
DevSound's recording mode causes problems on some devices.
Specifically, while QAudioInput works fine on the Nokia 5800, this
bug was observed on the Nokia N8. This fix means that suspending
and resuming audio input will work correctly on all devices.
Task-number: QTBUG-13506
Reviewed-by: Derick Hawcroft
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-13504
Reviewed-by: Derick Hawcroft
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When QAudioOutput::suspend() and QAudioOutput::resume() are called
repeatedly, with a short delay between each call, DevSound occasionally
raises a KErrOverflow error. The backend previously translated this
into QAudio::IOError, causing the object to transition into the
QAudio::Stopped state.
This error can be safely ignored, with playback resuming as soon as
more audio data is provided to DevSound. This patch therefore
suppresses the error.
Task-number: QTBUG-13059
Reviewed-by: Derick Hawcroft
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Symbian backend holds buffers which are passed to it from DevSound,
exposing the memory of these buffers via the QIODevice interface.
When QAudioOutput::resume() is called, the backend re-starts data flow
by passing the buffer it holds back to DevSound. Previously, this
would not happen if the buffer was empty, potentially causing playback
to stall. This patch ensures that the buffer is always sent back to
DevSound, and data flow therefore always resumes.
Task-number: QTBUG-13059
Reviewed-by: Derick Hawcroft
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If QAudioOutput::processedUSecs() is called very soon after
QAudioOutput::start(), the DevSound instance owned by the Symbian
backend may still be initializing. This patch causes the function to
return zero, rather than failing an assertion.
Task-number: QTBUG-13059
Reviewed-by: Derick Hawcroft
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Resuming recording causes buffers previously provided to the client
(via MDevSoundObserver::BufferToBeEmptied()) to be invalidated.
The buffers therefore must be discarded when recording is suspended.
Task-number: QTBUG-13058
Reviewed-by: Derick Hawcroft
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-13058
Reviewed-by: Derick Hawcroft
|
| |
| |
| |
| |
| |
| |
| | |
ALSA can return a list of one empty item when no devices are available.
Task-number: QTBUG-12690
Reviewed-by: Andrew den Exter
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implement QAudioInput::suspend() using CMMFDevSound::Stop()
Discard buffer pointer when DevSound is stopped
Suppress overflow errors raised by Symbian DevSound during playback
Discard empty buffer on call to QAudioOutput::resume()
Permit QAudioOutput::processedUSecs() to be called immediately after start()
Discard all DevSound buffers held when QAudioInput::suspend() called
Fixed buffer overrun in Symbian QAudioInput backend
QS60Style does not show checkbox for checkable item in QTreeView
Load environment.prf from Symbian SDK if it exists there
Remove pre-Symbian3 plugins from Symbian3 and later builds
Panic in qs60style.cpp while drawing a QTreeView
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As with playback mode, lack of support for CMMFDevSound::Pause() in
DevSound's recording mode causes problems on some devices.
Specifically, while QAudioInput works fine on the Nokia 5800, this
bug was observed on the Nokia N8. This fix means that suspending
and resuming audio input will work correctly on all devices.
Task-number: QTBUG-13506
Reviewed-by: Derick Hawcroft
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13504
Reviewed-by: Derick Hawcroft
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When QAudioOutput::suspend() and QAudioOutput::resume() are called
repeatedly, with a short delay between each call, DevSound occasionally
raises a KErrOverflow error. The backend previously translated this
into QAudio::IOError, causing the object to transition into the
QAudio::Stopped state.
This error can be safely ignored, with playback resuming as soon as
more audio data is provided to DevSound. This patch therefore
suppresses the error.
Task-number: QTBUG-13059
Reviewed-by: Derick Hawcroft
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Symbian backend holds buffers which are passed to it from DevSound,
exposing the memory of these buffers via the QIODevice interface.
When QAudioOutput::resume() is called, the backend re-starts data flow
by passing the buffer it holds back to DevSound. Previously, this
would not happen if the buffer was empty, potentially causing playback
to stall. This patch ensures that the buffer is always sent back to
DevSound, and data flow therefore always resumes.
Task-number: QTBUG-13059
Reviewed-by: Derick Hawcroft
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If QAudioOutput::processedUSecs() is called very soon after
QAudioOutput::start(), the DevSound instance owned by the Symbian
backend may still be initializing. This patch causes the function to
return zero, rather than failing an assertion.
Task-number: QTBUG-13059
Reviewed-by: Derick Hawcroft
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Resuming recording causes buffers previously provided to the client
(via MDevSoundObserver::BufferToBeEmptied()) to be invalidated.
The buffers therefore must be discarded when recording is suspended.
Task-number: QTBUG-13058
Reviewed-by: Derick Hawcroft
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13058
Reviewed-by: Derick Hawcroft
|
|/ /
| |
| |
| |
| | |
Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321
Reviewer: David Boddie
|
| |
| |
| |
| |
| |
| |
| | |
ALSA can return a list of one empty item when no devices are available.
Task-number: QTBUG-12690
Reviewed-by: Andrew den Exter
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
|
| |
| |
| |
| |
| |
| |
| | |
Trivial fix, valid formats have pixel format != Invalid, not ==.
Task-number: QTBUG-12337
Reviewed-by: Andrew den Exter
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/qtexttable/tst_qtexttable.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It can be used for example when the hw video decoder can use
X11 pixmaps as a rendering target.
Reviewed-by: Justin McPherson
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/page/FrameView.h
src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
src/3rdparty/webkit/WebCore/platform/ScrollView.h
src/corelib/plugin/quuid.cpp
src/gui/dialogs/qfontdialog.cpp
src/multimedia/audio/qaudiodevicefactory.cpp
src/opengl/qgl.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/qxmlquery/tst_qxmlquery.cpp
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-11900
Reviewed-by: Andrew den Exter
|
| |
| |
| |
| |
| |
| |
| | |
pointer increment
Task-number:QTBUG-11883
Reviewed-by:Andrew den Exter
|
| |
| |
| |
| |
| | |
Task-number:QTBUG-11755
Reviewed-by:Derick Hawcroft
|
| |
| |
| |
| | |
Reviewed-by:TrustMe
|
| |
| |
| |
| | |
Reviewed-by:TrustMe
|
| |
| |
| |
| |
| |
| | |
WAVE_FORMAT_EXTENSIBLE not in v6.0 ms SDK only in v6.1's
Reviewed-by:TrustMe
|
| |
| |
| |
| | |
Reviewed-by:Andrew den Exter
|
| |
| |
| |
| |
| | |
Task-number:QTBUG-11586
Reviewed-by:Derick Hawcroft
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
Task-number:QTBUG-11586
Reviewed-by:Andrew den Exter
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/plugins/phonon/mmf/mmf.pro
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8878
Reviewed-by:Dmytro Poplavskiy
|
| | |
| | |
| | |
| | | |
Reviewed-by:Dmytro Poplavskiy
|