summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Disabled alsa on maemo devices.Dmytro Poplavskiy2011-07-051-1/+1
| | | | | | | | | | Reviewed-by: Michael Goddard (cherry picked from commit f13421482c5a4d0bf6e20d96517060c5ff2c6785) Change-Id: I43bceede31026353108ca9eefc251520257cca4e Reviewed-on: http://codereview.qt.nokia.com/973 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Goddard
* Initial copy of QtMultimediaKit.Michael Goddard2011-06-29450-0/+89563
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2