summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio
Commit message (Collapse)AuthorAgeFilesLines
* Fix calculation bug in QWaveDecoder.Christian Strømme2013-03-221-3/+5
| | | | | | | | | When comparing the size of the WaveHeader and the chunk size, we need to include the ID and Size fields, or any extra data won't be discarded and the parsing will fail. Change-Id: I730833f33f57b26cd750985354136191f7e7ce04 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-142-29/+36
|\ | | | | | | Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13
| * Doc: Clarify and polish docs for QAudio[Input|Output]::start()Sze Howe Koh2013-02-272-29/+36
| | | | | | | | | | | | | | | | | | QAudio[Input|Output] retains ownership of the QIODevices that are returned. Change-Id: Ieb2f319eef906822debc13b4399d7e7336024552 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | iOS: Fix build issuesAndy Nichols2013-03-112-9/+9
| | | | | | | | | | | | | | | | This also prevents anything meaningful from working, but it is a good starting point. Change-Id: Idaf495ec29f611ee5342c79318bc3ace1d852747 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1957-75/+80
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/doc/qtmultimedia.qdocconf src/plugins/blackberry/mediaplayer/bbmetadata.cpp src/plugins/blackberry/mediaplayer/bbmetadata.h tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
| * Merge branch 'release' into stableSergio Ahumada2013-01-292-0/+5
| |\ | | | | | | | | | Change-Id: If07e76a0f2f46d6dc50a41441324f02393e17d01
| | * Add virtual destructors to two classes with other virtualsThiago Macieira2013-01-252-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Classes with virtuals are used polymorphically (why have virtuals otherwise?), so they need virtual destructors to be deleted properly. Unless they are never deleted using objects of those two classes -- but why have the interface in the first place if that's the case? This is binary incompatible change. It was agreed upon in the mailing list. Change-Id: I697e4bd53251452a0e6b0c09edd08c4835f90cbd Discussed-on: http://lists.qt-project.org/pipermail/development/2012-December/008908.html Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-175-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed \snippet paths - Minor language edits - Removed unnecessary multiple page commands in a single comment block. For example, \fn and \qmlsignal in a single comment block is not allowed. Such instances must be documented in separate comment blocks. Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> (cherry picked from commit 51334d299520118bbbc077696ca589f972a2f2ea)
| * | Doc: Fix module name formatSze Howe Koh2013-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtMultimedia -> Qt Multimedia (Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5) Change-Id: I3c23435d5eceb946ea320756b835da937726db24 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Doc: Fixed random QDoc warningsVenugopal Shivashankar2013-01-155-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed \snippet paths - Minor language edits - Removed unnecessary multiple page commands in a single comment block. For example, \fn and \qmlsignal in a single comment block is not allowed. Such instances must be documented in separate comment blocks. Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19 Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Update copyright year in Digia's license headersSergio Ahumada2013-01-1057-57/+57
| |/ | | | | | | | | | | Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Reduce MinGW64-warnings about mixerID.Friedemann Kleint2013-02-142-6/+8
| | | | | | | | | | | | | | warning: cast to pointer from integer of ifferent size. Change-Id: I4294fe7b67c56d1eca59f81c3af26919ad5089a8 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Fix signature of the waveInProc/waveOutProc callbacks.Friedemann Kleint2013-02-144-4/+4
| | | | | | | | | | | | | | | | | | Parameters are DWORD_PTR instead of DWORD, which did not matter on 32bit but caused MinGW64-compiler warnings and potential crashes on 64bit. Change-Id: I840ae3ea7ea532746f73f20b3233cae842931d45 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2828-112/+0
|/ | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Remove comma at the end of the enumThiago Macieira2012-12-281-1/+1
| | | | | | | Required for public header cleanliness Change-Id: I2641fd085071b2a69806e8622c7c35be74f744b1 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Doc: Replace outdated macroChristian Stenger2012-12-071-1/+1
| | | | | Change-Id: I9bc0f8a077e60ede0ac1b6852b66d33143eed5a3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix syncqt-warnings.Friedemann Kleint2012-11-1912-40/+40
| | | | | | | Use include with module name for the multimedia-classes. Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix a possible crash in QSoundEffect.Robin Burchell2012-11-091-1/+3
| | | | | | | | | | pa_stream_cork may fail, and pa_operation_unref won't handle that gracefully, so check the return value before unreffing. Done-with: Vesa-Matti Hartikainen Change-Id: If789e37a13f85487c79dd8a03a7ca3624b1412d2 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Enable the "#include <QMultimedia>" camel-case headerSze Howe Koh2012-11-0610-10/+10
| | | | | | | | | | | | Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have sync.profile generate the camel-case header during compilation. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-062-2/+2
| | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-2528-56/+0
| | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Id24056c0afd013904b1e098dc49e502038fd77a4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-10-171-1/+1
| | | | | | Change-Id: I5783b1f6dce645fb473e7d3da0911dbb40e3951b Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix compilation with stock MinGW.Friedemann Kleint2012-10-173-8/+27
| | | | | | | | | | Use qt_windows.h, provide interfaces and UIDs missing in stock MinGW. Task-number: QTBUG-23829 Change-Id: I79ed902bb7636c751df7607f6059a7de237acb31 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Export QAudioHelperInternal symbolsKevin Ottens2012-10-081-1/+1
| | | | | | | They can be useful to some of the audio plugins. Change-Id: I10856c104770ed57c72b674829e3922b5067a822 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Don't add the beginning of the file to the end of the last periodKevin Ottens2012-10-081-2/+3
| | | | | | | | | | If we're in the last loop, it is not necessary to provide a full period on read. Just provide the remaining of the data and hit the end of the stream by returning less than requested, otherwise we potentially generate some garbage noise. Change-Id: I9d3a632ddc0c3289957c9f876d5dbe2999b50ebd Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2457-1368/+1368
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix some failing QAudioInput integration tests on OSX.Michael Goddard2012-08-034-14/+73
| | | | | | | | | | | | This also meant implementing software volume support, and since this is the last backend to do so, make that interface pure virtual again. In some cases the test needed tweaks. Change-Id: Ie429863f187b43802cdd4f16d841929e0cb0e729 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added check to qsound and qsoundeffect unit tests for audio supportKurt Korbatits2012-08-031-0/+5
| | | | | | | | - skip tests if QSoundEffect::supportedMimeTypes() returns empty list Change-Id: I0f8d6f854c46b74f8518c4d969bd31ea167d20b2 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-271-1/+2
| | | | | | | | | -New qdoc command \qmltype replaces \qmlclass -\instantiates <C++ class> for determining if the QML type has a C++ implementation Change-Id: I83d1e2c3f376f96ea51afedadf88c3cf478e33d8 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Replace QSoundEffect backend using qmedia with qaudiooutput implementationKurt Korbatits2012-07-265-293/+494
| | | | | | | | | - Use backend built on QAudioOutput - Fixed unit test so backend will pass Change-Id: I2f2a7d8bf382127c5a5c333d6e36c79169754b4e Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* Volume control for QAudioInput windows backend.Lev Zelenskiy2012-07-262-0/+115
| | | | | Change-Id: I1245a38c68254fc48373a856dc44e8ad8142636e Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Added check to alsa backend for QAudioOutputKurt Korbatits2012-07-261-0/+5
| | | | | | | | - Was asserting when stop() called when in IdleState Change-Id: Ib8a5bd149c0b9c700c709520cf8ffdd237e08694 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* Fixed docs for QAudioInput::bufferSize and setBufferSizeAli Akhtarzada2012-07-241-2/+2
| | | | | | | | | | Change milliseconds to bytes Task-number: QTBUG-26600 Change-Id: I861ae9c35ddc52d58ed95a2148f72d6476f35522 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added volume control for QAudioOutput & QAudioInput (alsa)Kurt Korbatits2012-07-1710-10/+252
| | | | | | | | | | | | QTBUG-25454 - Added update to docs on volume control. - Added internal volume adjustment for alsa implementation. - Enabled float sample option in QAudioDeviceInfo (alsa). Change-Id: I6b89fc8beb457d71be9ad71b538c86a008570f07 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* Fix some QAudioInput errors on OSX.Michael Goddard2012-07-161-10/+36
| | | | | | | | Default buffer size wasn't always calculated correctly, and the timer used in push mode was sometimes incorrect. Change-Id: Ic31b9d16e16e4c25a5ebfc302590829e179a96bf Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fixed error in qaudioinput alsa backend for invalid format.Kurt Korbatits2012-07-161-2/+2
| | | | | | | | QTBUG-26523 - Was QAudioOutput. Changed to QAudioInput. Change-Id: I04f7d38af5cb67c420adef188b81b237b6e06b97 Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
* Clarify API/docs by introducing the audio "frame", and add helpers.Michael Goddard2012-07-115-71/+206
| | | | | | | | | | | The frame is the interleaved set of one sample for each channel. Add some docs and some methods that make working with samples a bit more convenient. Adjusted QAudioBuffer to use these helper functions and terminology. Change-Id: I96db48e659561972d6de2aa19893d29f9a828cd3 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Update ALSA device enumeration to return all devicesMithra Pattison2012-07-101-12/+5
| | | | | | | | | | Previously, if a device was marked as "Default Audio Device" then only this device would be returned during device enumeration. Now it returns all devices, with the default device placed first. Task-number: QTBUG-22103 Change-Id: I1705415bf6b58ff046c4d2812107b46b76500001 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Delete obsolete class methods and update related codeMithra Pattison2012-07-1017-175/+108
| | | | | | | | Delete obsolete methods from QAudioFormat and QAudioDeviceInfo and update code that relied on the obsolete methods. Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Allow frequences up to 96000 in QAudioInput win32 backend.Lev Zelenskiy2012-06-271-1/+1
| | | | | | | QTBUG-26102 Change-Id: I1c594f7df4aea2292045e1e96f58926d97bcfd82 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Clean buffers before closing the input device.Lev Zelenskiy2012-06-271-6/+7
| | | | | | | | | Input device handle is invalid after waveInClose() QTBUG-24119 Change-Id: I8276e56766684efd26b78dc019ff871ebac28408 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added support for big endian data to QAudioOutput win32 backend.Lev Zelenskiy2012-06-261-0/+25
| | | | | | | | Convert data from big endian to little endian. QTBUG-19881 Change-Id: If62a69b79c01d66536010b3326a86df8ca5f83b0 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* fix bogus conditionalOswald Buddenhagen2012-06-251-1/+1
| | | | | | | | | | | this code meant (alsa && linux) || openbsd || freebsd, which is presumably not what was meant. but the os test seems rather pointless in the first place, so just remove it. Change-Id: I2591c9307ab9d6e821625b24797259ed60e9a082 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* switch to new-style configure testsOswald Buddenhagen2012-06-251-2/+2
| | | | | Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix QAudioOutput volume on OSX.Michael Goddard2012-06-202-0/+29
| | | | | | Change-Id: I142ca638d3dc0839f7c5b103f03edac6715a0bb6 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* fix volume handling on WindowsMaurice Kalinowski2012-06-202-0/+25
| | | | | | | | | | | volume handling for QAudioOutput is broken currently as it fallbacks to the default implementation. Need to cache the volume, as hWaveOut is invalid while the output is not in active state. Task-number: QTBUG-25454 Change-Id: I2adb28a5e6719a5d3c360553abd70af46b646080 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* QIODevice* is used, but QIODevice was never declaredThiago Macieira2012-06-191-1/+1
| | | | | | | | After I made qpair.h no longer include qdatastream.h, which included qiodevice.h. Change-Id: Icae2b466e022d3394ce5cafceeb4ea6601f6d33f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix a number of other qdoc issues.Michael Goddard2012-06-155-181/+332
| | | | | | | | | | | | | | * Several places needed the forward class declaration hack * Missing/wrong minor version numbers on imports * A few typos * Any number of attempts to work around qdoc * A few missing docs * Tweaked soundeffect docs Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff Reviewed-by: Peter Yard <peter.yard@nokia.com> Reviewed-by: Angus Cummings <angus.cummings@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Fix build on Windows with new qdatetime.h that doesn't redefine min/maxSimon Hausmann2012-06-132-0/+4
| | | | | | | | | | Windows system header files redefine min/max, unless NOMINMAX is defined. In some cases we can simply include qt_windows.h, which does the trick, in other cases including qt_windows.h produces different compilation errors and it's simpler to just do the NOMINMAX trick. Change-Id: I3cf81bab7c239363adfa274f158bdf999d1d3ecd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Clarify documentation about QAudioDecoder::read and blocking.Michael Goddard2012-06-131-5/+10
| | | | | | | | | It doesn't block - not safe to implement in all cases. Applications can implement blocking semantics based on their usage of event loops or threads. Change-Id: If9a6b1ae7014df63a43989c4940524bc5eaae383 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 23:21:35 +0000