platform/upstream/qtmultimedia.git
11 years agoAdd changes-5.0.2 file
Sergio Ahumada [Mon, 25 Mar 2013 11:55:10 +0000 (12:55 +0100)]
Add changes-5.0.2 file

Change-Id: Ic13e37a08fdb391796416ba3a9ea7aabe7934835
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
11 years agoDisable FFT when building in static mode
David Faure [Sat, 23 Mar 2013 14:22:21 +0000 (15:22 +0100)]
Disable FFT when building in static mode

This is because fftreal's pro file says:
static: error(This library cannot be built for static linkage)
Found due to a CI failure on win32-msvc2010_static_Windows_7.

Change-Id: I2a4630410fa7a1bb4e6ab158a4f7ae76d5cacd8a
Reviewed-by: Holger Ihrig <holger.ihrig@gmail.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agodefine MODULE_VERSION
Oswald Buddenhagen [Tue, 26 Feb 2013 11:59:14 +0000 (12:59 +0100)]
define MODULE_VERSION

Task-number: QTBUG-29838
Change-Id: I96527ba40ce7bcea851f05e9e9ab8d4492ef62e7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoMerge branch 'stable' into release
Johanna Aijala [Thu, 21 Feb 2013 07:30:40 +0000 (09:30 +0200)]
Merge branch 'stable' into release

Change-Id: I21911e86a651caa599110317a5e677cd61db4e86

11 years agoWMF: removed unnecessary dynamic_cast.
Yoann Lopes [Tue, 19 Feb 2013 12:38:31 +0000 (13:38 +0100)]
WMF: removed unnecessary dynamic_cast.

Task-number: QTBUG-29722

Change-Id: Ia0e5c8fb90b231a8d9764524709d5848397c2afb
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoDoc: Fix faulty snippet in Video Overview page
Topi Reinio [Tue, 5 Feb 2013 08:51:42 +0000 (09:51 +0100)]
Doc: Fix faulty snippet in Video Overview page

This change modifies setVideoSurface() in the snippet code
to be a bit more robust.

Task-number: QTBUG-29383

Change-Id: I2c691f19fe8f0912c1287597045da3a5579d2108
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoLoop video infinetely on qmlvideofx.
sanevala [Tue, 12 Feb 2013 10:21:33 +0000 (12:21 +0200)]
Loop video infinetely on qmlvideofx.

Change-Id: I40e444e75f0fd08860920b78b5b5ff190bce9ae9
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoUser cannot press cancel after folder up.
sanevala [Tue, 12 Feb 2013 10:19:51 +0000 (12:19 +0200)]
User cannot press cancel after folder up.

Moved cancel button on top of folder list views. Selected
file is not anymore emitted on cancel.

Change-Id: Ia7b666b4519fe03ca36c41d1694d2ad3ff4ace51
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoUser is not able to select file from FileBrowser and play it.
sanevala [Tue, 12 Feb 2013 10:18:24 +0000 (12:18 +0200)]
User is not able to select file from FileBrowser and play it.

When string is converted to Url qrc:// scheme is used.
Fix Filebrowser to use file:// scheme instead.

Change-Id: I713e704eb52d27d046ace1ff7d65feb98635461d
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoVideo has ended UI say tap to stop.
sanevala [Tue, 12 Feb 2013 10:13:01 +0000 (12:13 +0200)]
Video has ended UI say tap to stop.

Loop video infinetely so tap to stop & start state is correct.

Change-Id: I56af6eb00fcc7811cc25099df3c7fa47f429a3e6
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoUser cannot press cancel after folder up.
sanevala [Tue, 12 Feb 2013 10:09:58 +0000 (12:09 +0200)]
User cannot press cancel after folder up.

Moved cancel button on top of folder list views. Selected
file is not anymore emitted on cancel.

Change-Id: I37884e142e774fb03d1a39e4b30e71a4e9f1001f
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoFix qrc references on qmlvideo example.
sanevala [Tue, 12 Feb 2013 10:05:05 +0000 (12:05 +0200)]
Fix qrc references on qmlvideo example.

Change-Id: I0722e720dbc017186cefd0e45dd5a11023906b56
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoUser is not able to select file from FileBrowser and play it.
sanevala [Tue, 12 Feb 2013 10:02:46 +0000 (12:02 +0200)]
User is not able to select file from FileBrowser and play it.

When string is converted to Url qrc:// scheme is used.
Fix Filebrowser to use file:// scheme instead.

Change-Id: I9617d9503ed403de7d017b8586ae37b05dc096cb
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoFix XPASS on Ubuntu Precise Pangolin.
Friedemann Kleint [Mon, 18 Feb 2013 11:11:29 +0000 (12:11 +0100)]
Fix XPASS on Ubuntu Precise Pangolin.

