Commit Graph

649 Commits

Author SHA1 Message Date
Dmytro Poplavskiy
37b872da9e Initial implementation of Mac camera backend
Based on AVFoundation framework

Change-Id: If4cfd105a592f50b42606624548b9ffc870e3e47
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2012-08-27 09:11:06 +02:00
Dmytro Poplavskiy
09a7fda971 Re-enabled CIImage based gfx video item on Mac
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>
2012-08-27 07:59:42 +02:00
Oswald Buddenhagen
f46383d440 make use of QT_PRIVATE to specify private Qt dependencies
Change-Id: I339de1ebc3cde795a3b4a258f3899bd5658a1f54
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-11 13:31:15 +02:00
Oswald Buddenhagen
2a8577d732 follow rename of qt_module_config.prf to qt_module.prf
Change-Id: I6fd02095b9c75952c689b2c55aec9c71b39aadd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-11 13:31:12 +02:00
Lars Knoll
aeb8cfe2a2 Remove the WA_PaintOnScreen widget attribute for vide widgets
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>
2012-08-08 15:49:16 +02:00
Oswald Buddenhagen
921397e695 qt_module is deprecated, use qt_build_config
Change-Id: Idbc3c1d35b859317ac1128c4dc3754996e816911
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-08-06 04:02:29 +02:00
Lev Zelenskiy
eedfcdacce Change the way camera format is selected.
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>
2012-08-06 04:02:04 +02:00
Michael Goddard
d67f9dba56 Fix some failing QAudioInput integration tests on OSX.
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>
2012-08-03 07:05:40 +02:00
Lev Zelenskiy
42cdb92543 Use moniker display name for device string.
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>
2012-08-03 06:01:13 +02:00
Kurt Korbatits
a6e88ea87f Added check to qsound and qsoundeffect unit tests for audio support
- 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>
2012-08-03 04:11:48 +02:00
Corentin Jabot
86553ef811 The qt quick imports are build only if qtdeclarative is present
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>
2012-08-02 07:29:41 +02:00
Thiago Macieira
07c581a52c Add a missing include for Q_MULTIMEDIA_EXPORT
The macro is gone from qglobal.h.

Change-Id: I41c66f61f47ec9e824c3637c7748796df2309d66
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-08-02 07:28:56 +02:00
Thiago Macieira
78f4577a2d Use QStandardPaths instead of QDesktopServices
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>
2012-08-02 07:28:40 +02:00
Thiago Macieira
8e49af7ef5 Set the Qt API level to compatibility mode in all tests.
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>
2012-08-01 22:27:40 +02:00
Thomas McGuire
cfa44b12be Blackberry: Assert that we are in detached state
Change-Id: I744d542374c72318b548407cd3da084449822e92
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-07-30 15:28:36 +02:00
Thomas McGuire
5ce50b5fc7 Blackberry: Fix spurious position udpates in playlists
Change-Id: I2652cab793034e55a4eb7e52bb534c22983d9517
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-07-30 15:27:31 +02:00
Thomas McGuire
637768d019 Blackberry: Fix playlists not advancing to the next track.
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>
2012-07-30 15:27:15 +02:00
Thomas McGuire
37ee0912d6 Blackberry: Fix playback from certain URLs
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>
2012-07-30 15:27:06 +02:00
Lev Zelenskiy
d272782da9 Fixed: use selected audio input device.
Change-Id: I6bde75bff93160169f9c28ad658db40b03c266f4
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-07-30 08:05:49 +02:00
Lev Zelenskiy
8b9b5ba637 Audio probes for AudioCapture plugin.
Change-Id: Iea37d455ee53c9d055af4f9ca62d8a9ea241d31f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-07-30 08:05:44 +02:00
Michael Goddard
802176ea8d Fix a few header style violations.
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>
2012-07-30 08:05:40 +02:00
Thomas McGuire
dfb2493aa2 Blackberry: Fix case of setting multiple media files
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>
2012-07-28 17:21:43 +02:00
Thomas McGuire
93823c2251 Blackberry: Fix metadata reader for more recent OS versions
Change-Id: I33dae07736eb071f9db3e08c5342921a655ddd57
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-07-28 13:05:30 +02:00
Jerome Pasion
011e151c4e Doc: Changed \qmlclass to \qmltype and added \instantiates
-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>
2012-07-27 14:56:32 +02:00
Kurt Korbatits
b976589a66 Replace QSoundEffect backend using qmedia with qaudiooutput implementation
- 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>
2012-07-26 23:10:46 +02:00
Venugopal Shivashankar
6ebee9f57e Fixed QDoc errors related to snippets and quotefromfile commands
Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-07-26 11:51:31 +02:00
Lev Zelenskiy
403eee4d87 Volume control for QAudioInput windows backend.
Change-Id: I1245a38c68254fc48373a856dc44e8ad8142636e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-07-26 09:06:23 +02:00
Kurt Korbatits
64dbf9d968 Added check to alsa backend for QAudioOutput
- 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>
2012-07-26 05:31:01 +02:00
Venugopal Shivashankar
f930e088fc Moved doc under src to fall in-line with the new modular structure
Change-Id: Ia2933baa1f0eaf82b5c2a626cb3661ee087049e3
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-07-25 15:00:59 +02:00
Venugopal Shivashankar
ef144b647f Moved the C++ module page from qtdoc
Change-Id: Ib4b3dbe48053532abc31d294f328d21e01047bb5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-25 10:07:45 +02:00
Lukas Geyer
db4576fa02 Fix compilation issue with MinGW (disables the usage of strsafe.h).
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>
2012-07-25 03:27:14 +02:00
Stephen Kelly
1eb6bdb4ba Mark QtMultimediaQuickTools library as internal.
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>
2012-07-24 13:31:27 +02:00
Thomas McGuire
ace2c75167 Blackberry: Compile with lastest event filter API changes
Change-Id: I4eb7ddf050cd8ef34df4547482f53f7372584221
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: David Faure <faure@kde.org>
2012-07-24 10:12:35 +02:00
Dmytro Poplavskiy
ae728a4b1e Replaced endpoint control with audio input and output controls
Change-Id: I981aabe39d106ced4ee1240db9e5b653c6fa5e91
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-24 09:49:47 +02:00
Ali Akhtarzada
29a2d09a43 Fixed docs for QAudioInput::bufferSize and setBufferSize
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>
2012-07-24 07:58:22 +02:00
Venugopal Shivashankar
79107a3899 Fixed the QDoc errors related to \qmlproperty usage
Change-Id: Ie4d5f8698fe8a1a774fd8f0bb127c20fc63a14e3
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-24 07:58:20 +02:00
Dmytro Poplavskiy
36ff2fe85e Added volume property to QMediaRecorder
Change-Id: I19f727107651c9f640ca1c010a3764f05aef8820
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-19 09:08:53 +02:00
Dmytro Poplavskiy
f844d6d9da Gst player backend: removed fifo based stream playback fallback
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>
2012-07-19 09:08:50 +02:00
Dmytro Poplavskiy
6854f07257 Removed the playbackStateChanged signal from Video element
It conflicts with Video.playbackState property notifications

