Commit Graph

699 Commits

Author SHA1 Message Date
Dmytro Poplavskiy
ce135bff83 Fixed AVF camera backend build with namespaced Qt
Objective-C declarations may only appear in global
scope, moved them out of Qt namespace

Change-Id: Icb136be75f544e5929ac28f0ba0681211b81a983
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-09 10:50:32 +02:00
Kevin Ottens
9cc977668f Export QAudioHelperInternal symbols
They can be useful to some of the audio plugins.

Change-Id: I10856c104770ed57c72b674829e3922b5067a822
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2012-10-08 08:37:49 +02:00
Kevin Ottens
2f2b317318 Don't add the beginning of the file to the end of the last period
If we're in the last loop, it is not necessary to provide a full period
on read. Just provide the remaining of the data and hit the end of the
stream by returning less than requested, otherwise we potentially
generate some garbage noise.

Change-Id: I9d3a632ddc0c3289957c9f876d5dbe2999b50ebd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2012-10-08 08:37:35 +02:00
Kevin Ottens
690b4c4978 Blackberry: Move the mediaservice plugin in a subdirectory
Move the current platform plugin content in a subdir in order to make
room for several plugins (at least an extra one will be needed for the
audio type).

Change-Id: If17d6a464e36014fbefda52ddb0e8f8a58697f48
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2012-10-08 08:37:22 +02:00
Jerome Pasion
8005b89c65 Doc: Added Qt Multimedia to 'qmlmodules' group
-'qmlmodules' contains Qt's QML API
-made brief description consistent with other QML API

Change-Id: I30473048b06e2a4e13deb57c394a12c51a11693b
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-03 16:52:46 +02:00
Yoann Lopes
b616dd5165 Use QVideoGraphicsItem in the videographicsitem example.
The videographicsitem example now uses QVideoGraphicsItem instead of a
custom QAbstractVideoSurface.
The old code has been moved to a new example:
"customvideosurface/customvideoitem".

Change-Id: I83212f36168ef94d670b447eb1a742a39753939d
Reviewed-by: Jason Barron <jason.barron@digia.com>
2012-10-02 14:13:46 +02:00
Yoann Lopes
439d5b0e53 QVideoWidget: fixed setFullScreen(false) on the Xcb platform.
Fixed exiting fullscreen when a QVideoWidget is embedded in another QWidget.
Requires change I3616dc0f in qtbase to work.
Because of a bug in some X window managers, the order in which
setWindowFlags() and showNormal() are called has been changed.

Change-Id: I335d47a3a1d9ce517978cad35597d72312150db1
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-01 09:31:28 +02:00
Venugopal Shivashankar
06827f5d6e Doc: Organized related information in subsections
Change-Id: Iabe4a032d998003b659e298c3d602d68d83de8b1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-09-28 15:00:32 +02:00
Sergio Ahumada
1b80c9971f Add missing QT_{BEGIN,END}_NAMESPACE
Change-Id: I85bbd4f711191c14d6f58f098fced7336c66308f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
2012-09-27 19:04:03 +02:00
Venugopal Shivashankar
43a00f366f Doc: Moved example documentation and images
Changed to adhere to the new documentation structure
outlined here:
http://qt-project.org/wiki/Qt_Documentation_Structure

Change-Id: I634e086c7d55abfac3680144cbbe97059fcbea4f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-09-26 17:47:43 +02:00
Yoann Lopes
28c053ccad Use QVideoWidget in the videowidget example.
The videowidget example now uses QVideoWidget instead of a custom
QAbstractVideoSurface, the former being the most straightforward and
fastest way of showing a video in a QWidget.

The old code has been moved to a new example: "customvideosurface".

Change-Id: I15fb4482d0e77bafd24d4cb03316fc8f4ef13c35
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
2012-09-26 12:18:30 +02:00
Jerome Pasion
b5fb793b9a Doc: Adding documentation templates from qtbase
Task-number: QTBUG-27293
Change-Id: I86ca7bbb5bb2899617f3a2afb56183110666f71a
Reviewed-by: Martin Smith <martin.smith@digia.com>
2012-09-25 14:00:09 +02:00
Iikka Eklund
dcbbad869e Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia

Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-24 09:05:51 +02:00
Andy Nichols
781c79c51d Fix missing internal module in sync.profile
Build was broken for shadow builds because qtmultimediaquicktools
was not listed in sync.profile

Change-Id: If9d23906dbd37b651a545ae810ee9883b6a23348
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-24 09:05:29 +02:00
Romain Pokrzywka
4141cf2772 Fix gstreamer plugin build for platforms with qreal -> float
simple case of qFuzzyCompare with double and float.
I kept m_volume as double rather than changing it to float, to mimic
the behavior of the mute variable.