Change-Id: I0199ad3a52621763c214fa65302d3de4701814cf
Reviewed-by: Tobias Koenig
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoRemove QPointerBase bic check.
Stephen Kelly [Tue, 12 Feb 2013 20:06:32 +0000 (21:06 +0100)]
Remove QPointerBase bic check.

QPointerBase is not public or exported and it is to be removed

Change-Id: Ifd43a34125af1116b130321df6256b2a7a9b05a2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFixed a connection to a slot that doesn't exists
Tasuku Suzuki [Wed, 13 Feb 2013 02:12:23 +0000 (11:12 +0900)]
Fixed a connection to a slot that doesn't exists

Change-Id: I7f94bab4e230996ace46d1c04d9d5a66ad9443d5
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoBlackBerry: Fixed playback of streamed audio
Bernd Weimer [Fri, 8 Feb 2013 14:52:09 +0000 (15:52 +0100)]
BlackBerry: Fixed playback of streamed audio

Before audio is played we always seek to position 0. Unfortunately, due
to a recent change in mmrenderer, playback stopped working for
"non-seekable" media. There is a check now, whether the media is
seekable or not.

Change-Id: Ieafd8d1364f7ce0194f4fa17d3efe894aa1b289b
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoFix lupdate-Warning in qcamera.cpp.
Friedemann Kleint [Mon, 4 Feb 2013 15:33:18 +0000 (16:33 +0100)]
Fix lupdate-Warning in qcamera.cpp.

qcamera.cpp:183: Cannot invoke tr() like this

Change-Id: Ia8f29c02bbc4b91c6542d9ed44136094e1e8a2e1
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agofix doc page urls
Oswald Buddenhagen [Wed, 30 Jan 2013 17:10:03 +0000 (18:10 +0100)]
fix doc page urls

they are versioned nowadays

Change-Id: I5c2ca367b8e63523811c03595cf8a7e326e8a662
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agosubstitute fixed version numbers in qdocconf files with variables
Oswald Buddenhagen [Wed, 30 Jan 2013 16:39:51 +0000 (17:39 +0100)]
substitute fixed version numbers in qdocconf files with variables

Change-Id: I20bd702b481d82903f5f4a42e74a8fb8ad4e71dc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoAdd a simple accessor to the video provider snippet
Laszlo Papp [Sat, 2 Feb 2013 02:54:08 +0000 (02:54 +0000)]
Add a simple accessor to the video provider snippet

Task-number: QTBUG-29383

Change-Id: I744fb997dae6ad1f9b8075791ad463c8fe23a96d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
11 years agoMerge "Merge branch 'release' into stable" into refs/staging/stable
Sergio Ahumada [Thu, 31 Jan 2013 15:34:38 +0000 (16:34 +0100)]
Merge "Merge branch 'release' into stable" into refs/staging/stable

11 years agotst_bic: Replace test data for linux-gcc-ia32
Sergio Ahumada [Tue, 29 Jan 2013 22:03:22 +0000 (23:03 +0100)]
tst_bic: Replace test data for linux-gcc-ia32

The ia32 bic data was re-generated due to a BIC introduced
by a45d35c07f9eed27fc286ab5fbc00789d45259b5

While we are at it, add a new set of data for amd64.

Change-Id: Id210b57f68229aaca09c0cd81bd371392d2bcc74
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoMerge branch 'release' into stable
Sergio Ahumada [Tue, 29 Jan 2013 14:21:05 +0000 (15:21 +0100)]
Merge branch 'release' into stable

Change-Id: If07e76a0f2f46d6dc50a41441324f02393e17d01

11 years agoAdd a changelog for the BC break
Thiago Macieira [Fri, 25 Jan 2013 22:59:53 +0000 (14:59 -0800)]
Add a changelog for the BC break

Change-Id: I768fcbbc871207e99466a2e1a9c7a67d98a2c897
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoDoc: Fix module name format
Sze Howe Koh [Sun, 27 Jan 2013 04:25:02 +0000 (12:25 +0800)]
Doc: Fix module name format

Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

QtMultimedia -> Qt Multimedia

(Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5)

Change-Id: I3c23435d5eceb946ea320756b835da937726db24
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Add QML Types to table of contents in Assistant
Jerome Pasion [Mon, 21 Jan 2013 15:27:42 +0000 (16:27 +0100)]
Doc: Add QML Types to table of contents in Assistant

Replace 'headerfile' with 'qmlclass' in qdocconf file.

As a positive side-effect, QDoc will also add files for
'All members' for QML Types into .qhp as well.

Task-number: QTBUG-29226
Change-Id: I892f386cbd22bfbf7a04be5aecc800896e1090ec
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
11 years agoDoc: corrected reference to snippet in qsoundeffect.cpp
Nico Vertriest [Fri, 25 Jan 2013 14:53:31 +0000 (15:53 +0100)]
Doc: corrected reference to snippet in qsoundeffect.cpp

