summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix config.testMichael Goddard2011-10-251-1/+1
| | | | | | | | Using "this" in non member function, oops. Change-Id: I7cda3eea755099af2ff2df7b777e3e228e53e325 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Don't ignore debug plugins on Mac when release plugins aren't availableRohan McGovern2011-10-251-5/+26
| | | | | | | | | | Previously, we unconditionally ignored any plugins whose names ended with _debug.dylib. This makes the mediaservice plugins unusable on Mac if Qt is configured to build plugins as debug-only (which is incidentally the default). Change-Id: I5a8981b2251e803fa233b74c968f6eaa452d367c Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* We already have a mock backend.Michael Goddard2011-10-2510-1185/+0
| | | | | | Change-Id: Ic4f9277c4c4bff225ac6cd70d28b495a42435e35 Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Declare these metatypes.Michael Goddard2011-10-256-5/+6
| | | | | Change-Id: I5b10669f2b17f67d95469dc28e99822d7f08280c Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Adapt to QtDeclarative api renaming (QSG --> QQuick)Kent Hansen2011-10-243-8/+8
| | | | | Change-Id: Iefee24c6262679263caef1976d0d9af541834ea0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed compile; QDesktopServices -> QStandardPathsRohan McGovern2011-10-241-2/+2
| | | | | | | Broken by qtbase dfa24768a3243eda68d91f573050bf23f96da2dd. Change-Id: Ie0d79eaee5c6fedfaacae69800f6aec9190f83db Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added RDS functionality to the QRadioTuner/QDeclarativeRadioSami Nurmenniemi2011-10-2133-10/+2076
| | | | | | Change-Id: I865e3caba82977002cf1f01f1d64ee0a42de77c6 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Limit the sequential bytes skipping to a max 16kB at a time.Michael Goddard2011-10-211-1/+1
| | | | | | | | | Otherwise QIODevice::read will try and allocate whatever junk is passed in, so a corrupt chunk can result in 1GB+ allocations which are never actually used. Change-Id: I1ea4a5c1a5d21b1ee6f7e428105c52c0ee6ca7f7 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix debug output test - type is qreal, so can be float or double.Michael Goddard2011-10-211-0/+4
| | | | | Change-Id: Ica34e3076b186c4e4af4492722c1fe00445d3184 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Added testcase to qcamerabackend test CONFIGDmytro Poplavskiy2011-10-201-0/+1
| | | | | | | To ensure the test case is installed. Change-Id: I959a1d73e3d8c913c4f15bb9e12b663ca4fb0343 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fixed build problems with QuicktimeJonas Rabbe2011-10-204-5/+5
| | | | | | | | | | Because the Q_WS_* defines were removed, the Quicktime backend stopped working. Replacing them with Q_OS_* works. Additionally, the Quicktimer Player Service has to depend on QtWidgets. Change-Id: I687b352191c38a91edaaf2a687ac13ed118fcf88 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Doc: Add ability to generate documentation for the module.Jerome Pasion2011-10-175-0/+309
| | | | | | | | -Added targets so that "make docs" will generate the documentation. Change-Id: I16a74d7e15e12df16570f110c7e67a110d53afad Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Init mediaobject at classBegin rather than componentCompleteLing Hu2011-10-171-7/+9
| | | | | | | | | | | | Since we use an explicit backgroundaudio class, there is no need to wait for other property to determine the mediaobject type. So it is better to init the mediaobject at classBegin to prevent being accessed before mediaobject initialized. Change-Id: Ia55b8b4c1ab70cc0acbf6f49bcb3e20bdb813a88 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Make the C++ API of QSoundEffect public.Michael Goddard2011-10-178-22/+12
| | | | | | | | | The QML API already was. The C++ API still needs good documentation, though. Change-Id: I669f5ec7dd17d616788d71d77dc906acc0c0279f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Declarative VideoOutput: added support for more rgb formats.Dmytro Poplavskiy2011-10-145-163/+294
| | | | | | | | | | RGB 565, RGB 32 and BGR 32 formats added, all of them supported with OpenGL ES. Change-Id: I026628611c59575af5934bac0a5f95dfbc6770cb Reviewed-on: http://codereview.qt-project.org/6644 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Copied ALSA config test into QtMultimedia moduleJonas Rabbe2011-10-144-1/+65
| | | | | | | | | | The config test which still exists in QtBase should be removed at a later date, together with pulseaudio and gstreamer config tests. Change-Id: I4bea45ab69d1bac10814fc60ecf24dbc859b0f20 Reviewed-on: http://codereview.qt-project.org/6643 Reviewed-by: Ling Hu <ling.hu@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Make sure this library gets installed.Michael Goddard2011-10-141-0/+2
| | | | | | Change-Id: I6b556b3b22deae002d2d2cf47680f23e207b5d00 Reviewed-on: http://codereview.qt-project.org/6639 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix qwavedecoder test data deployment on deviceKalle Juhani Lehtonen2011-10-131-4/+3
| | | | | | | | | | | - Device deployment changed to use DEPLOYMENT instead of INSTALLS for test data files - Test data deployment target fixed to go under binary installation directory instead of the build directory Change-Id: I4b0007f9309767083a4a5dfa6f3dc26f3c36c330 Reviewed-on: http://codereview.qt-project.org/6573 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Multimedia: Compile on Windows.Friedemann Kleint2011-10-1225-58/+60
| | | | | | | | | | | MSVC is more strict about #include <> and #include "". Reviewed-by: Ling Hu <ling.hu@nokia.com> Change-Id: I8973d7b2717d892407ad93785f92a64b05bdb6b5 Reviewed-on: http://codereview.qt-project.org/6134 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Moved general gstreamer helper classes into separate library.Jonas Rabbe2011-10-1237-75/+278
| | | | | | | | | | Cleaned up configuration of gstreamer with a separate config test. Change-Id: I1ec9ee466233687fbcfdc544a12d9fce578e4379 Reviewed-on: http://codereview.qt-project.org/6459 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed a couple of failing auto tests.Jonas Rabbe2011-10-123-3/+3
| | | | | | | | | | | | | | | | QDeclarativeAudio test is using a fake backend initialised to a specific volume. The test was testing against a different volume. QMediaPlayerWidgets was trying to include QApplication, but from the wrong place and was not including QtWidgets module. Change-Id: I5ca108a040a4f4bd0d7550268f3a4ef5d790e755 Reviewed-on: http://codereview.qt-project.org/6458 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Tests should not be unconditionally excluded.Jonas Rabbe2011-10-121-1/+2
| | | | | | | | Change-Id: I3910a03e5c2231f91b84b368339948fbca750f28 Reviewed-on: http://codereview.qt-project.org/6399 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add QNAM tests to wavedecoder as well, to simulate slow sources.Michael Goddard2011-10-112-1/+71
| | | | | | | Change-Id: Ic65659bfdf72aea2cea5ae97de50a1e661db189b Reviewed-on: http://codereview.qt-project.org/6404 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Rename the parsing error signal to parsingError.Michael Goddard2011-10-115-32/+40
| | | | | | | | | Refactor the error handling code a little. Change-Id: I717b3aaacb24660b3f26769f19ac718b73106473 Reviewed-on: http://codereview.qt-project.org/6401 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Fix the wavedecoder a little.Michael Goddard2011-10-1118-56/+131
| | | | | | | | | | | Handle RIFX and corrupted files better. Update the autotest so that it is run properly (and copies files properly in shadow build). Fix the gendata script to properly create testdata. Change-Id: I47b705507bebaef54df2835ec767c6b220c64678 Reviewed-on: http://codereview.qt-project.org/6380 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* tests: eliminated usage of qttest_p4.prfRohan McGovern2011-10-111-4/+3
| | | | | | | Change-Id: I45f6c818c9dbdcf37c9f5f382b42da9c69618311 Reviewed-on: http://codereview.qt-project.org/6382 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* only corrupt 'data' descriptor nothing elsehawcroft2011-10-111-0/+0
| | | | | | | Change-Id: I5640d13e8c893152e449d348f8bf6c45b899b44d Reviewed-on: http://codereview.qt-project.org/6283 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* tests: eliminated usage of qttest_p4.prfRohan McGovern2011-10-1043-104/+129
| | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Change-Id: I3f49fd3b79899eff1d6ad9458143f34419026276 Reviewed-on: http://codereview.qt-project.org/6286 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Auto test for private class QWaveDecoderhawcroft2011-10-1021-0/+337
| | | | | | | Change-Id: I50ffbc3187ae7d7a7623af3ef7d3fed2975bdbbe Reviewed-on: http://codereview.qt-project.org/6270 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Sanity-Review: Michael Goddard <michael.goddard@nokia.com>
* bail out in case of missing descriptorshawcroft2011-10-101-3/+4
| | | | | | | | Change-Id: I7c231367a4b5ef2d15fd1a7af2c2a6c1d51c9460 Reviewed-on: http://codereview.qt-project.org/6279 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Improve video test coverage and debugging output.Michael Goddard2011-10-0710-150/+465
| | | | | | | | | | | Added a few debug operators for some useful enums, and added tests for them. One or two other features not really tested. Change-Id: Idffec6ade1d4e05dbf72f3dc47dfc0d01ddddf8b Reviewed-on: http://codereview.qt-project.org/6201 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-07395-3095/+1400
| | | | | | | | | | There are a few legacy bits left in place so it passes CI, and then qt5.git etc can be updated. Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a Reviewed-on: http://codereview.qt-project.org/5368 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add a new servicename for background mediaplayerLing Hu2011-09-301-0/+7
| | | | | | | | Change-Id: I40b3670462f0b865a9e64bd2abd6d6a01db01e80 Reviewed-on: http://codereview.qt-project.org/4492 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Update background audio element to use new service nameLing Hu2011-09-303-4/+6
| | | | | | | | Change-Id: I8f0480e4fb40b034f75dcd900f2d440fd0e7610d Reviewed-on: http://codereview.qt-project.org/4493 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Update audiooutput example with volume sliderhawcroft2011-09-282-0/+26
| | | | | | | | | Update example for new volume API Change-Id: I1b9ccbccc62930549e667f0063b3d76feb23a2ea Reviewed-on: http://codereview.qt-project.org/5662 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Add QAudioOutput volume API and pulseaudio backend implementation.hawcroft2011-09-286-1/+93
| | | | | | | Change-Id: I70784e8d17522a23f6467713d58384b30557694b Reviewed-on: http://codereview.qt-project.org/5663 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Fakeradio: emit signal when scanning abortedJonas Rabbe2011-09-271-1/+4
| | | | | | | | | | | | | Patch from Sami Nurmenniemi. Emits searchingChanged(false) when scanning is aborted because it was initiated too close to the limits of the frequency range. Change-Id: I15a1334c8a7058dd8eb413c2742f8f12aed7bed5 Reviewed-on: http://codereview.qt-project.org/5570 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Gst player backend: don't show the first frame when resuming playback.Dmytro Poplavskiy2011-09-274-3/+55
| | | | | | | | | | | | | | | It's necessary to temporarily disable show-preroll-frame of video sink, load pipeline to paused state, seek to requested position, and after seeking is finished (position updated) playback is started with show-preroll-frame restored. Task-number: MOBILITY-3030 Reviewed-by: Jonas Rabbe Change-Id: Ide1e6d909dd53f670229c293bc6be496a54e8626 (cherry picked from commit 625cce87e28fc7b5ec8785824affb3129fd3607b) Reviewed-on: http://codereview.qt-project.org/5500 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Needs widgets module to build.hawcroft2011-09-271-1/+1
| | | | | | | Change-Id: I95ba0c64843bfcdfc9797c4d818ac17606e4a1d3 Reviewed-on: http://codereview.qt-project.org/5563 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Fix a few QT_BEGIN/END_HEADER pairs.Michael Goddard2011-09-274-2/+12
| | | | | | | Change-Id: Ie723af34680222b939aeb0179df21d63cec3cf3b Reviewed-on: http://codereview.qt-project.org/5514 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove QApplication usage - it's in QCoreApplication.Michael Goddard2011-09-261-2/+1
| | | | | | | Change-Id: I0c1fab0c0eea56f1ecb141d6238acdf2778c82d8 Reviewed-on: http://codereview.qt-project.org/5513 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
* Move the backend specific documentation into a nicer place.Michael Goddard2011-09-2630-137/+164
| | | | | | | | | | | | | We really don't need to bore the 99.9% of people who won't care. And it's certainly not more important than camera. Reviewed-by: Derick Hawcroft (cherry picked from commit 51e3a1bc45ffc2688fcd3949216aedda4c41bf81) Change-Id: I8add47e42c2c06bf5e16f406604a19531af6901e Reviewed-on: http://codereview.qt-project.org/5501 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix a playback bug for mediaplayer windows media foundation backendLing Hu2011-09-263-5/+14
| | | | | | | | | | | | Task-number:QTMOBILITY-1606 Reviewed-by:Jonas Rabbe (cherry picked from commit d5426bf52e19c9c6a52837b423f48024979ea076) Change-Id: Ie7c1c90a8f5a64e77c435ffc1917d8f9638dfff3 Reviewed-on: http://codereview.qt-project.org/5499 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed directshow config testGareth Stockwell2011-09-261-0/+6
| | | | | | | | | | | | | | | | | | In some versions of Microsoft Windows SDK v6.0A, the qedit.h header is present, but dxtrans.h (which is #included by qedit.h) is missing. The standard workaround for this issue is already used by plugins/multimedia/directshow/camera/dscamerasession.h; this commit adds the same workaround to the config test. Reviewed-by: Michael Goddard Reviewed-by: Ling Hu (cherry picked from commit e3c07dc9dd6a9f7930ca3c61cfd667d816731ce1) Change-Id: Ia53c4f6b3efc86e2447a39e6d95e7f67d7e46b5d Reviewed-on: http://codereview.qt-project.org/5498 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed a typo in the WMF backend which caused a compilation failureGareth Stockwell2011-09-261-2/+1
| | | | | | | | | | Reviewed-by: trustme (cherry picked from commit 7eab979c41513321518d5e3cea6d142bbf4e58d9) Change-Id: I9cd5de907867ea6561c568d10c88e3bf5a701509 Reviewed-on: http://codereview.qt-project.org/5496 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* fix a spelling errorLing Hu2011-09-261-1/+1
| | | | | | | | | Change-Id: Ic593f342055a4ff65503bd92236ff2904012d4f4 Reviewed-by:Michael Goddard (cherry picked from commit d9cd5386f6d9aa1c702424d272d70a0b45a6b9db) Reviewed-on: http://codereview.qt-project.org/5495 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix config.tests for directshow backend.Ling Hu2011-09-261-0/+1
| | | | | | | | | | | | | directshow camera backend requires header qedit.h(currently removed since Windows SDK v7.0), so if there is only Windows SDK v7.0, directshow backend should be disabled, since the directshow mediaplayer will also be replaced by wmf backend. Change-Id: I0de60fdcb683a57cc0aa3570f769179afc0c581b Reviewed-by:Michael Goddard (cherry picked from commit 68d78008f9d1eb82de673b8f4c8e73bdde2150c2) Reviewed-on: http://codereview.qt-project.org/5494 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix the config.tests for WMF backend.Ling Hu2011-09-261-0/+4
| | | | | | | | | | | | Windows SDK v7.0 is required to compile the WMF backend, so add additional check for MENonFatalError. Change-Id: I3edb86b8132b8022b30c02ea6289f617aadfc683 Reviewed-by: Michael Goddard (cherry picked from commit b738126352e5d914ea366b2725b72e2306b39ee2) Reviewed-on: http://codereview.qt-project.org/5493 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Merge branch 'camera' of ↵Michael Goddard2011-09-2616-963/+2322
|\ | | | | | | | | | | | | | | | | | | ssh://codereview.qt-project.org:29418/qt/qtmultimediakit Conflicts: src/imports/multimedia/multimedia.cpp src/imports/multimedia/multimedia.pro Change-Id: I9d4bc1aa65f89ac24dd12c1e2c21a02f49913e13
| * QML Camera element redesign.Dmytro Poplavskiy2011-09-1216-960/+2320
| | | | | | | | | | | | | | | | | | | | Grouped camera properties in a similar way to C++ QCamera API. Added support for video recording. Change-Id: I8667dc90878b3e20eda5523ba562f5687bd0932b Reviewed-on: http://codereview.qt-project.org/3552 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 12:19:56 +0000