Change-Id: I47901547e9db6f2b71e25c05ca8ce24c402eb5a2
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-19 09:08:48 +02:00
Lev Zelenskiy
b7f4b2decb Videoprobe implementation for wmf backend.
Change-Id: Ia597af428764229a76c0059ae7a57eb302aee63d
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-19 09:08:45 +02:00
Toby Tomkins
b95f608612 Fix QQuickCanvas renames.
This is required because of name changes to QtDeclarative in the commit
feb996e3ab44e68082c97102556ea396f5df3f44.

Change-Id: Ia40b1ea1cf3b3cb5225b7678077b627b74c47132
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-07-18 05:11:00 +02:00
Kurt Korbatits
1ac9318645 Added volume control for QAudioOutput & QAudioInput (alsa)
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>
2012-07-17 07:03:48 +02:00
Michael Goddard
8c12864361 Fix some QAudioInput errors on OSX.
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>
2012-07-16 08:41:27 +02:00
Mithra Pattison
858baa7d90 Fix for broken QML multimedia import on windows
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>
2012-07-16 08:40:43 +02:00
Dmytro Poplavskiy
864ab3a39a Camerabin camera service: configure default video settings
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>
2012-07-16 07:18:15 +02:00
Dmytro Poplavskiy
b6a8c713bc Updated the camerabin2 based camera with QtMultimedia changes
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>
2012-07-16 07:18:12 +02:00
Kurt Korbatits
5daa9c340c Fixed error in qaudioinput alsa backend for invalid format.
QTBUG-26523
- Was QAudioOutput. Changed to QAudioInput.

Change-Id: I04f7d38af5cb67c420adef188b81b237b6e06b97
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
2012-07-16 05:33:03 +02:00
Ling Hu
0e846f36cb Fix a crash problem in AudioEngine due to class name change.
Change-Id: I18a831ffc692b5aa6de6e2626f0dc916eb57c8b7
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-13 06:46:39 +02:00
Thiago Macieira
940f14c3b6 Update the export macros in qtmultimedia.git
Use the new, simpler QT_STATIC macro.

Change-Id: Ia3271a437ed76f54971444f6e73e54dbc416d483
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-11 23:48:29 +02:00
Oswald Buddenhagen
d18eadc8ab use centralized qml plugin project handling
Change-Id: If9561a27d9b96d020e2ffcf2dcc6deedb4d89e4a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-11 23:48:23 +02:00