Task-number: QTBUG-29101
Change-Id: Ie8cfd257736b0329d9aa5d1f5270c85651d335ec
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoAdd virtual destructors to two classes with other virtuals
Thiago Macieira [Fri, 25 Jan 2013 21:39:28 +0000 (13:39 -0800)]
Add virtual destructors to two classes with other virtuals

Classes with virtuals are used polymorphically (why have virtuals
otherwise?), so they need virtual destructors to be deleted
properly. Unless they are never deleted using objects of those two
classes -- but why have the interface in the first place if that's the
case?

This is binary incompatible change. It was agreed upon in the mailing
list.

Change-Id: I697e4bd53251452a0e6b0c09edd08c4835f90cbd
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-December/008908.html
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQAudioInput/Output documentation: Fix slot naming in snippets
Topi Reinio [Mon, 14 Jan 2013 11:11:09 +0000 (12:11 +0100)]
QAudioInput/Output documentation: Fix slot naming in snippets

Having a code snippet use a slot (stateChanged) with a name
identical to a signal in QAudioInput / QAudioOutput classes causes
problems (incorrect links) in class documentation that refer to
the snippet code.

This change renames the slots according to standard Qt convention.
Same change is applied to example applications as well.

Task-number: QTBUG-26688
Change-Id: I0c6181240237d0c642b73fe18f3ddb5137b7f207
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Summarized documentation fixes in changelog file.
Jerome Pasion [Mon, 21 Jan 2013 15:49:50 +0000 (16:49 +0100)]
Doc: Summarized documentation fixes in changelog file.

Change-Id: I1713bb96c043195af0dadb91b294b6a64db60ad4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoWMF: enabled HW-accelerated video decoding for the QML video item.
Yoann Lopes [Mon, 14 Jan 2013 16:44:06 +0000 (17:44 +0100)]
WMF: enabled HW-accelerated video decoding for the QML video item.

It also applies to QGraphicsVideoItem when used on a GL viewport.
We now have a new video sink that is based on Microsoft's EVR sink, we just
replace the default Presenter with our own. Frames are rendered into D3D
surfaces using DXVA, then copied into a shared D3D/EGL surface and finally
bound to a GL texture to be used by the video surface.
The shared D3D/EGL surface is a feature provided by ANGLE and therefore Qt
must be compiled with ANGLE for this new video sink to be compiled and
used.

Change-Id: I0b7b9968eed5488f9ef1a2dcca5213bd0af232ab
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoWMF: fixed unresolved topologies when using the custom MediaSink.
Yoann Lopes [Wed, 23 Jan 2013 13:27:40 +0000 (14:27 +0100)]
WMF: fixed unresolved topologies when using the custom MediaSink.

When using our custom MediaSink with RGB formats, Media Foundation fails
sometimes to resolve the topology. Inserting ourselves a ColorConverter
transform in the topology resolves the problem.

The ColorConverter transform cannot handle dynamic frame size changes
(this can happen with H264 videos for example) so we also need to insert a
Resizer transform to handle transparently frame size changes.

Change-Id: Id7f37a0af65f142fbe6d420ad7b2c1ac2156c21b
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoWMF: fixed scrubbing and changing rate to 0 or negative values.
Yoann Lopes [Mon, 21 Jan 2013 17:17:48 +0000 (18:17 +0100)]
WMF: fixed scrubbing and changing rate to 0 or negative values.

Task-number: QTBUG-29147
Change-Id: I3e32e520d676d120d60bcd07d122006c1346eb0d
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoDoc: Fixed "QML Types" listing C++ classes.
Jerome Pasion [Mon, 21 Jan 2013 15:27:42 +0000 (16:27 +0100)]
Doc: Fixed "QML Types" listing C++ classes.

Removed "class" from the "selectors" qdocconf variable

Task-number: QTBUG-29242
Change-Id: I1d6c264a6a4277dff27bffcd39d9841363241f7d
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
11 years agoDoc: Fixed random QDoc warnings
Venugopal Shivashankar [Thu, 3 Jan 2013 16:50:32 +0000 (17:50 +0100)]
Doc: Fixed random QDoc warnings

- Fixed \snippet paths
- Minor language edits
- Removed unnecessary multiple page commands in a single comment
block. For example, \fn and \qmlsignal in a single comment block
is not allowed. Such instances must be documented in separate
comment blocks.

Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
(cherry picked from commit 51334d299520118bbbc077696ca589f972a2f2ea)

11 years agoMake sure QVideoSurfaceGLPainter always uses a valid texture.
Yoann Lopes [Wed, 16 Jan 2013 12:06:51 +0000 (13:06 +0100)]
Make sure QVideoSurfaceGLPainter always uses a valid texture.

QVideoSurfaceGLPainter should not assume that the GL texture provided
by the QVideoFrame is fully initialized for drawing.

