summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Michael Goddard [Wed, 31 Aug 2011 07:37:58 +0000 (17:37 +1000)]
Move the backend specific documentation into a nicer place.
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>
Ling Hu [Mon, 15 Aug 2011 01:17:23 +0000 (11:17 +1000)]
Fix a playback bug for mediaplayer windows media foundation backend
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>
Gareth Stockwell [Mon, 1 Aug 2011 10:17:29 +0000 (11:17 +0100)]
Fixed directshow config test
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>
Gareth Stockwell [Wed, 27 Jul 2011 12:44:37 +0000 (13:44 +0100)]
Fixed a typo in the WMF backend which caused a compilation failure
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>
Ling Hu [Wed, 27 Jul 2011 07:41:25 +0000 (17:41 +1000)]
fix a spelling error
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>
Ling Hu [Wed, 27 Jul 2011 00:26:59 +0000 (10:26 +1000)]
Fix config.tests for directshow backend.
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>
Ling Hu [Wed, 27 Jul 2011 00:22:19 +0000 (10:22 +1000)]
Fix the config.tests for WMF backend.
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>
Michael Goddard [Mon, 26 Sep 2011 04:17:32 +0000 (14:17 +1000)]
Merge branch 'camera' of ssh://codereview.qt-project.org:29418/qt/qtmultimediakit
Conflicts:
src/imports/multimedia/multimedia.cpp
src/imports/multimedia/multimedia.pro
Change-Id: I9d4bc1aa65f89ac24dd12c1e2c21a02f49913e13
Michael Goddard [Fri, 23 Sep 2011 07:49:49 +0000 (17:49 +1000)]
Move resource policy usage to a config test.
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>
Michael Goddard [Thu, 22 Sep 2011 05:03:51 +0000 (15:03 +1000)]
Clean some doc warnings.
Change-Id: I9cadc589a02bbc4804d2d21ab30752af375ef89c
Reviewed-on: http://codereview.qt-project.org/5348
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Michael Goddard [Thu, 22 Sep 2011 04:27:31 +0000 (14:27 +1000)]
Add QT_BEGIN/END_HEADER things, plus QT_MODULE thing.
Change-Id: I1a5f51a659175cadadcdaf0c4e5e9048f98e64e0
Reviewed-on: http://codereview.qt-project.org/5346
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Gunnar Sletta [Wed, 21 Sep 2011 07:11:43 +0000 (09:11 +0200)]
Fix widget dependencies for multimediawidget tests and examples.
Change-Id: I9c7600ce2cf7980f923ba038ef122b49add24c37
Reviewed-on: http://codereview.qt-project.org/5286
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Thu, 22 Sep 2011 02:28:40 +0000 (12:28 +1000)]
Remove older QGLContext calls in favour of new QOpenGLContext.
Change-Id: I2669f48ebac5c14f5aaf85135f3d0adbf541d877
Reviewed-on: http://codereview.qt-project.org/5339
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Ling Hu [Thu, 8 Sep 2011 07:15:15 +0000 (17:15 +1000)]
Don't re-set default properties in MediaBase::componentComplete
This is to avoid conflicting with state restore from background playback.
Change-Id: Idc5440b55a27bb5c5109717f405591e934bbedbc
Reviewed-on: http://codereview.qt-project.org/4397
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Gunnar Sletta [Tue, 20 Sep 2011 05:28:19 +0000 (07:28 +0200)]
add QT+=widgets for tests to run
Change-Id: Idccbb5429f1f081d815b4596f0cf0f74c1160f5c
Reviewed-on: http://codereview.qt-project.org/5188
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
dakovaci [Thu, 15 Sep 2011 06:39:19 +0000 (16:39 +1000)]
Added basic radio system tests
Change-Id: I6f3ef3e3c9f1bb851c2d9f9cbad1aea1df77004f
Reviewed-on: http://codereview.qt-project.org/4945
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie
dakovaci [Thu, 15 Sep 2011 06:38:05 +0000 (16:38 +1000)]
Added basic camera system tests
Change-Id: I39cefa9207bf45d57cb735cb1a7335b9153d79ee
Reviewed-on: http://codereview.qt-project.org/4944
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie
dakovaci [Thu, 15 Sep 2011 06:36:13 +0000 (16:36 +1000)]
added basic video system tests
Change-Id: I89cadef1249296c834c4a612f5885439986ff1dc
Reviewed-on: http://codereview.qt-project.org/4943
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daron Andrew Edie
dakovaci [Thu, 15 Sep 2011 06:18:11 +0000 (16:18 +1000)]
Added basic audio system tests
Change-Id: Ib3cec8adc4cba80a9e91d6fd90c607e99a197c0c
Reviewed-on: http://codereview.qt-project.org/4942
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
Reviewed-by: Daron Andrew Edie
Dmytro Poplavskiy [Wed, 14 Sep 2011 02:31:24 +0000 (12:31 +1000)]
Camerabin backend: fixed compilation without X11
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>
Gunnar Sletta [Wed, 14 Sep 2011 13:35:32 +0000 (15:35 +0200)]
Compile with refactor
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>
Lasse Holmstedt [Tue, 13 Sep 2011 11:18:52 +0000 (13:18 +0200)]
Build fix after refactor
Change-Id: I2de40846fc7402ddf32259d42a486a74330ff626
Dmytro Poplavskiy [Thu, 25 Aug 2011 04:05:10 +0000 (14:05 +1000)]
QML Camera element redesign.
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>
Michael Goddard [Mon, 5 Sep 2011 06:13:46 +0000 (16:13 +1000)]
Split some of the autotests into widget and non widget parts.
Since the tests are mostly not widget based.
Change-Id: Ic3fa4224b19f2a5c710fd4763b5e645252975c1c
Reviewed-on: http://codereview.qt-project.org/4174
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Michael Goddard [Tue, 6 Sep 2011 01:48:41 +0000 (11:48 +1000)]
Silly defs file error.
Change-Id: Ic4c128b6c410701092848048982a8e82a5c58b88
Reviewed-on: http://codereview.qt.nokia.com/4224
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Mon, 5 Sep 2011 01:24:06 +0000 (11:24 +1000)]
Fix some compiler warnings.
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>
Michael Goddard [Mon, 5 Sep 2011 00:53:41 +0000 (10:53 +1000)]
Clean up the autotest pro files to remove warnings about private headers
Since the tests are bound to a version it's unnecessary.
Change-Id: I7884615179157caa3836face22a4aa431ee5c425
Reviewed-on: http://codereview.qt.nokia.com/4155
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Ling Hu [Thu, 25 Aug 2011 07:43:31 +0000 (17:43 +1000)]
Add background audio element.
Change-Id: I64c91beb7219cc148efc606e87e5f6e57b4b55ce
Reviewed-on: http://codereview.qt.nokia.com/3574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Fri, 2 Sep 2011 02:40:56 +0000 (12:40 +1000)]
Mark a few tests as insignificant on QPA.
Running with QPA minimal isn't enough for a lot of the video related
tests, and in some cases the backing store code crashes.
Change-Id: I7a09c244fb856397a60c53388b22c3e141737a66
Reviewed-on: http://codereview.qt.nokia.com/4106
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Ling Hu [Thu, 25 Aug 2011 05:50:48 +0000 (15:50 +1000)]
Add QMediaBackgroundPlaybackControl interface
Allows some media service backend to provide the ability to can play media in the background while the application is terminated.
Change-Id: Ia5e751367f6d6ea6847c3c873b45df5f971557e2
Reviewed-on: http://codereview.qt.nokia.com/3561
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Jonas Rabbe [Wed, 31 Aug 2011 21:44:46 +0000 (07:44 +1000)]
Added tune up and down methods, and changed name of scan methods.
Instead of requiring developers using the radio API to read the
frequency step, adding it to the current frequency and setting the
new frequency, there has been added tuneUp and tuneDown methods.
Also, the searchBackward and searchForward methods have been renamed
to scanDown and scanUp which seem more logical. And cancelSearch
has become cancelScan.
Change-Id: Ib9ff61c0f58163039f41f045037cb9a11b37a59e
Reviewed-on: http://codereview.qt.nokia.com/4013
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>
Jonas Rabbe [Wed, 31 Aug 2011 03:09:47 +0000 (13:09 +1000)]
Merge branch 'radio' into 'master'
Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
Jonas Rabbe [Tue, 30 Aug 2011 00:46:19 +0000 (10:46 +1000)]
Added QML API for getting the limits for a specific radio band.
Using properties for the frequency step, minimum and maximum
frequency of the currently selected band.
Also updated the declarative-radio example to use the minimum
and maximum frequencies to show a tuner band for the radio.
Change-Id: I9f28f10e98e008c14b10bdc12b0727086cd45f0b
Reviewed-on: http://codereview.qt.nokia.com/3829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Michael Goddard [Tue, 30 Aug 2011 04:42:21 +0000 (14:42 +1000)]
Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
Dmytro Poplavskiy [Thu, 25 Aug 2011 03:56:05 +0000 (13:56 +1000)]
Fixed crash when QCameraImageCapture is deleted before QMediaRecorder.
Change-Id: I3bbb87f03f122378e9367e1f2c0cc5b61fce6ed7
Reviewed-on: http://codereview.qt.nokia.com/3550
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Dmytro Poplavskiy [Thu, 25 Aug 2011 02:31:00 +0000 (12:31 +1000)]
Fixed crash when QMediaObject is deleted before QMediaRecorder.
Change-Id: I8a1674b6f3d2b2c9ab888facff21f94af41b81de
Reviewed-on: http://codereview.qt.nokia.com/3544
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Jonas Rabbe [Fri, 26 Aug 2011 00:59:19 +0000 (10:59 +1000)]
Introduction of fake radio backend to enable testing the radio APIs
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>
Michael Goddard [Thu, 25 Aug 2011 07:12:05 +0000 (17:12 +1000)]
Split the unit tests for widgets up as well.
Currently there seem to be some unit tests that should not depend
on widgets, so they'll have to be cleaned up later.
Change-Id: I30adc4accb3ecce86a6fe7a2fd69d3862f325a41
Reviewed-on: http://codereview.qt.nokia.com/3569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
Dmytro Poplavskiy [Thu, 25 Aug 2011 06:18:50 +0000 (16:18 +1000)]
Dropped Incandescent white balance mode.
It's the same as Tungsten, was inittialy added by mistake.
Change-Id: Idf1d7be2f8d0969bba3480a8702034b7cabfdaef
Reviewed-on: http://codereview.qt.nokia.com/3563
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Fri, 22 Jul 2011 05:49:38 +0000 (15:49 +1000)]
Try to move widget/gvitem code into new QtMultimediaKitWidgets lib.
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>
Dmytro Poplavskiy [Fri, 12 Aug 2011 01:52:47 +0000 (11:52 +1000)]
Ported gstreamer camera backend from camerabin to camerabin2.
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>
Jonas Rabbe [Fri, 12 Aug 2011 03:41:39 +0000 (13:41 +1000)]
Added first implementation of declarative radio element
Simply uses and mirrors radio tuner API directly.
Also added an example which uses the new Radio element,
the example should be functional, but cannot be tested on
current setup (lack of actual radio tuner).
Change-Id: I0f724ef239f65aef9c0640d4a3a9fa0d2e7242ed
Reviewed-on: http://codereview.qt.nokia.com/2890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Dmytro Poplavskiy [Mon, 8 Aug 2011 05:57:32 +0000 (15:57 +1000)]
Initial implementation of QML2 VideoOutput element
Change-Id: I5ed00433fe5e993086ae1698b7344c8d60a5f0f6
Reviewed-on: http://codereview.qt.nokia.com/2727
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Dmytro Poplavskiy [Tue, 2 Aug 2011 04:33:38 +0000 (14:33 +1000)]
Gstreamer media backend cleanup.
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>
Jason McDonald [Thu, 4 Aug 2011 07:56:29 +0000 (17:56 +1000)]
Replace outdated license headers.
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>
Michael Goddard [Thu, 4 Aug 2011 06:38:42 +0000 (16:38 +1000)]
Mark a few tests as "not autotests".
So "make check" doesn't find them, since they are more system tests
than automatic unit tests (since they access the real MM backends).
Change-Id: I3322b4206bce16a97c28753b80c0ed5dc0bb250e
Reviewed-on: http://codereview.qt.nokia.com/2599
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Jonas Rabbe [Tue, 2 Aug 2011 00:28:46 +0000 (10:28 +1000)]
Fixed compile error on Mac OS X Lion, missing include statement.
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>
Michael Goddard [Thu, 28 Jul 2011 00:54:22 +0000 (10:54 +1000)]
Fix the module.pri file.
Should have QT_CONFIG+=multimediakit, not DEFINES.
Change-Id: I72fcca770286f99c8711bd047e615d6e0e08d61f
Reviewed-on: http://codereview.qt.nokia.com/2311
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Michael Goddard [Mon, 25 Jul 2011 05:02:51 +0000 (15:02 +1000)]
API unit tests from Maemo API test team.
A large number of tweaks and changes to original tests, and refactor
a lot of the mock backends to reduce duplication.
Changed viewfinder test case to use mock service and provider so
that it matches the image capture test case.
Reviewed-by: Jonas Rabbe
(cherry picked from commit
e40bef5508a4165cec4a46b97115aed461027fa5)
Also licence header fix:
(cherry picked from commit
e9ee9e8c48b45b97d62ee4a82e400fa9d8ea8107)
Change-Id: Ic59891d75563bb2e008a336eea859e8c44d8d831
Reviewed-on: http://codereview.qt.nokia.com/2078
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Michael Goddard [Mon, 25 Jul 2011 06:45:09 +0000 (16:45 +1000)]
Add Windows Media Foundation backend for QMediaPlayer
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>
Dmytro Poplavskiy [Wed, 20 Jul 2011 00:45:06 +0000 (10:45 +1000)]
Gst backend: Fixed deadlock when pipeline is stopped during prerolling.
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>
Ling Hu [Tue, 28 Jun 2011 04:04:24 +0000 (14:04 +1000)]
Add some debug output in QMediaPlayer gstreamer backend for convenience
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>
Ling Hu [Tue, 19 Jul 2011 00:50:41 +0000 (10:50 +1000)]
Fix for QTMOBILITY-1772 VideoWidget example crash on windows
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>
Michael Goddard [Tue, 19 Jul 2011 05:51:43 +0000 (15:51 +1000)]
Add the configuration tests.
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>
Jonas Rabbe [Thu, 21 Jul 2011 23:01:06 +0000 (09:01 +1000)]
Blacklisted auto test for QSoundEffect
Change-Id: Ia42fc8f10530f8d9b885d2de2c927b6ea6189b57
Reviewed-on: http://codereview.qt.nokia.com/1998
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
hawcroft [Thu, 21 Jul 2011 06:58:06 +0000 (16:58 +1000)]
Add install rule for plugins
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>
Jonas Rabbe [Thu, 21 Jul 2011 06:08:00 +0000 (16:08 +1000)]
Temporarily removed include statements to disabled headers
Change-Id: I6810cadd68cb9567cb116242b32b3ae766d4aca6
Reviewed-on: http://codereview.qt.nokia.com/1916
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Thu, 21 Jul 2011 03:51:16 +0000 (13:51 +1000)]
Remove the QtQuick1 stuff from Audio.
Change-Id: I82f0c62bc524d6e8903528ed673e0c4880c4b60d
Reviewed-on: http://codereview.qt.nokia.com/1911
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Rohan McGovern [Wed, 20 Jul 2011 23:36:12 +0000 (09:36 +1000)]
Fixed compile; removed useless use of qRound with integers
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>
Jonas Rabbe [Wed, 20 Jul 2011 05:48:47 +0000 (15:48 +1000)]
Changed assert to match uri syntax for Qt 5 declarative modules
Change-Id: I27e125694b1d1830db8039d1188c79cd8d6ccb29
Reviewed-on: http://codereview.qt.nokia.com/1861
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Mon, 18 Jul 2011 07:21:00 +0000 (17:21 +1000)]
Remove most of the "mobility" references.
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>
Jonas Rabbe [Tue, 19 Jul 2011 04:09:22 +0000 (14:09 +1000)]
Fixed a hang of the QAudioOutput auto test on Mac OS X
Task-number: QTMOBILITY-1779
Change-Id: If4141ed848dd0475b0008ec85daba55fa5f086b3
Reviewed-on: http://codereview.qt.nokia.com/1805
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Tue, 19 Jul 2011 00:40:05 +0000 (10:40 +1000)]
Remove a few more obsolete parts.
Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Michael Goddard [Mon, 18 Jul 2011 00:32:16 +0000 (10:32 +1000)]
Remove some obsolete bits.
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>
Michael Goddard [Fri, 15 Jul 2011 05:49:49 +0000 (15:49 +1000)]
Prepare for QtQuick2 based declarative elements.
Disable the QDeclarativeItem based components until they are ported
to scenegraph, and bump the revision to 4.0 (Once things are final,
we can make it 5.0).
Change-Id: Ib9c064722b80c38e711fbadc66966597c14a2b1a
Reviewed-on: http://codereview.qt.nokia.com/1685
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Michael Goddard [Mon, 11 Jul 2011 07:51:25 +0000 (17:51 +1000)]
Add missing autotest.
The QSoundEffect test was missing in the initial modularization.
Change-Id: I92ba5290b28a4af3a1d4bd8f8a036e14a75cf8d1
Reviewed-on: http://codereview.qt.nokia.com/1400
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Tue, 12 Jul 2011 07:09:15 +0000 (17:09 +1000)]
Move the QtMultimedia spectrum demo to QtMultimediaKit
Change-Id: I60d7897eb84dfbe2ce5af5adeb23b33270aa7d7c
Reviewed-on: http://codereview.qt.nokia.com/1483
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
J-P Nurmi [Wed, 13 Jul 2011 08:45:03 +0000 (10:45 +0200)]
Fixed build break
QDeclarativeItem and QDeclarativeView was moved from QtDeclarative
to QtQuick1, also added qtquick1 module to the .pro file for
the declarative camera example.
Change-Id: Iae0828871d94d5f424b5329664303e2c0b9539bf
Reviewed-on: http://codereview.qt.nokia.com/1559
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Jonas Rabbe [Tue, 12 Jul 2011 03:22:06 +0000 (13:22 +1000)]
Moved demo(s) to examples.
Demos are no longer part of QT_BUILD_PARTS, so any demos must be moved
to examples to be build. So far that means the player demo.
Change-Id: I92641be38accb1c1b723009f1004c63f59ec8266
Reviewed-on: http://codereview.qt.nokia.com/1470
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Jonas Rabbe [Tue, 12 Jul 2011 00:29:49 +0000 (10:29 +1000)]
Use correct varible name in targets for imports
Change-Id: Id00af5516c49f9dbf6128919114b33120b00d173
Reviewed-on: http://codereview.qt.nokia.com/1469
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Michael Goddard [Mon, 11 Jul 2011 08:12:28 +0000 (18:12 +1000)]
Use the correct qmake variable for enabling private tests.
Change-Id: Iaa5b3be70f3eb459c6bca2364e5c1d20f8952bb8
Reviewed-on: http://codereview.qt.nokia.com/1403
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Michael Goddard [Mon, 11 Jul 2011 08:10:04 +0000 (18:10 +1000)]
Add gui to the Qt prereqs.
Until we don't need it anymore.
Change-Id: I8a87a8c238d79e4e6ccd30846d0c140abc7c0085
Reviewed-on: http://codereview.qt.nokia.com/1402
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Jyri Tahtela [Thu, 7 Jul 2011 13:21:09 +0000 (16:21 +0300)]
Update licenseheader text in source files for qtmultimediakit Qt module
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>
Alan Alpert [Thu, 7 Jul 2011 08:01:20 +0000 (18:01 +1000)]
Update sync.profile dependencies to new syntax
%dependencies now has a simpler format of gitmodule => %gitref instead
of using qt modules and keywords.
Change-Id: I785f30e24e0a793218e2e307bdde56067760c51c
Reviewed-on: http://codereview.qt.nokia.com/1281
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jonas Rabbe [Tue, 5 Jul 2011 04:18:51 +0000 (14:18 +1000)]
Fixed up examples and demos
Changed the .pro files and moved some things around to ensure that the
examples and demos for Qt Multimedia Kit compiles and can be checked by
the CI system.
Change-Id: I915dc38ca76a97f20949df715725659c603231e2
Reviewed-on: http://codereview.qt.nokia.com/1136
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Jonas Rabbe [Thu, 30 Jun 2011 04:35:59 +0000 (14:35 +1000)]
Stay away from unnecessary code paths if the movie is 0 (NULL)
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
Ling Hu [Tue, 28 Jun 2011 03:49:57 +0000 (13:49 +1000)]
Fix playback problem with RTSP streaming for QMediaPlayer(gstreamer)
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>
Michael Goddard [Mon, 27 Jun 2011 02:00:33 +0000 (12:00 +1000)]
Two minor static analysis issues.
Reviewed-by: Jonas Rabbe
(cherry picked from commit
f8d04d717d3d7d5d2f73cc3e8a4245130fcf600a)
Change-Id: I3b12fd3a42d16730df3fe1277ba6821b5c2ef960
Reviewed-on: http://codereview.qt.nokia.com/982
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
Kalle Lehtonen [Thu, 9 Jun 2011 06:24:01 +0000 (16:24 +1000)]
QMediaPlayer autotest tests for OpenMAX AL even OpenMAX AL is not present
The test is missing #ifdef around OpenMAX AL section.
Change-Id: I0d395f8cfd72cbccf7de894dd43e64e0afbeb289
Task-number: QTMOBILITY-1657
(cherry picked from commit
e6b684de322c55a75aa6d46bd6db785705775a15)
Reviewed-on: http://codereview.qt.nokia.com/977
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
Kalle Lehtonen [Thu, 9 Jun 2011 06:15:56 +0000 (16:15 +1000)]
Fix for QPainterVideoSurface autotest
Autotest missing related OpenGL defines compared to the library.
Task-number: QTMOBILITY-1662
Change-Id: I2e417865a633058bb67ee30c07be53bab049bea6
(cherry picked from commit
68ef2e67968f4887a2d83e37f89f827d5ce36788)
Reviewed-on: http://codereview.qt.nokia.com/976
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
Dmytro Poplavskiy [Fri, 10 Jun 2011 05:45:42 +0000 (15:45 +1000)]
Harmattan resource policy bug workaround for QCamera
Task-number: 264400
Reviewed-by: Michael Goddard
(cherry picked from commit
505db43a64aa765dfaabb8e0463eff3c26895bdb)
Change-Id: I9b73b0e3751debedcf2929a0aaa431b3bd08c20e
Reviewed-on: http://codereview.qt.nokia.com/975
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard
Dmytro Poplavskiy [Fri, 10 Jun 2011 04:50:33 +0000 (14:50 +1000)]
Gst player backend: increased network timeout.
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
Dmytro Poplavskiy [Thu, 9 Jun 2011 02:52:13 +0000 (12:52 +1000)]
Disabled alsa on maemo devices.
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
Jonas Rabbe [Fri, 1 Jul 2011 07:06:20 +0000 (17:06 +1000)]
Temporarily disabled demos, examples, and some tests
Want to make QtMultimediaKit finally integrate. Disabled some
tests and ensured that tests depending on private interfaces
are only built if these interfaces are enabled.
Change-Id: I65f0ff5ea23d704cf3c2626fe4191d7d6460e46f
Reviewed-on: http://codereview.qt.nokia.com/992
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Michael Goddard [Wed, 29 Jun 2011 04:23:41 +0000 (14:23 +1000)]
Remove Symbian packaging information.
Needs to be redone/done differently, anyhow.
Michael Goddard [Wed, 29 Jun 2011 03:38:46 +0000 (13:38 +1000)]
Initial copy of QtMultimediaKit.
Comes from original repo, with SHA1:
2c82d5611655e5967f5c5095af50c0991c4378b2