summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Remove widgets config test.Michael Goddard2012-01-118-12/+12
| | | | | | | | | Since it's not guaranteed that other Qt modules will be built by the time qmake is run (and config.tests are created) we can't rely on compilation. Just check the module.pri variable for widgets instead. Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add the spot for spot metering mode.Michael Goddard2012-01-062-1/+19
| | | | | | | Not yet fully documented in QML - needs a bit of an overhaul first. Change-Id: Ic11684858fb872d0b4dcedf60b390571371db252 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Properly handle the case where QtWidgets is not available.Michael Goddard2012-01-0630-101/+135
| | | | | | | | | | | | | | | It does use a config test for now, just to make it clearer. The Mac backend currently requires widgets, but most of the others should work without it (just not supporting QVideoWidget/WindowControl). The QVideoDeviceControl interface was modified to remove the QIcon usage - it was never implemented. Unfortunately even the QML examples need widgets for the wrapper application, and will need to be ported to QtGui based wrapper. Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0628-28/+28
| | | | | Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QtMultimedia: Fix compiler warnings.Friedemann Kleint2012-01-051-1/+1
| | | | | | | | | | | - Fix deprecated QDeclarative includes. - Comment out unused parameter. - Remove trailing comma from enumeration value (Clang) Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Change-Id: I31d54a12505f4e3a48eb4b7736a48d5dacc2c0d9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix readyChanged signal emit in gstreamervideorendererMithra Pattison2011-12-211-6/+5
| | | | | | | | | | Modified handling of source update in gstreamervideorenderer as the existing logic meant that it would never emit the readyChanged signal. Change-Id: I0a1488cfc151388fe0145d231001e502e9f45f0e Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
* Fix X11 and QPA compilation problemsJonas Rabbe2011-12-1310-50/+38
| | | | | | | | | The X11 buffer pool was using outdated APIs, and as the 'qpa' configuration value is being removed, it caused the X11 code to be pulled in, and therefore cause compilation failures. Change-Id: I5fdaed854c6525716fccca44b5fbd0b850880cb9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed QtMultimedia core namespace compilation.Toby Tomkins2011-11-2533-38/+108
| | | | | Change-Id: Ie276a7766bd26f3e49b2bc9c1a28ec96f1e3e4b0 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* If we fail to connect to pulse, don't enumerate sinks or sources.Michael Goddard2011-11-241-3/+5
| | | | | | | | Otherwise the pulse client library dislikes having methods called with a null context. Change-Id: I96629065b7a0e36e0d10402526cb167e65458e27 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add cap on internal read/write buffer for QAudioOuput(PA)Ling Hu2011-11-151-1/+1
| | | | | | | cap set to no more than 5x period size Change-Id: If3ae244993a8929832f6724c386dac6f12ef0f03 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add additional protection on the write size in QAudioOuput(pulseaudio)Ling Hu2011-11-141-0/+5
| | | | | | | | | Check and cap the write size in pull mode to handle the case where user returned an invalid write size through QIODevice Change-Id: Ie0610a63f1d5400fba87f32a99bdc38479e0e7e8 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Fix pullmode data lost problem in QAudioOutput(pulseaudio)Ling Hu2011-11-092-42/+36
| | | | | | | | | | | At each userFeed, m_bytesAvailable is not updated properly in pullmode, so the pull data size become irrelevent to the size we can actually write. This problem is fixed by checking the actual writable size each time before pulling the data and limit the size of the pulled and written data. Change-Id: I6f53e6348693ddf4e3c79e90d3c3d0c1ffc713aa Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> 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>
* 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-218-9/+419
| | | | | | Change-Id: I865e3caba82977002cf1f01f1d64ee0a42de77c6 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@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>
* Moved general gstreamer helper classes into separate library.Jonas Rabbe2011-10-1232-2397/+29
| | | | | | | | | | 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>
* Rename QtMultimediaKit to QtMultimedia.Michael Goddard2011-10-0742-330/+327
| | | | | | | | | | 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 QAudioOutput volume API and pulseaudio backend implementation.hawcroft2011-09-282-1/+56
| | | | | | | 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>
* 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 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>
* Move resource policy usage to a config test.Michael Goddard2011-09-263-9/+6
| | | | | | | | | MeeGo uses this too. Change-Id: I0b7ec00538289d4a3beea62da08233c0d1eb45a2 Reviewed-on: http://codereview.qt-project.org/5447 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Camerabin backend: fixed compilation without X11Dmytro Poplavskiy2011-09-171-0/+3
| | | | | | | | | Disable video widget and overlay controls on systems without X11 Change-Id: I0163fa83018b35ba6f0f8221ad3c465506b52d00 Reviewed-on: http://codereview.qt-project.org/4850 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
* Compile with refactorGunnar Sletta2011-09-1720-22/+22
| | | | | | | Change-Id: I248f811a13ca00ccbf5d342a556d389bca625856 Reviewed-on: http://codereview.qt-project.org/4940 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Build fix after refactorLasse Holmstedt2011-09-136-6/+6
| | | | Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
* Fix some compiler warnings.Michael Goddard2011-09-056-3/+17
| | | | | | | | | Mostly about deprecated ASCII casts. Change-Id: I70428913799c15f20a1a5f80be57848e1072e058 Reviewed-on: http://codereview.qt.nokia.com/4158 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Merge branch 'radio' into 'master'Jonas Rabbe2011-08-318-1/+772
|\ | | | | | | Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
| * Introduction of fake radio backend to enable testing the radio APIsJonas Rabbe2011-08-268-1/+772
| | | | | | | | | | | | | | | | | | | | | | | | | | Includes some behavior for all standard methods. Also fixes a typo in qradiotunercontrol.h and a couple of minor bugs in the radio example that came to light using this new backend. Change-Id: I65b8b8715a46f0fd702f9630ea81f7d5df527055 Reviewed-on: http://codereview.qt.nokia.com/3619 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakitMichael Goddard2011-08-3034-959/+818
|\ \ | | | | | | | | | Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
| * | Ported gstreamer camera backend from camerabin to camerabin2.Dmytro Poplavskiy2011-08-2419-795/+608
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ieb08df492e7b9cbfe35e93a056685cfdac6e704e Reviewed-on: http://codereview.qt.nokia.com/2994 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
| * | Gstreamer media backend cleanup.Dmytro Poplavskiy2011-08-0520-164/+210
| |/ | | | | | | | | | | | | | | | | | | | | Moved controls specific bus/sync messages handling from player/camera/capture session to corresponding controls. Reviewed-by: Michael Goddard Change-Id: Ieb67976ed335b0ef1cde87dc60e8ad8da3409526 Reviewed-on: http://codereview.qt.nokia.com/2535 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* | Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.Michael Goddard2011-08-253-3/+3
| | | | | | | | | | | | | | Change-Id: I522b3e6d4465c6c5cce2483676e09320176837d6 Reviewed-on: http://codereview.qt.nokia.com/2665 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* | Replace outdated license headers.Jason McDonald2011-08-0520-342/+346
|/ | | | | | | Change-Id: Icbdd1bdae223192465b8c84faeb99b01be154275 Reviewed-on: http://codereview.qt.nokia.com/2605 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed compile error on Mac OS X Lion, missing include statement.Jonas Rabbe2011-08-041-1/+2
| | | | | | | | | | Also, don't try and build the quicktime/CG bits on QPA for now, since that really doesn't seem to work. Change-Id: If88b94bae3c092f2480318fa169250c03de44784 Reviewed-on: http://codereview.qt.nokia.com/2545 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add Windows Media Foundation backend for QMediaPlayerMichael Goddard2011-07-2525-1/+6744
| | | | | | | | | | | | Task-number:QTMOBILITY-1606 Reviewed-by: Michael Goddard (cherry picked from commit bdf3a9b39661cfb836245139d02e95e854646a7e) (cherry picked from commit 8d2370953eb32bf44a037244e0d9f9b484875f7a) Change-Id: I07790b8c540a04e4e19a3d018a4884a773e980bf Reviewed-on: http://codereview.qt.nokia.com/2086 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Gst backend: Fixed deadlock when pipeline is stopped during prerolling.Dmytro Poplavskiy2011-07-252-7/+27
| | | | | | | | | | | | | | | | | | | | Waiting for start() to be invoked in the main thread may block if gstreamer blocks the main thread until this call is finished. This situation is rare and usually caused by setState(Null) while pipeline is being prerolled. The proper solution to this involves controlling gstreamer pipeline from other thread than video surface. Currently start() fails if wait() timed out. Task-number: QTMOBILITY-1663 Reviewed-by: Michael Goddard Change-Id: Ib95e589a814e53efb9b4c454ef9f233658ff8c6a (cherry picked from commit ac9762e2dbc06d696c6c74825ee22ac1fc176d9c) Reviewed-on: http://codereview.qt.nokia.com/2073 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add some debug output in QMediaPlayer gstreamer backend for convenienceLing Hu2011-07-251-0/+53
| | | | | | | | | Change-Id: I5c4beec63ededc39bda7ae69dce721d118921b83 Reviewed-by: Michael Goddard (cherry picked from commit 3119b89f549b2fc03a213c355323b1ef31aa20e9) Reviewed-on: http://codereview.qt.nokia.com/2072 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix for QTMOBILITY-1772 VideoWidget example crash on windowsLing Hu2011-07-251-3/+4
| | | | | | | | | | | | The surface format stride calculation in directshow backend is wrong which results in memory access violation. Change-Id: I80da5affc9a727513bad9c8d74a9f49d0c1a6c0d Task-number:QTMOBILITY-1772 Reviewed-by:Michael Goddard (cherry picked from commit 0b010e781634d3b33750fcead445fc7bd3a6f828) Reviewed-on: http://codereview.qt.nokia.com/2070 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Add the configuration tests.Michael Goddard2011-07-254-6/+6
| | | | | | | | | | Add the list of tests to sync.profile, and make sure each test only happens on the platforms it's intended for. Change-Id: Id022a6b85b349f4a8a649d3449b622e4ada7f4f4 Reviewed-on: http://codereview.qt.nokia.com/1910 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Add install rule for pluginshawcroft2011-07-217-0/+21
| | | | | | | Change-Id: Icd204cd7eb53af73fcaec3af41b4881592e0d044 Reviewed-on: http://codereview.qt.nokia.com/1919 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed compile; removed useless use of qRound with integersRohan McGovern2011-07-211-1/+1
| | | | | | | | | | | qRound of an integer type never made sense. Since 2dcd3939a8bd5ff743e4c87f87b2d81b1a101467 in qtbase, it won't compile any more. Change-Id: Ia30334bc92236d0fef9b6ac99d65bae4fe79dc57 Reviewed-on: http://codereview.qt.nokia.com/1905 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove most of the "mobility" references.Michael Goddard2011-07-19241-244/+244
| | | | | | | | | Docs still need some fixing, but there are some legitimate usages of it there. Change-Id: I94c7b68788ce97829711a4384884d7e52fe84162 Reviewed-on: http://codereview.qt.nokia.com/1736 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Remove some obsolete bits.Michael Goddard2011-07-18214-43767/+14
| | | | | | | | | They can be updated again later when things are more stable, if needed. Change-Id: I73bdacdd3d1fd43a60cd3a0c14b925fa9c32ee27 Reviewed-on: http://codereview.qt.nokia.com/1724 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
* Update licenseheader text in source files for qtmultimediakit Qt moduleJyri Tahtela2011-07-08420-7152/+7152
| | | | | | | | Replace old license header with correct one. Change-Id: Ibff8fbea6595bb80f1122d55db2194accd319308 Reviewed-on: http://codereview.qt.nokia.com/1318 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Stay away from unnecessary code paths if the movie is 0 (NULL)Jonas Rabbe2011-07-051-0/+2
| | | | | | | | | | | | | | | When closing a QT7PlayerSession, it sets the movie to 0. There is no need to check if a NULL movie supports the core pixel formats, and that check lead to a segmentation fault with QtSDK 1.1.1. Task-number: QTMOBILITY-1746 Reviewed-by: Dmytro Poplavskiy (cherry picked from commit b5d9964aab96ef1a02ca1af411178f05c42c2bf8) Change-Id: I7cdddbd8fc1b8d8d667747aec3567aeb857accd6 Reviewed-on: http://codereview.qt.nokia.com/984 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard
* Fix playback problem with RTSP streaming for QMediaPlayer(gstreamer)Ling Hu2011-07-053-3/+34
| | | | | | | | Change-Id: Ie920cbb5a377e810aee3e106bb50deb46365ce3b Reviewed-by:Michael Goddard (cherry picked from commit 05841ae6a9e0ffac623f9b00565bf33a52a22ecd) Reviewed-on: http://codereview.qt.nokia.com/983 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Gst player backend: increased network timeout.Dmytro Poplavskiy2011-07-051-4/+5
| | | | | | | | | | | | | 5 seconds timeout is to short, increased to 30 seconds. Task-number: MOBILITY-3013 Reviewed-by: Michael Goddard (cherry picked from commit cf230f948de63c7755c7759b3e14a02ad14cb185) Change-Id: I41d62ac1ed15f2c09af6fd804723096996d16139 Reviewed-on: http://codereview.qt.nokia.com/974 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 08:48:04 +0000