Change-Id: I752ecf69a3cf1faf0a7cf8f84b372c3b347824be
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoFixed QSGVideoNodes not deleting their materials.
Yoann Lopes [Tue, 15 Jan 2013 15:27:49 +0000 (16:27 +0100)]
Fixed QSGVideoNodes not deleting their materials.

Change-Id: Ia7597ade3066c23c54354e2cc36c907e6bf0dfea
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agotst_bic: Add linux-gcc-ia32 bic data for QtMultimediaWidgets
Sergio Ahumada [Mon, 14 Jan 2013 12:20:52 +0000 (04:20 -0800)]
tst_bic: Add linux-gcc-ia32 bic data for QtMultimediaWidgets

Change-Id: I070b233b3358abd16bda8e83c139b7ad61b6fdd0
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoDoc: Fixed random QDoc warnings
Venugopal Shivashankar [Thu, 3 Jan 2013 16:50:32 +0000 (17:50 +0100)]
Doc: Fixed random QDoc warnings

- Fixed \snippet paths
- Minor language edits
- Removed unnecessary multiple page commands in a single comment
block. For example, \fn and \qmlsignal in a single comment block
is not allowed. Such instances must be documented in separate
comment blocks.

Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoAdded seek() function to QML Video item and updated documentation.
Yoann Lopes [Mon, 7 Jan 2013 06:29:14 +0000 (07:29 +0100)]
Added seek() function to QML Video item and updated documentation.

The Video item inline example was wrong, changing read-only properties.

Task-number: QTBUG-28741

Change-Id: Ia1f6c1110a301a96743e7ebfec51731fcaf6a862
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
11 years agoFix: Bug fix in determination of scanline direction
Wouter Huysentruit [Fri, 11 Jan 2013 10:21:35 +0000 (11:21 +0100)]
Fix: Bug fix in determination of scanline direction

YUV and other compressed frame formats are always TopToBottom. Only for uncompressed RGB formats the sign of their height is used to indicate the scanline direction.

Change-Id: I6474783583672861eeeb538b79d14ee3d6995f59
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
11 years agoFix: Only flip video once for BottomToTop scanline directions
Wouter Huysentruit [Fri, 11 Jan 2013 10:20:06 +0000 (11:20 +0100)]
Fix: Only flip video once for BottomToTop scanline directions

Top & bottom of the texture coordinates are already flipped for BottomToTop scanline directions.
So there is no need to flip top & bottom of the vertex coordinates too.

Change-Id: I221b94afb65c194bdedb787414e6a436b8095fb2
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
11 years agodoc: Fix namespace version to 5.0.1 for qhp documentation
Sergio Ahumada [Sat, 12 Jan 2013 08:19:54 +0000 (09:19 +0100)]
doc: Fix namespace version to 5.0.1 for qhp documentation

Change-Id: Ie2d0aeff6d8b63ae9d18896320557d28cc9adb68
Reviewed-by: hjk <qthjk@ovi.com>
11 years agomake use of qtHaveModule()
Oswald Buddenhagen [Fri, 21 Dec 2012 10:45:50 +0000 (11:45 +0100)]
make use of qtHaveModule()

Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agotst_bic: Add test data for linux-gcc-ia32
Sergio Ahumada [Thu, 10 Jan 2013 14:31:03 +0000 (06:31 -0800)]
tst_bic: Add test data for linux-gcc-ia32

Task-number: QTQAINFRA-321
Change-Id: I51cabb707107ae6cc788ff04b0886dc3d06b3693
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoUpdate changes file for 5.0.1 release
Sergio Ahumada [Wed, 9 Jan 2013 14:50:47 +0000 (15:50 +0100)]
Update changes file for 5.0.1 release

Change-Id: I1d5fbb280146042da3894ecfdb544e0cbffb3368
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Oleg Shparber <trollixx@gmail.com>
11 years agoUpdate copyright year in Digia's license headers
Sergio Ahumada [Wed, 2 Jan 2013 11:47:49 +0000 (12:47 +0100)]
Update copyright year in Digia's license headers

Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoMerge branch 'stable' into release
Sergio Ahumada [Wed, 9 Jan 2013 08:36:25 +0000 (09:36 +0100)]
Merge branch 'stable' into release

Change-Id: Ifa5ddfd7ee4a637f78947fc1cb945d3008506973

11 years agoWMF: added more metadata keys (on Windows 7 and later).
Yoann Lopes [Thu, 20 Dec 2012 14:01:08 +0000 (15:01 +0100)]
WMF: added more metadata keys (on Windows 7 and later).

Change-Id: I01eebd0582d33eb3d581176bba2a84fa75db2463
Reviewed-by: Jason Barron <jason@cutehacks.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoCompile in 32-bit mode.
Morten Johan Sørvig [Tue, 8 Jan 2013 13:39:10 +0000 (14:39 +0100)]
Compile in 32-bit mode.

CGRect == NSRect only in 64-bit mode.

