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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Friedemann Kleint [Wed, 21 Nov 2012 15:29:40 +0000 (16:29 +0100)]
Fix building of installed player example.
Task-number: QTBUG-27977
Change-Id: I383cd971a54d40008f9a5899f043abb9961c489a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Andy Nichols [Mon, 19 Nov 2012 15:26:38 +0000 (16:26 +0100)]
AVFoundation: Enable QImage based frame fallback
QGraphicsVideoItem was not working because the QPainterVideoSurface was
unable to paint BGR32 format OpenGL textures. Now if the QGraphicsView
window has a QGLWidget viewport, we use the GLTextureHandle to render
the video, otherwise we fallback to the software QImage rendered case.
Task-number: QTBUG-28017
Change-Id: I9304e0a2536f15075ae34cdd509ef24fbc18604e
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
hjk [Tue, 20 Nov 2012 17:27:28 +0000 (18:27 +0100)]
Multimedia: examples coding style unification
Change-Id: Iffae3a276bb2b01f871aee76dc069ce006d69fce
Reviewed-by: David Schulz <david.schulz@digia.com>
hjk [Tue, 20 Nov 2012 14:20:24 +0000 (15:20 +0100)]
QtMultimedia: examples/camera coding style
Also unconditionally include code for Qt >= 4.7
Change-Id: Ic8b9d009a54f9e0fe7e9477c75c125ad09a485ee
Reviewed-by: David Schulz <david.schulz@digia.com>
Sze Howe Koh [Thu, 8 Nov 2012 11:04:48 +0000 (19:04 +0800)]
Doc: Polish the description of changes to the Qt Multimedia module
- Fix errors
- QtMultimediaKit is renamed to QMultimedia, not QtMultimedia
- It's not necessary to explicitly convert metadata keys into
strings -- Q_DECLARE_METADATA takes care of that
- The introduction of MediaPlayer and VideoOutput does not affect
existing code
- Follow module naming guidelines at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
- Shorten descriptions, improve flow
- Remove trivia
Change-Id: I3ab9bb2f8f33cbea52b5993f3060d929a7e39ef1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Andy Nichols [Tue, 20 Nov 2012 11:48:09 +0000 (12:48 +0100)]
AVFoundation: Fix broken requestControl logic
AVFMediaPlayerService::requestControl was returning the video output
control after the video output was created, and this could result in
unexpected behavior, as well as prematurely calling releaseControl on
the video output. This should fix the "player" example on OS X.
Change-Id: Ie23b1176272a1f9daa5edeec856141ac52a450c7
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Andras Becsi [Mon, 19 Nov 2012 15:21:50 +0000 (16:21 +0100)]
Remove nonfunctional mediaDownloadEnabled property
I suppose this was introduced after an API freeze to try
to support on-disk buffering but since the code does not
set the GST_PLAY_FLAG_DOWNLOAD flag on the player element
the feature is not only undocumented but also nonfunctional.
If on-disk buffering is needed we should add proper
API to enable/disable it for all backends which might
be possible with Qt 5.1 the earliest.
Change-Id: I6b42a06166509db0023a3e0263ecc3a36f0d2bdb
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Maurice Kalinowski [Tue, 20 Nov 2012 12:10:46 +0000 (13:10 +0100)]
simplified example
- do not use any opengl additions inside this simple example
- also fixes problems in relation to mixing angle with GLWidgets
Task-number: QTBUG-27963
Change-Id: I69a966b886cd8b3e88d6f3be48463eee59baa58a
Reviewed-by: hjk <qthjk@ovi.com>
Andras Becsi [Wed, 7 Nov 2012 17:28:10 +0000 (18:28 +0100)]
Clean up QGstreamerPlayerSession
Remove dead code and fix compiler warnings about unused
and uninitialized variables.
Change-Id: I809d905e13234db1dbc1b9c2a0ac887c5c712fc7
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Andras Becsi [Mon, 19 Nov 2012 12:59:32 +0000 (13:59 +0100)]
Media is always set to be seekable with the gstreamer backend
Since the used mechanism for querying whether the media is seekable
was unreliable the code has been commented out and the media always
set to be seekable.
Query for seeking capabilities after the duration is known in
updateDuration() which retries to determine the duration multiple
times if unsuccessful and use gst_query_parse_seeking to check
if the media is seekable or not.
Change-Id: I141dfb1616dc59f8c92a698ddb2867f63a2656b9
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Eskil Abrahamsen Blomfeldt [Tue, 20 Nov 2012 09:24:08 +0000 (10:24 +0100)]
Merge branch 'newdocs'
Change-Id: Ia45daee9b5089c01300cf27484296809dd87302f
Friedemann Kleint [Mon, 19 Nov 2012 16:38:44 +0000 (17:38 +0100)]
Fix qmake warning about missing headers.
Change-Id: I41caa02e09a4e0f81e6e5cbf3590c92fa0edaf68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Mon, 19 Nov 2012 16:40:31 +0000 (17:40 +0100)]
Fix syncqt-warnings.
Use include with module name for the multimedia-classes.
Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Yoann Lopes [Mon, 19 Nov 2012 15:30:46 +0000 (16:30 +0100)]
WMF: Fixed color adjustment when using the EVR window control.
Change-Id: I007937b358f062cd9d3d3c02e3a0780d6b2539be
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Friedemann Kleint [Mon, 19 Nov 2012 11:10:16 +0000 (12:10 +0100)]
Fix compilation with -no-rtti.
Availability of dynamic_cast should be checked.
Task-number: QTBUG-27939
Change-Id: I24c0bca7859a45c6be89c507dadd91e7175939e0
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Robin Burchell [Wed, 7 Nov 2012 22:23:45 +0000 (23:23 +0100)]
Fix a possible crash in QSoundEffect.
pa_stream_cork may fail, and pa_operation_unref won't handle that gracefully, so
check the return value before unreffing.
Done-with: Vesa-Matti Hartikainen
Change-Id: If789e37a13f85487c79dd8a03a7ca3624b1412d2
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Holger Ihrig [Thu, 8 Nov 2012 11:40:12 +0000 (12:40 +0100)]
Adding 3rdparty library libfftreal to install step
Adding libfftreal to install step in this directory, otherwise
it will not be deployed for the installers
Task-Number: QTBUG-27876
Change-Id: I090b61def94eee9c63d732067036b3ca5398cc52
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Shawn Rutledge [Fri, 19 Oct 2012 16:14:17 +0000 (18:14 +0200)]
All QWindow properties that have "window" in them have been renamed.
Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase.
Change-Id: I2903a7404a738ae651ba07d4bdc003520473bd80
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Sze Howe Koh [Wed, 7 Nov 2012 23:29:50 +0000 (07:29 +0800)]
Doc: Put QMediaMetaData in the Qt Multimedia module
This should have been done in
13fd00199a6a41af2bdbb876fe33c75547e3d996
Change-Id: I3ce6e3ccde5f29cce3c24ee539dee6fcdff7b653
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Thomas McGuire [Tue, 30 Oct 2012 15:48:15 +0000 (16:48 +0100)]
Blackberry: Add a page with platform-specific documentation
Change-Id: Ic03c59523648ee25c419ec5d80122da9a717aa2d
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Thomas McGuire [Tue, 30 Oct 2012 14:20:38 +0000 (15:20 +0100)]
Blackberry: Enable support for audioengine if available
BB10 ships OpenAL, so the audio engine works there.
Change-Id: I49ba6201788cb41cabb1670522dc97a36fd5f2c2
Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Jerome Pasion [Wed, 7 Nov 2012 13:02:40 +0000 (14:02 +0100)]
Doc: Removed extra qdocconf files.
The variables and macros are in qtbase/doc/global.
Corrected QHP variables.
Change-Id: I4b5816d0d0ce7a228ed27944fb9471f390f7334d
Reviewed-by: Martin Smith <martin.smith@digia.com>
Andras Becsi [Wed, 7 Nov 2012 13:44:28 +0000 (14:44 +0100)]
Fix the bufferProgress property of QDeclarativeAudio
The bufferProgress property of QDeclarativeAudio is documented to hold
how much of the data buffer is currently filled, from 0.0 (empty) to
1.0 (full) and should be declared to be of type qreal instead of int.
The implementation was correctly normalizing the buffer status
percentage to the [0, 1] range but the returned value was truncated
to int in QML because of the faulty property declaration.
Change-Id: I494c9cd14f4b3ec511759ae66a50e9f96bcb1452
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Sze Howe Koh [Wed, 31 Oct 2012 16:53:20 +0000 (00:53 +0800)]
Enable the "#include <QAudio>" camel-case header (regression)
The header was available in Qt 4, but somehow went missing.
Change-Id: I5e54921afd6e196d67db797331a0b0093f41ce34
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Sze Howe Koh [Wed, 31 Oct 2012 16:42:35 +0000 (00:42 +0800)]
Enable the "#include <QMultimedia>" camel-case header
Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have
sync.profile generate the camel-case header during compilation.
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Sze Howe Koh [Wed, 31 Oct 2012 16:33:21 +0000 (00:33 +0800)]
Rename namespace QtMultimedia -> QMultimedia
Main code, examples, tests and docs updated. Method:
1. Mass find+replace "QtMultimedia::" -> "QMultimedia::"
2. Hand-modified declaration in qtmedianamespace.h/cpp
For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed.
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Sze Howe Koh [Wed, 31 Oct 2012 16:05:13 +0000 (00:05 +0800)]
Enable the "#include <QMediaMetaData>" camel-case header
Move the QMediaMetaData namespace into new files, and have sync.profile
generate the camel-case header during compilation.
For now, the new header (qmediametadata.h) is included whereever the old
one appears (qtmedianamespace.h), but an audit will be done later to
make explicit #includes only where necessary.
NOTE: Git may think that a rename has occurred.
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: I63705722a5e175628d56128888a94ae4c20879f2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Sze Howe Koh [Wed, 31 Oct 2012 11:37:48 +0000 (19:37 +0800)]
Rename namespace QtMultimedia::MetaData -> QMediaMetaData
Main code, examples, tests and docs updated. Method:
1. Remove unused forward-declarations, "class QMediaMetaData"
2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData"
3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h
For consistency (with minimal disruption), namespaces with a "Qt" prefix
will be renamed. Also, Qt guidelines don't include nested namespaces
(http://lists.qt-project.org/pipermail/development/2012-October/006756.html)
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)
Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Oswald Buddenhagen [Wed, 24 Oct 2012 13:33:02 +0000 (15:33 +0200)]
adjust to qt_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now. note that in
the qmediaserviceprovider test we must override that.
also, TARGET munging is done automatically.
Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 2 Nov 2012 16:44:25 +0000 (17:44 +0100)]
fix VPATH
the code relied on the now removed qmake misfeature of adding DEPENDPATH
to VPATH.
Change-Id: I3bea30a25776eb945fbd65f9e9811c91d882893f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Jerome Pasion [Fri, 2 Nov 2012 14:40:51 +0000 (15:40 +0100)]
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia into newdocs
Change-Id: Idb607da32f80784d94556443be6740c6d7223411
Sergio Ahumada [Wed, 31 Oct 2012 21:19:06 +0000 (22:19 +0100)]
test: Mark tst_QSoundEffect as insignificant
Task-number: QTBUG-26509
Task-number: QTBUG-26748
Change-Id: Id8952c2ed3e2a261907eed1e160fc187af6983ce
Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
Stephen Kelly [Wed, 31 Oct 2012 13:54:11 +0000 (14:54 +0100)]
CMake: Remove obsolete test_modules test
The generated module_includes test is a super-set of this test.
Change-Id: I33d665a38d664c049028519d73dfad912fc22a1f
Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
Stephen Kelly [Mon, 29 Oct 2012 09:34:41 +0000 (10:34 +0100)]
CMake: Test module includes
Change-Id: I1676efff8071fa0fae13bb484a5e18928e35f663
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>