summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Initial implementation of Mac camera backendDmytro Poplavskiy2012-08-2727-0/+3009
| | | | | | | Based on AVFoundation framework Change-Id: If4cfd105a592f50b42606624548b9ffc870e3e47 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Re-enabled CIImage based gfx video item on MacDmytro Poplavskiy2012-08-274-8/+11
| | | | | | | | | Also prefer CoreImageHandle to GLTextureHandle in QuickTime player backend, to avoid unnecessary copy via FBO. Change-Id: Id5aa039c438378b7bbf816b7845b05574683c471 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* make use of QT_PRIVATE to specify private Qt dependenciesOswald Buddenhagen2012-08-111-7/+5
| | | | | Change-Id: I339de1ebc3cde795a3b4a258f3899bd5658a1f54 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-113-3/+3
| | | | | Change-Id: I6fd02095b9c75952c689b2c55aec9c71b39aadd3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove the WA_PaintOnScreen widget attribute for vide widgetsLars Knoll2012-08-081-1/+0
| | | | | | | | | This attribute doesn't quite do what it used to do in Qt 4.x anymore, and will lead to Qt not painting the video at all. Change-Id: I2338815756cab82ae152058ff5a7b5f14e07001e Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* qt_module is deprecated, use qt_build_configOswald Buddenhagen2012-08-061-1/+1
| | | | | | Change-Id: Idbc3c1d35b859317ac1128c4dc3754996e816911 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Change the way camera format is selected.Lev Zelenskiy2012-08-061-20/+36
| | | | | | | | | | | Build list of supported formats before starting directshow graph. Select first available format supported by both device and surface. Force DirectShow to do color space conversion instead of using QImage. Change-Id: I8f946cc7c2693eea0135981e899003b453bd8784 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.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>
* Use moniker display name for device string.Lev Zelenskiy2012-08-034-148/+92
| | | | | | | | Moniker names are unique, while device friendly names are not. Change-Id: Ic3e842e49d04c502cf5ad1fc40f89db657f0401a Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Ling Hu <ling.hu@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>
* The qt quick imports are build only if qtdeclarative is presentCorentin Jabot2012-08-021-8/+11
| | | | | | | | | If the declarative module is not present, the qtquick/qml plugins in the imports directory will not be build Change-Id: I2393b8302f75cbb94d3a85bd70f575817a0a3c34 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add a missing include for Q_MULTIMEDIA_EXPORTThiago Macieira2012-08-022-0/+2
| | | | | | | The macro is gone from qglobal.h. Change-Id: I41c66f61f47ec9e824c3637c7748796df2309d66 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Use QStandardPaths instead of QDesktopServicesThiago Macieira2012-08-022-4/+4
| | | | | | | | | The use of QDesktopServices for getting paths is deprecated in favour of QStandardPaths. Change-Id: I93c4a15dd65962d668c90e78f3f33f357e2450bb Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-011-0/+2
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I9589f57998af237f2e89c7799789dae5a13ef634 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Blackberry: Assert that we are in detached stateThomas McGuire2012-07-301-0/+3
| | | | | Change-Id: I744d542374c72318b548407cd3da084449822e92 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix spurious position udpates in playlistsThomas McGuire2012-07-301-1/+6
| | | | | Change-Id: I2652cab793034e55a4eb7e52bb534c22983d9517 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix playlists not advancing to the next track.Thomas McGuire2012-07-301-2/+4
| | | | | | | | | | The playlist watches for state changes to the EndOfMedia state, which wasn't used in the plugin yet. Change-Id: Ib2a014177df2273cd46baaef1392a73e54daf06c Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix playback from certain URLsThomas McGuire2012-07-302-27/+43
| | | | | | | | Previously, playback from URLs of the form "file:path/to/file" did not work. Change-Id: Iecd293d09f7c448438dbf259710c0aab218c2591 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fixed: use selected audio input device.Lev Zelenskiy2012-07-301-1/+1
| | | | | | Change-Id: I6bde75bff93160169f9c28ad658db40b03c266f4 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Audio probes for AudioCapture plugin.Lev Zelenskiy2012-07-306-3/+206
| | | | | | Change-Id: Iea37d455ee53c9d055af4f9ca62d8a9ea241d31f Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Fix a few header style violations.Michael Goddard2012-07-306-3/+9
| | | | | | | | Missing Q_MODULE or using moc keywords. Change-Id: I3cb21799488c6f57c45d8e32862a49fadd083b99 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Blackberry: Fix case of setting multiple media filesThomas McGuire2012-07-282-3/+12
| | | | | | | | | | Abort the singleshot timer when the media is changed, as otherwise continueLoadMedia() was called multiple times. Also, don't use a singleshot timer when setting a null media. Change-Id: I19d4838c9c70e7fcaa790c223cb19ac3e0246e6b Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix metadata reader for more recent OS versionsThomas McGuire2012-07-281-1/+6
| | | | | | Change-Id: I33dae07736eb071f9db3e08c5342921a655ddd57 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-2722-24/+47
| | | | | | | | | -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>
* Fixed QDoc errors related to snippets and quotefromfile commandsVenugopal Shivashankar2012-07-269-14/+18
| | | | | Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427 Reviewed-by: Jerome Pasion <jerome.pasion@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>
* Moved doc under src to fall in-line with the new modular structureVenugopal Shivashankar2012-07-2563-0/+4564
| | | | | Change-Id: Ia2933baa1f0eaf82b5c2a626cb3661ee087049e3 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Moved the C++ module page from qtdocVenugopal Shivashankar2012-07-251-0/+45
| | | | | Change-Id: Ib4b3dbe48053532abc31d294f328d21e01047bb5 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix compilation issue with MinGW (disables the usage of strsafe.h).Lukas Geyer2012-07-251-0/+4
| | | | | | | | | | | Recent versions of MinGW include strsafe.h in dshow.h. strsafe.h undefines all non-safe string functions, including vsprintf and others, to prevent their usage. This causes QString and others to fail. Defining NO_DSHOW_STRSAFE before including dshow.h prevents this behaviour. Change-Id: I012fecbabc5c11900486c1dfdc970a00613ef6f7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Mark QtMultimediaQuickTools library as internal.Stephen Kelly2012-07-241-0/+1
| | | | | | | | | | It does not install useful public headers (and those that it does install are installed to QtMultimediaQuick_p). This causes the avoidance of creation of CMake files. Change-Id: I7360f9c8e4b203ce0573c1cbfcc87d326e8f0d2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Blackberry: Compile with lastest event filter API changesThomas McGuire2012-07-242-69/+51
| | | | | | Change-Id: I4eb7ddf050cd8ef34df4547482f53f7372584221 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: David Faure <faure@kde.org>
* Replaced endpoint control with audio input and output controlsDmytro Poplavskiy2012-07-2426-285/+506
| | | | | Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91 Reviewed-by: Michael Goddard <michael.goddard@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>
* Fixed the QDoc errors related to \qmlproperty usageVenugopal Shivashankar2012-07-242-2/+2
| | | | | | Change-Id: Ie4d5f8698fe8a1a774fd8f0bb127c20fc63a14e3 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added volume property to QMediaRecorderDmytro Poplavskiy2012-07-1912-4/+113
| | | | | Change-Id: I19f727107651c9f640ca1c010a3764f05aef8820 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst player backend: removed fifo based stream playback fallbackDmytro Poplavskiy2012-07-193-137/+5
| | | | | | | | | | It was used on systems without appsrc element support, but since the appsrc is part of base elements for a long, thre is a very little value in fifo based fallback. Change-Id: I162233cbb55821443c892f00ebd29c0498ae7152 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed the playbackStateChanged signal from Video elementDmytro Poplavskiy2012-07-191-9/+0
| | | | | | | It conflicts with Video.playbackState property notifications Change-Id: I47901547e9db6f2b71e25c05ca8ce24c402eb5a2 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Videoprobe implementation for wmf backend.Lev Zelenskiy2012-07-199-9/+1139
| | | | | | Change-Id: Ia597af428764229a76c0059ae7a57eb302aee63d Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix QQuickCanvas renames.Toby Tomkins2012-07-181-2/+2
| | | | | | | | This is required because of name changes to QtDeclarative in the commit feb996e3ab44e68082c97102556ea396f5df3f44. Change-Id: Ia40b1ea1cf3b3cb5225b7678077b627b74c47132 Reviewed-by: Alan Alpert <alan.alpert@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>
* Fix for broken QML multimedia import on windowsMithra Pattison2012-07-162-9/+4
| | | | | | | | | | | Changed qtmultimediaquicktools into a module so that it gets installed to the bin directory. This allows the declarative_multimedia library to locate it during the 'import multimedia' process. Task-number: QTBUG-25984 Change-Id: I559469170bc713fb31633917bcbc210f862660cf Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Camerabin camera service: configure default video settingsDmytro Poplavskiy2012-07-168-24/+107
| | | | | | | | | encodebin doesn't like the encoding profile with ANY container caps, if container and codecs are not specified try to find a commonly used supported combination Change-Id: Icbde042bd17d9682112fb8bbb8f0d506f6ddebe1 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Updated the camerabin2 based camera with QtMultimedia changesDmytro Poplavskiy2012-07-1643-190/+746
| | | | | | | | | | | | | | Moved it to the separate plugin as the rest of gstreamer based services; Updated with libqgsttools_p changes; Implemented QMediaRecorder::status property; Made gst_photography dependency optional, it's not always available on desktop; Added video recording case to auto integration test; Moved backend implementation into qt namespace Task-number: QTBUG-26046 Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0 Reviewed-by: Michael Goddard <michael.goddard@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>
* Fix a crash problem in AudioEngine due to class name change.Ling Hu2012-07-131-1/+1
| | | | | Change-Id: I18a831ffc692b5aa6de6e2626f0dc916eb57c8b7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Update the export macros in qtmultimedia.gitThiago Macieira2012-07-111-18/+2
| | | | | | | Use the new, simpler QT_STATIC macro. Change-Id: Ia3271a437ed76f54971444f6e73e54dbc416d483 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* use centralized qml plugin project handlingOswald Buddenhagen2012-07-113-95/+5
| | | | | | Change-Id: If9561a27d9b96d020e2ffcf2dcc6deedb4d89e4a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>