Don't add -framework QuickTime based on the host arch,
use QT_ARCH instead.

Change-Id: I829bc1bcfe37f70a07e8c55a5bc7dee90aaa981a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoremove leftover code from multimediawidgets carve-out
Oswald Buddenhagen [Fri, 21 Dec 2012 20:31:19 +0000 (21:31 +0100)]
remove leftover code from multimediawidgets carve-out

Change-Id: Ibb347193761a94ce4a309eddb75af37b73dd9be6
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
11 years agoWMF: release video controls before releasing the session
Yoann Lopes [Tue, 18 Dec 2012 21:16:13 +0000 (22:16 +0100)]
WMF: release video controls before releasing the session

For the VideoRendererControl, also stop the video surface at the same
time.
This fixes a crash when changing video.

Change-Id: I49484f8b277c345dafb3e5947cf5d23df15546f3
Reviewed-by: Jason Barron <jason@cutehacks.com>
11 years agoWMF: Fixed uninitialized member variable.
Yoann Lopes [Fri, 4 Jan 2013 16:30:28 +0000 (17:30 +0100)]
WMF: Fixed uninitialized member variable.

Change-Id: Iee60d6eee7bbf9dd7804216f4a49c4549f41ba5a
Reviewed-by: Jason Barron <jason@cutehacks.com>
11 years agoWMF: re-enabled video probes and made it more robust.
Yoann Lopes [Tue, 18 Dec 2012 20:40:55 +0000 (21:40 +0100)]
WMF: re-enabled video probes and made it more robust.

Fixed the way the custom MF Transform (getting the frames) works:
- Recreate it whenever we load a new media
- During media type negotiation between nodes, the MFT should support
  the same types as the video sink supports
- Allow input and output types to be changed as many times as needed,
  otherwise the topology cannot be resolved in some cases

Change-Id: I7ca77e1a3dee83643f1a97f2e6ada9c5c0e88309
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoMake QtMultimedia an identified module
Oleg Shparber [Mon, 24 Dec 2012 23:47:22 +0000 (01:47 +0200)]
Make QtMultimedia an identified module

Task-number: QTBUG-28376

Change-Id: I7b27dc52b3085eb50695e559029f2533aa743d4f
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoAdd changes-5.0.1 file
Sergio Ahumada [Sat, 22 Dec 2012 16:58:23 +0000 (17:58 +0100)]
Add changes-5.0.1 file

Task-number: QTBUG-26065
Change-Id: If025c8cc5be1304b30e3cbc983d0a1de31224a1b
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoDoc: Moved the qdocinc and image to the sourcedirs
Venugopal Shivashankar [Wed, 19 Dec 2012 13:36:55 +0000 (14:36 +0100)]
Doc: Moved the qdocinc and image to the sourcedirs

QDoc parses the \input command relative to the sourcedirs
and not exampledirs. So I had to move the qdocinc file and
the corresponding image to the sourcedirs.

Task-number: QTBUG-28727
Change-Id: Ie064f0b79ab8ffcb0587b43ff4508f5865a321a9
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoRemove comma at the end of the enum
Thiago Macieira [Sat, 22 Dec 2012 22:07:36 +0000 (14:07 -0800)]
Remove comma at the end of the enum

Required for public header cleanliness

Change-Id: I2641fd085071b2a69806e8622c7c35be74f744b1
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
11 years agoBump Qt version to 5.0.1
Sergio Ahumada [Fri, 21 Dec 2012 23:43:52 +0000 (00:43 +0100)]
Bump Qt version to 5.0.1

Change-Id: Ic45b749ceea86263281b5c23509bf301fa334e5f
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
11 years agofix include statements
Mark Brand [Thu, 20 Dec 2012 00:20:49 +0000 (01:20 +0100)]
fix include statements

Names are case sensitive when cross bulding for mingw on unix.

Change-Id: I355b9388241c7c5fefb05b6f0c231efec4530c7e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
11 years agoUse qrc to deploy qml files in declarative-camera examples
Kai Koehne [Thu, 20 Dec 2012 15:51:11 +0000 (16:51 +0100)]
Use qrc to deploy qml files in declarative-camera examples

Make the declarative-camera example working in shadow builds by including
the Qt Quick assets via a .qrc file.

Change-Id: Iea56e7d69558503abdf15a600a6ce21ea90ee99a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoWMF: Fixed incorrect QMediaPlayer volume reporting.
Yoann Lopes [Thu, 20 Dec 2012 15:19:59 +0000 (16:19 +0100)]
WMF: Fixed incorrect QMediaPlayer volume reporting.

Task-number: QTBUG-26621
Change-Id: Id70a68ad61fd7d68f4ee277f33a54bd9c00c05d0
Reviewed-by: Jason Barron <jason@cutehacks.com>
11 years agoPolish and fix qmlvideofx example
hjk [Tue, 18 Dec 2012 14:11:44 +0000 (15:11 +0100)]
Polish and fix qmlvideofx example

Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoAdd qmake generated files to .gitignore.
Miikka Heikkinen [Thu, 20 Dec 2012 09:49:20 +0000 (11:49 +0200)]
Add qmake generated files to .gitignore.

