summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudioinput_win32_p.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Change to release license header.Jason McDonald2011-02-161-13/+13
| | | | Reviewed-by: Trust Me
* Update copyright year to 2011.Jason McDonald2011-01-111-1/+1
| | | | | Reviewed-by: Trust Me (cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
* Fix potential buffer overrun in QAudioInput windows implementation.Andrew den Exter2010-11-101-4/+7
| | | | | | | Don't write more than len bytes to the output buffer. Task-number: QTBUG-14549 QTBUG-8578 Reviewed-by: Derick Hawcroft
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-10-041-10/+36
|\ | | | | | | | | Conflicts: src/multimedia/audio/qaudioinput_win32_p.cpp
| * Verify the audio format before trying to open an audio device.Andrew den Exter2010-09-221-5/+36
| | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Segmentation Fault in QAudioOutputPrivate::freeBlocks() caused by wrongKurt Korbatits2010-07-021-1/+1
| | | | | | | | | | | | | | pointer increment Task-number:QTBUG-11883 Reviewed-by:Andrew den Exter
| * win32 backend for low-level audio fixesKurt Korbatits2010-04-261-39/+29
| | | | | | | | | | | | | | | | - fix deadlock with QAudioInput (win32) backend - changed win32 backend to use QMutex lock - setNotifyInterval(0) to disable notify() signal Reviewed-by:Derick Hawcroft
| * Bug in QAudioOutput: Invalid use of "waveOutUnprepareHeader"Kurt Korbatits2010-04-191-1/+2
| | | | | | | | | | | | | | Fixed freeBlocks func in both input and output Task-number:QTBUG-9875 Reviewed-by:Andrew den Exter
* | Removed mediaservices.Kurt Korbatits2010-05-181-0/+604
| |
* | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-613/+0
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-091-8/+6
|\ \ | |/ | | | | | | Conflicts: src/multimedia/audio/qaudioinput_win32_p.h
| * Corruption in data captured by QAudioInputKurt Korbatits2010-04-091-2/+2
| | | | | | | | | | | | | | | | Increased default buffer size and period size for windows. 11025monoS16LE was choppy, needed bigger periods. Task-number:QTBUG-9101 Reviewed-by:Derick Hawcroft
| * Just one (static) waveInCriticalSection but multiple QAudioInput toKurt Korbatits2010-04-091-6/+4
| | | | | | | | | | | | | | record from different soundcards Task-number:QTBUG-9221 Reviewed-by:Andrew den Exter
* | make it possible to use sse2 with mingwThierry Bastian2010-03-111-1/+1
| | | | | | | | | | | | | | All the windows callback functions need an attribute to force the alignment of the arg pointer. Reviewed-by: Benjamin Poulain
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-261-16/+26
|\ \ | |/ | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| * win32 backend for low-level audio doesn't pass new unit testsKurt Korbatits2010-02-231-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | New unit tests have identified issues with awin32 backend. These issues need to be resolved before new unit tests are added. * stateChanged() signal should only be emitted on change of state currently signals can be emitted multiple times. * for output data is being lost when input can be read from QIODevice but cannot be written to audio sub system. Task-number:QTBUG-8441 Reviewed-by:Dmytro Poplavskiy
* | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly irrelevant when converting internal data structures which are raw utf16 in host byte order. so replace it with QString::fromUnicode() where possible (which seems to be everywhere). the reasoning is the same as in commit e0fda52f, so not getting further reviews. Reviewed-by: denis Reviewed-by: joao
* | Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-281-7/+7
|\ \ | |/ | | | | | | | | | | Conflicts: src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp
| * Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
* | Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-151-25/+45
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: examples/multimedia/audioinput/audioinput.cpp src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp src/multimedia/audio/qaudioinput_win32_p.cpp src/multimedia/audio/qaudiooutput_win32_p.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-081-7/+7
| |\ | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| | * Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Added channelCount(), changed everything to use this instead of channels() in QAudioFormat class. -Added setSampleRate() and sampleRate(), changed everthing to use these instead of setFrequency() and frequency() in QAudioFormat class. -Added supportedSampleRates() and supportedChannelCounts(), changed everything to use these instead of supportedFrequencies() and supportedChannels() in QAudioDeviceInfo class. Reviewed-by:Justin McPherson
| * | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
| * The "audioinput" multimedia example locks up the audio input/outputKurt Korbatits2009-12-181-13/+25
| | | | | | | | | | Task-number:QTBUG-5633 Reviewed-by:Justin McPherson
| * Fixed runtime error in QAudioInput::bytesReady() functionKurt Korbatits2009-11-101-0/+3
| | | | | | | | | | | | | | | | If bytesReady() was called before start(), Div by Zero. Added check for this condition. Task-number:QTBUG-5300 Reviewed-by:Justin McPherson
| * Changes to low-level audio API.Kurt Korbatits2009-11-101-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
| * Changes to low-level audio API.Kurt Korbatits2009-11-101-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
| * Fixed runtime error in QAudioInput::bytesReady() functionKurt Korbatits2009-11-091-0/+3
| | | | | | | | | | | | | | | | If bytesReady() was called before start(), Div by Zero. Added check for this condition. Task-number:QTBUG-5300 Reviewed-by:Justin McPherson
| * Changes to low-level audio API.Kurt Korbatits2009-11-051-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* | Added new funcs to QAudioFormat and QAudioDeviceInfo class's.Kurt Korbatits2010-01-151-8/+8
|/ | | | | | | | | | | | QAudioFormat::setChannelCount(), channelCount() QAudioFormat::setSampleRate(), sampleRate() QAudioDeviceInfo::supportedChannelCounts(), supportedSampleRates() Changed all instances to use these new functions instead of channels(),frequency(),setFrequency(),setChannels() supportedChannels(),supportedFrequencies() Old functions still exist but are marked obsolete. Reviewed-by:Justin McPherson
* Fixed clock() function return values in audio class's.Kurt Korbatits2009-10-221-1/+1
| | | | | | | clock() function should return microseconds, fixed example, alsa backend and win32 backend. Reviewed-by:Justin McPherson
* Fixed logic in clock() function of audio class's.Kurt Korbatits2009-10-021-1/+1
| | | | | | | - clock() should return valid value except in stop state, return 0. - Added clock() function testing to unit tests. Reviewed-by:Justin McPherson
* Fixed error in notify() signal and totalTime() in QAudioInput andKurt Korbatits2009-09-301-2/+10
| | | | | | | | QAudioOutput. -The notify() signal was not firing the correct number of times. -The totalTime() on wince was incorrect (unit test). Reviewed-by:Justin McPherson
* AudioDevices demo doesn't do anything on WindowsKurt Korbatits2009-09-141-1/+1
| | | | | | | | | | -put example audiodevices in layout. -added more checking to testSettings() in win32 implementation. -disabled objects in example audiodevices that are not editable. -added more checking to alsa implementation for preferredFormat(). -changed internal strings from tr to QLatin1String. Reviewed-by:Justin Mcpherson
* Crash in audiooutput demo when switching outputKurt Korbatits2009-09-091-10/+43
| | | | | | | | | | | -waveOut callback was calling into class during destruction. Changed to wait until close of waveOut/waveIn before returning from destructor. -Reduced default buffer on wince implementation. -Added error checking on buffer allocation. Task-number:261049, 261053 Reviewed-by:Bill King
* Update license headers again.Jason McDonald2009-09-091-4/+4
| | | | Reviewed-by: Trust Me
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* compile fix with namespaceshjk2009-08-261-0/+3
| | | | 13 pairs missing...
* Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| | | | Reviewed-by: Trust Me
* multimedia: fix warnings on mingwThierry Bastian2009-08-061-0/+1
| | | | | moved static CRITICAL_SECTIONs to cpp files. In header they would be declared more than once depending on what file includes those headers.
* Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+540