Change-Id: Ife2f58f60738215ebd430ba94bef885c09994e72
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
2012-09-14 19:29:21 +02:00
Venugopal Shivashankar
e06c037e10 Doc: Updated landing page to be consistent with other module landing pages
Change-Id: Ib230a7c01f2573b08f0a505fb0ada80d01757ba7
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-09-13 15:36:03 +02:00
Venugopal Shivashankar
f328a74153 Doc: Removed the unnecessary \annotatedlist command to avoid duplication
Change-Id: I5b1b42ed2b94735ff758e0e93e8df8eb5ab73a0f
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-09-12 17:59:01 +02:00
Joerg Bornemann
ecc6cf4cd5 remove usage of QT_MAKEDLL from QtMultimedia
Change-Id: Ie427497c999c6d8d666b21cc5cc079036c505cc6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-12 12:37:50 +02:00
Oswald Buddenhagen
946ff68c42 remove references to qMemSet & qMemCopy
Change-Id: Ie6e24798368305fb1eaa01d0e5fccdb5bb5aa33b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-09-12 12:37:46 +02:00
Oswald Buddenhagen
83b79659b6 centralize load(qt_build_config)s in .qmake.conf
Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-12 12:37:43 +02:00
Thiago Macieira
1450569eb1 Fix compilation after the qreal->float change in Math3D
QVector3D::length() returns float now, so this qBound call was running
into template substitution failure.

Change-Id: Ib03ab96bf18a4b04fa80a8f706761329faab2541
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
2012-09-12 12:35:45 +02:00
Thomas McGuire
d62b1c5213 Blackberry: Add Q_DECL_OVERRIDE keywords
Change-Id: Ibd6cf76ac41e16cbf65182994d68eb81c315f0af
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-09-06 14:56:40 +02:00
Thomas McGuire
bce8b5486d Hide the video overlay when the QML element is hidden
An display invalid rect is used for invisible QML
items.

Change-Id: Ifb2a25f1c5387ab8cef1359ac6c3e2f90a42cd10
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
2012-09-06 14:56:34 +02:00
Thomas McGuire
06302999da Blackberry: Use debug output for errors by default
This makes diagnosing problems remotely a lot easier.

Change-Id: I23434af5e88fb8dcdb154be34f12276eba652d4f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-09-05 13:53:07 +02:00
Jason Barron
bc2bce3629 WMF Backend: Fix crash in MFPlayerService::releaseControl.
When releasing a video render control or a video window control, we
were deleting the object pointed to by the 'control' pointer, but
were not setting this pointer to 0 which left it dangling. Shortly
after we tried to cast this dangling pointer to another type which
crashed. The solution is just to return after deleting the control.

Change-Id: I9ab672c8b86a13af889d87c76141e6b8db5b74a7
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
2012-09-04 11:31:16 +02:00
Tasuku Suzuki
c15b2833ba Make compile with -no-widgets
Change-Id: I6a057950315a1e2084fd6fc130007f865d096f12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-04 10:29:23 +02:00
Thiago Macieira
60e3d0ca80 Update the git-archive export options
The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the $n string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: I7f56327b21264dfd32d5d2519ca49aa1453083d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 19:53:28 +02:00
Tasuku Suzuki
474540eb43 remove useless dependency in qmlvideofx.pro
Change-Id: Ie79cc9294f3845c089525195684df4a60171f78c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-03 11:13:41 +02:00
Venugopal Shivashankar
a4c23ac607 Doc: Added an index page and separated \qmlproperty and \property documentation
Change-Id: I29bcfd0a31c781deb4cce2d6bcb2afca32191ae6
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Reviewed-by: Martin Smith <martin.smith@nokia.com>
2012-08-29 13:17:52 +02:00
Dmytro Poplavskiy
8a3706a5a1 Camera integration test fixes
Skip the testCtorWithDevice test if camera doesn't
support devices selection;

Allow synchronous camera status changes

Change-Id: I14f4a74f8a92b8dc2f75f8f5df2bcf9c124bda68
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-08-28 04:03:54 +02:00
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
Stephen Kelly
3613a14b38 Use Qt::WindowFlags, not Qt::WFlags.
The latter seems to date from the Qt 1 days, and such abbreviations
are not current Qt style.

Change-Id: I576a04e60c59e0bdf60da9c07e4d2917fc02a491
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-13 18:41:44 +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
Kurt Korbatits
93bbba0cc3 Added skips to reported bugs in qmediaplayerbackend test
- Changed some checks to QTRY's to avoid using qWait's

Change-Id: Ib7fb6fd25170c40969389c9c1b16f4a4e0e7a5e7
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-08-07 06:28:28 +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
Thiago Macieira
3e7f0f673a Compile in C++11 mode: the Q_DECLARE_METATYPE must be visible
The error was:
tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp:113:62:   required from here
qmetatype.h:637:5: error: static assertion failed: Type is not registered, please use Q_DECLARE_METATYPE macro to make it know to Qt's meta-object system

Change-Id: Id4e29803de646cbad0d401b1fe0e0b38e458d12f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-08-06 04:02:20 +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
3a5a59ed85 Add 32 bit support (int/float) support to audioinput example.
Change-Id: Ib7160f60af36cdccfe91a620f5555189792c13c4
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-08-03 07:05:46 +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
e015f72189 QRegion::subtract is deprecated
This code was suspicious. It looks like it was broken, caught by the
gotcha that the old API was.

Change-Id: Ief9543de3b9fdf18f6b620c9462a75594a4a3903
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-08-02 07:28:30 +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
Thiago Macieira
218fff76d5 QAbstractItemMode::reset() is deprecated, don't use it
Instead, use beginResetModel() before the model is reset, and add
endResetModel() after it.

Change-Id: Ibac3f2207ed999ed9d703266509b3ad91203f28d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-08-01 22:27:37 +02:00