Add source files generated by qmake for automatic static plugin
imports to .gitignore.

Change-Id: I38977c5d410e1dc9f424de39c88a9fcd281d1e69
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoExample: Notify user of errors
Sze Howe Koh [Tue, 18 Dec 2012 16:11:29 +0000 (00:11 +0800)]
Example: Notify user of errors

Before, the widget simply failed silently, which gave the impression
that the widget is broken.

Change-Id: I8ab7ed0e0a62f9643791b6f4732f7f3b2cd7521a
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agopoint dependencies to 'release' branches
Sergio Ahumada [Mon, 17 Dec 2012 19:35:45 +0000 (20:35 +0100)]
point dependencies to 'release' branches

Change-Id: Iabbadc65f1cd3cd8c43f10971b0b5213e459c268
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoExamples: Remove qmlapplicationviewer template.
Kai Koehne [Fri, 14 Dec 2012 13:14:01 +0000 (14:14 +0100)]
Examples: Remove qmlapplicationviewer template.

Fix shadow-builds for qmlviewer examples by using qrc files instead.

Task-number: QTBUG-28614
Change-Id: Iec993f95166ffd09e8edff552ceca5bc4112d293
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoremove QT+=widgets from SUBDIRS projects
Oswald Buddenhagen [Fri, 14 Dec 2012 19:23:15 +0000 (20:23 +0100)]
remove QT+=widgets from SUBDIRS projects

it makes no sense whatsoever

Change-Id: I114799dbe35ac31f6d90642ba8c5dbe3fc075604
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoremove obsolete DEPENDPATH assignments
Oswald Buddenhagen [Fri, 14 Dec 2012 19:02:59 +0000 (20:02 +0100)]
remove obsolete DEPENDPATH assignments

qmake now add CONFIG+=depend_includepath by default, making manual
DEPENDPATH setup unnecessary.

Change-Id: Iffd78b4c7cf8d048a822b75c481ac380b3d8d0f4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoremove some unnecessary CONFIG additions
Oswald Buddenhagen [Fri, 14 Dec 2012 18:26:41 +0000 (19:26 +0100)]
remove some unnecessary CONFIG additions

qt is already added by spec_pre.prf, warn_on by default_pre.prf, and
no_private_qt_headers_warning by qt_build_config.prf.

Change-Id: Ia5cee420d577dd0ae0120cb2dd430d4ddd29ebcf
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoDoc: Fixed broken links to the Multimedia examples
Venugopal Shivashankar [Fri, 14 Dec 2012 12:39:53 +0000 (13:39 +0100)]
Doc: Fixed broken links to the Multimedia examples

- Updated the example links to reflect the new directory
structure for the multimedia examples.
- Removed a broken link to audiodecoder example
as it doesn't have a qdoc page yet.

Change-Id: Ia1169eeb80b4e6b6f92cd070aecbe72ce696bb6a
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Updated the \example and \snippet paths
Venugopal Shivashankar [Wed, 12 Dec 2012 15:35:15 +0000 (16:35 +0100)]
Doc: Updated the \example and \snippet paths

Also:
- Grouped the example docs under one group. i.e. multimedia-examples
- Moved the \group page here from the qtdoc repo
- Moved the snippets directory under doc from doc/src

Change-Id: I28fb81cf910e58101cd601fb4c440b59b0b0366d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agotest: Mark tst_QPainterVideoSurface as insignificant on Windows
Sergio Ahumada [Tue, 11 Dec 2012 19:04:13 +0000 (20:04 +0100)]
test: Mark tst_QPainterVideoSurface as insignificant on Windows

Task-number: QTBUG-28542
Change-Id: Ib879ffd31e534cc9cde4c4893af6f2a7799529cd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agotest: Mark tst_QDeclarativeVideoOutputWindow as insignificant on Windows
Sergio Ahumada [Tue, 11 Dec 2012 19:01:12 +0000 (20:01 +0100)]
test: Mark tst_QDeclarativeVideoOutputWindow as insignificant on Windows

Task-number: QTBUG-28541
Change-Id: I5d59a1daf5494aca28a573e312bbf1bf8e7d95e2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoWMF: Fixed crash when cancelling media loading.
Yoann Lopes [Tue, 11 Dec 2012 16:13:26 +0000 (17:13 +0100)]
WMF: Fixed crash when cancelling media loading.

Since media loading is asynchronous, cancelling could cause a crash when
done after the media is loaded but the callback hasn't been called yet.

Change-Id: I9c9b7bfaa495b9e75765111c15afb07e8b699488
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoWMF: Improved error reporting.
Yoann Lopes [Tue, 11 Dec 2012 15:36:53 +0000 (16:36 +0100)]
WMF: Improved error reporting.

When loading the source fails because the file format is not supported, we
now report a FormatError instead of a ResourceError.
When the file format is supported but the media cannot be played (topology
cannot be resolved), it is most likely caused by a missing codec and we
then report a FormatError.

Change-Id: I101a86c129a0c5dccb543fc1247cb741994684fd
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoAdd PLUGIN_CLASS_NAME to qtmultimedia plugins
Miikka Heikkinen [Mon, 10 Dec 2012 12:35:04 +0000 (14:35 +0200)]
Add PLUGIN_CLASS_NAME to qtmultimedia plugins

Needed for automating static plugin loading.

Task-number: QTBUG-28131
Change-Id: Ia392b112fc46dedd34c9ffdbd6e874dbbfeaef83
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoDoc: Replace outdated macro
Christian Stenger [Fri, 7 Dec 2012 10:00:28 +0000 (11:00 +0100)]
Doc: Replace outdated macro

Change-Id: I9bc0f8a077e60ede0ac1b6852b66d33143eed5a3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoWMF: Recreate the MFMediaSession when loading a new media.
Yoann Lopes [Thu, 6 Dec 2012 15:00:06 +0000 (16:00 +0100)]
WMF: Recreate the MFMediaSession when loading a new media.

MFMediaSession doesn't seem to handle correctly the change of media
source, causing the playback not to work afterwards.
A single MFMediaSession was created and used for every loaded media, we
now create a new one whenever we load a new media (releasing the old one
beforehand).

Task-number: QTBUG-26819

Change-Id: Id99c9dd54e161823d9580933e063f16240806529
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Jason Barron <jason@cutehacks.com>
11 years agoWMF: Fixed shutdown sequence.
Yoann Lopes [Thu, 6 Dec 2012 14:42:47 +0000 (15:42 +0100)]
WMF: Fixed shutdown sequence.

A wrong shutdown sequence was causing a wait condition to never be met,
resulting in a 5 seconds hang on shutdown.
Also reduced the wait condition timeout to 100 ms.

Task-number: QTBUG-28432

Change-Id: Ib415bf66634603d839be3e34e497e3a3c5a19ad9
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Jason Barron <jason@cutehacks.com>
11 years agoFix includes to build on case-sensitive filesystem
Shawn Rutledge [Thu, 6 Dec 2012 13:01:23 +0000 (14:01 +0100)]
Fix includes to build on case-sensitive filesystem

Change-Id: Ibd355256a5d2a60ee3a61ba2a2bf9f0f63c591cb
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoUpdate plugins.qmltypes
Kai Koehne [Thu, 6 Dec 2012 15:48:41 +0000 (16:48 +0100)]
Update plugins.qmltypes

Run with option nonrelocatable.

Change-Id: I689d5d745dac9325aeb5db81484054b0dcdb9d24
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
11 years agoGet rid of useless requestOrientation() calls in the examples.
Samuel Rødal [Wed, 5 Dec 2012 16:34:11 +0000 (17:34 +0100)]
Get rid of useless requestOrientation() calls in the examples.

requestOrientation() has no effect currently, and its intended effect
was probably different from what the examples want to achieve.

Change-Id: Ie3235346bd366d5f3468c605ec34394eab9417a7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
11 years agoDoc: Fix typo and enum names
Christian Stenger [Thu, 6 Dec 2012 12:24:13 +0000 (13:24 +0100)]
Doc: Fix typo and enum names

Change-Id: I55a22d3a7c5fbdf2f8a16c09c701a7fa871a95e1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agofix build for standard DirectX install paths
Joerg Bornemann [Wed, 5 Dec 2012 12:05:53 +0000 (13:05 +0100)]
fix build for standard DirectX install paths

Evaluate the environment variable DXSDK_DIR at qmake time.
This makes sure, the contents get properly quoted, even if the DirectX
SDK is installed into a path that contains spaces.

Change-Id: Id22f56448eef4d392af77e97f46308f1b486c7c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFixed build on MacOS with clang in C++11 mode.
Erik Verbruggen [Tue, 4 Dec 2012 09:02:22 +0000 (10:02 +0100)]
Fixed build on MacOS with clang in C++11 mode.

avfvideowidget.mm:120:9: error: non-constant-expression cannot be narrowed from type 'int' to 'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing]
        x1, y1, zValue,
                ^~

Change-Id: I5a08bf8b53cf029dbdfaeaa03f4babd6d49d62ad
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agocentralize and fixup example sources install targets
Joerg Bornemann [Wed, 5 Dec 2012 12:03:09 +0000 (13:03 +0100)]
centralize and fixup example sources install targets

This follows suit with aeb036e in qtbase.

Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
11 years agosync.profile: Point dependencies to 'refs/heads/stable'
Sergio Ahumada [Tue, 4 Dec 2012 10:31:18 +0000 (11:31 +0100)]
sync.profile: Point dependencies to 'refs/heads/stable'

We should test stable branches against stable branches only.
At some point we should automate the merges from dev->stable->release
and decide how to handle possible merge conflicts.

This is good enough for the time being.

Change-Id: I87e02c9d323b524898d93fb5d1d4387218a984c5
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agoremove pointless QT.<module>.sources references
Oswald Buddenhagen [Mon, 3 Dec 2012 20:41:03 +0000 (21:41 +0100)]
remove pointless QT.<module>.sources references

there is no point to use this for in-module references.
cleaning it out in an attempt to purge the constants entirely.

Change-Id: Id160b6241126717dc412d80aeaa13df3cbf8fa17
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoWMF: Disabled the video probe control.
Yoann Lopes [Fri, 30 Nov 2012 15:42:14 +0000 (16:42 +0100)]
WMF: Disabled the video probe control.

Using the video probe cause unstability in the video playback.
Disabled for 5.0 release.
Should be fixed and re-enabled in the next version.

Change-Id: I274212a0943ac098194ad59d6e07bed7740bc8a3
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoDoc: Added missing images and made some language edits
Venugopal Shivashankar [Fri, 30 Nov 2012 14:32:55 +0000 (15:32 +0100)]
Doc: Added missing images and made some language edits

Change-Id: I9544121601c2c4099927e0e23550c3ab32bbfda9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoblackberry: fixed building without QtWidgets
Oleg Shparber [Thu, 29 Nov 2012 16:22:42 +0000 (18:22 +0200)]
blackberry: fixed building without QtWidgets

Change-Id: I12103c5a4bd903b809e7db2ec8e1cbb60a37c429
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agotr()-Fixes.
Friedemann Kleint [Thu, 29 Nov 2012 13:27:46 +0000 (14:27 +0100)]
tr()-Fixes.

Make WMF-player error message consistent (sentences,
no exclamation marks). Improve wording.

Change-Id: I876b26067fb374833037aa93dd9675ab556bf972
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoFix QGstreamerPlayerSession::availablePlaybackRanges()
Andras Becsi [Wed, 7 Nov 2012 17:51:16 +0000 (18:51 +0100)]
Fix QGstreamerPlayerSession::availablePlaybackRanges()

Since buffering information through buffering queries is only valid if
progressive download buffering (on-disk caching) is enabled or local
media is played and we explicitly disable on-disk buffering because of
cleanup issues with gstreamer availablePlaybackRanges() always returns
an empty range for online media.
Seeking is also possible using http range requests therefore if valid
playback ranges could not be determined we should return the [0..duration]
range unless the source is a live stream or the duration is unknown.

Change-Id: Idbebc0fdde5053c6f9c0b3794c6d122492c6239c
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
11 years agoDoc: cleanup multimedia overview
Andy Nichols [Tue, 27 Nov 2012 16:52:16 +0000 (17:52 +0100)]
Doc: cleanup multimedia overview

Added an introduction, and fix some formatting.

Change-Id: Ic23416cf1113895a1895a53f310530a83a9013d3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoUpdate links from labs.qt.nokia.com to blog.qt.digia.com
Sergio Ahumada [Tue, 27 Nov 2012 18:48:14 +0000 (19:48 +0100)]
Update links from labs.qt.nokia.com to blog.qt.digia.com

Change-Id: I003c9a5061efe586ecdadde58827ef4887b49b5f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoDoc: Cleanup diagram placeholder in Camera Overview
Andy Nichols [Tue, 27 Nov 2012 14:41:09 +0000 (15:41 +0100)]
Doc: Cleanup diagram placeholder in Camera Overview

The diagram still needs to be done, but is not necessary for the 5.0
release.

Task-number: QTBUG-28235
Change-Id: I1e8b4d731c00516408de89be81d4ecb8bde3d016
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoQT7: Remove usage of QMAKE_MAC_XARCH
Andy Nichols [Fri, 23 Nov 2012 13:22:04 +0000 (14:22 +0100)]
QT7: Remove usage of QMAKE_MAC_XARCH

Support for QMAKE_MAC_XARCH was removed in Qt 5.0, so it shouldn't be
used in the QT7 plugin, as it causes build failures.

Task-number: QTBUG-27180
Change-Id: I7d907a9afbcbc4989b794350c94d0f619e4d2b7d
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoFix building of examples.
Friedemann Kleint [Thu, 22 Nov 2012 12:00:50 +0000 (13:00 +0100)]
Fix building of examples.

- Correct install paths
- Add missing resources
- Add declarative-radio
- Remove deploy/install logic from qmlapplicationviewer.pri and
  snippet .pro-files of the video examples and add normal install
  rules.

Task-number: QTBUG-27977

Change-Id: Iadecb14d9330c752f6fb739918da743a854ba236
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>