platform/upstream/qtmultimedia.git
11 years agoFix file path bug in audiorecorder example
Andy Nichols [Thu, 11 Apr 2013 23:20:06 +0000 (16:20 -0700)]
Fix file path bug in audiorecorder example

Default path and name of the output wave audio files were wrong.  This
means the files did not have the right name to be opened on Windows, and
did not have the right path because they were being saved to the root
folder. (C:/ on windows, and / on OSX).  Now we fall back to the default
filepath and name when we try to record without giving a path and
filename.

Task-number: QTBUG-28663
Change-Id: I8c782a31710cac65cd3c1ecd44de10b41c46e93d
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
11 years agoFix hang in tst_qaudioinput (Windows).
Friedemann Kleint [Thu, 11 Apr 2013 07:45:50 +0000 (09:45 +0200)]
Fix hang in tst_qaudioinput (Windows).

Task-number: QTBUG-28731

Change-Id: Iebe598f9e0760b05d05d5a6b6ecbeb535e745e2c
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
11 years agoFix tr()-Context in BlackBerry-plugin.
Friedemann Kleint [Mon, 15 Apr 2013 07:40:37 +0000 (09:40 +0200)]
Fix tr()-Context in BlackBerry-plugin.

Do not use QObject::tr().

Change-Id: I0444a0abb319d3ae7044c269d8f280ebf63128e3
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoFix for build break on QNX
El Mehdi Fekari [Thu, 11 Apr 2013 09:09:07 +0000 (11:09 +0200)]
Fix for build break on QNX

Disable the camera part as it's using APIs not supported for the PlayBook

Change-Id: I4e06a74e8a9e5a00e19e443b8aa304cf2bce2216
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoFix warnings found by GCC 4.8 in qtmultimedia
Thiago Macieira [Sat, 6 Apr 2013 20:57:18 +0000 (13:57 -0700)]
Fix warnings found by GCC 4.8 in qtmultimedia

qgstreamermessage.cpp:48:12: warning: ‘wuchi’ defined but not used [-Wunused-variable]
qvideosurfacegstsink.cpp:383:1: warning: narrowing conversion of ‘4278190080u’ from ‘unsigned int’ to ‘int’ inside { } [-Wnarrowing]

Change-Id: I678e9eb39f3963e20109bb15c9c0c0d118b5a3b2
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
11 years agoDoc: Fix minor typos
Sze Howe Koh [Sun, 31 Mar 2013 12:45:31 +0000 (20:45 +0800)]
Doc: Fix minor typos

Task-number: QTWEBSITE-514
Change-Id: Ie8f3689d18d15fd0e88e0ada4a745d9994d9c2ae
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Frederik Gladhorn [Fri, 5 Apr 2013 07:47:27 +0000 (09:47 +0200)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

11 years agoFix warnings in qtmultimedia
Thiago Macieira [Fri, 25 Jan 2013 21:45:06 +0000 (13:45 -0800)]
Fix warnings in qtmultimedia

/camerabinresourcepolicy.cpp:100:42: error: unused variable 'oldSet' [-Werror=unused-variable]
camerabincontrol.cpp:167:54: error: 'resourceSet' may be used uninitialized in this function [-Werror=maybe-uninitialized]
qaudiooutput_pulse.cpp:416:20: error: unused variable 'bytesWritten' [-Werror=unused-variable]

Change-Id: Idafd85b7985673f1f22d868b5f1b1e46a60ada4a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
11 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Wed, 3 Apr 2013 14:06:45 +0000 (16:06 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I905886417147ceb529ded43896939f65e66d7424

11 years agoInstall the jar file
BogDan Vatra [Fri, 29 Mar 2013 21:15:02 +0000 (23:15 +0200)]
Install the jar file

Change-Id: Ife46aba11920c5109d974f9e388e49320bf1a95a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoBump MODULE_VERSION to 5.1.0
Sergio Ahumada [Mon, 25 Mar 2013 10:13:12 +0000 (11:13 +0100)]
Bump MODULE_VERSION to 5.1.0

Change-Id: Id5c4f69f35bd55f79797f36d766cfe0a6d665766
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
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 agoAdd support for m3u8 playlist formats
Andy Shaw [Fri, 22 Mar 2013 14:14:17 +0000 (15:14 +0100)]
Add support for m3u8 playlist formats

m3u8 is just a unicode version of m3u so we can already handle these
without any extra coding other than adding it as a format

Change-Id: Icec0f1844bd2b0a0ea3c39b98f7b06cc402a3309
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoFix calculation bug in QWaveDecoder.
Christian Strømme [Wed, 20 Mar 2013 18:45:40 +0000 (19:45 +0100)]
Fix calculation bug in QWaveDecoder.

When comparing the size of the WaveHeader and the chunk size, we need to
include the ID and Size fields, or any extra data won't be discarded and
the parsing will fail.

Change-Id: I730833f33f57b26cd750985354136191f7e7ce04
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoStabilizes QAudioInput auto-test.
Yoann Lopes [Fri, 22 Mar 2013 17:02:40 +0000 (18:02 +0100)]
Stabilizes QAudioInput auto-test.

Change-Id: I85c7a38559e023f89271c0836730f6cec8f429cb
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
11 years agoMerge branch 'dev' into stable
Sergio Ahumada [Tue, 19 Mar 2013 08:55:03 +0000 (09:55 +0100)]
Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I0f78796735fc37e092b6747bdc89cc0f41164472

11 years agoTest the cmake multimediawidgets module only if widgets is available.
Stephen Kelly [Thu, 14 Mar 2013 13:16:12 +0000 (14:16 +0100)]
Test the cmake multimediawidgets module only if widgets is available.

Change-Id: I381e1b0883fb4fdc68627848ee39a26ce22e2ba5
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Thu, 14 Mar 2013 08:25:28 +0000 (09:25 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13

11 years agoRemove qaccessible2 bic data.
Frederik Gladhorn [Wed, 13 Mar 2013 14:10:41 +0000 (15:10 +0100)]
Remove qaccessible2 bic data.

Change-Id: I2c83f05c18753f5c692ec0c6f7701faec9f04416
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Tue, 12 Mar 2013 10:31:49 +0000 (11:31 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ia4e3edead13e2526a77133e7067e649784fd1358

11 years agoiOS: Fix build issues
Andy Nichols [Tue, 5 Mar 2013 14:23:13 +0000 (15:23 +0100)]
iOS: Fix build issues

This also prevents anything meaningful from working, but it is a
good starting point.

Change-Id: Idaf495ec29f611ee5342c79318bc3ace1d852747
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoBlackBerry/QNX: Implement audio recording with QAudioInput
Tobias Koenig [Mon, 25 Feb 2013 09:58:05 +0000 (10:58 +0100)]
BlackBerry/QNX: Implement audio recording with QAudioInput

Change-Id: I62cad152a7b7fd92905744439de838306dc7a558
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoAndroid multimedia plug-in.
Christian Strømme [Mon, 14 Jan 2013 13:23:38 +0000 (14:23 +0100)]
Android multimedia plug-in.

Adds MediaPlayer support for Android.

Change-Id: I4c7b1e19927b2e50b227f3a3b3f7ca2e99397618
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoGStreamer: fixed build when using GST_PHOTOGRAPHY.
Yoann Lopes [Thu, 28 Feb 2013 14:28:56 +0000 (15:28 +0100)]
GStreamer: fixed build when using GST_PHOTOGRAPHY.

CameraBinExposure was reimplementing the Qt4 version of
QCameraExposureControl instead of the refactored version of Qt5.
Zoom features were still handled in CameraBinFocus but these have been
moved to their own control in Qt5.

Task-number: QTBUG-29300

Change-Id: I0c71cac6011137bc5457f0d362da44c72039004a
Reviewed-by: Christian Stromme <christian.stromme@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 agoDoc: Clarify and polish docs for QAudio[Input|Output]::start()
Sze Howe Koh [Fri, 22 Feb 2013 15:11:19 +0000 (23:11 +0800)]
Doc: Clarify and polish docs for QAudio[Input|Output]::start()

QAudio[Input|Output] retains ownership of the QIODevices that are
returned.

Change-Id: Ieb2f319eef906822debc13b4399d7e7336024552
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoUse qmake for package dependency resolution in cmake tests.
Stephen Kelly [Tue, 26 Feb 2013 12:26:45 +0000 (13:26 +0100)]
Use qmake for package dependency resolution in cmake tests.

This allows us to remove hardcoded depends information.

Change-Id: If8f3b8e9e75db3b0b78864626314ebebb96c548f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoBlackBerry: Mirror viewfinder for front camera
Tobias Koenig [Tue, 26 Feb 2013 07:49:16 +0000 (08:49 +0100)]
BlackBerry: Mirror viewfinder for front camera

If the camera viewfinder shows the front camera
we mirror the image now to avoid that on rotation
of the device the image tilts to the wrong side.
The captured image however is not mirrored.

Change-Id: I6127b8ee6552553efe56ebec81991f0bd7597f47
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoMerge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Frederik Gladhorn [Tue, 26 Feb 2013 10:32:17 +0000 (11:32 +0100)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

11 years agoDoc: Adding Qt Multimedia Widgets documentation.
Jerome Pasion [Mon, 25 Feb 2013 12:58:21 +0000 (13:58 +0100)]
Doc: Adding Qt Multimedia Widgets documentation.

-added landing page and module page
-linked to Qt Multimedia and Qt Widgets
-excluded multimediawidgets dir from the Qt Multimedia documentation

Task-number: QTBUG-29339
Change-Id: Iaa8dc4117505d5635b8cab97ed5c10e9c4a289e6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
11 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Mon, 25 Feb 2013 11:00:09 +0000 (12:00 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2cb815afa62d442419b0ee08088fb5d85907c2f1

11 years agoBlackBerry/QNX: Add a new backend for Blackberry handling audio
Kevin Ottens [Thu, 21 Feb 2013 13:28:12 +0000 (14:28 +0100)]
BlackBerry/QNX: Add a new backend for Blackberry handling audio

For now it only implements the audio output part.
The plugin can be used on all QNX systems (including BB10) that
provide a libasound version < 1.0.10.

Change-Id: Ifcfd871558d5d2bfb9e8a5f5ef0cfe009c0a111d
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoAdd license files mandated by (L)GPL.
Timo Jyrinki [Fri, 8 Feb 2013 07:10:55 +0000 (09:10 +0200)]
Add license files mandated by (L)GPL.

Currently only qtbase includes the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules as well, so that the
(L)GPL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL

As an addition to above, added also LICENSE.FDL. All the modules
additionally require it, since they include at least *.qdoc files and in
some cases a couple of others.

File received via
wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL

Change-Id: I39ae1b6beee8d626855a747fdf8d794e6574313b
Reviewed-by: Jason McDonald <macadder1@gmail.com>
11 years agoBlackberry: Implement QVideoRendererControl for QMediaPlayer backend
Tobias Koenig [Tue, 19 Feb 2013 14:51:30 +0000 (15:51 +0100)]
Blackberry: Implement QVideoRendererControl for QMediaPlayer backend

If the application is not supposed to play back DRM secured media,
we grab the pixel data from the native mmrenderer window now
and make them available to the QAbstractVideoSurface of the
QVideoRendererControl. This allows the usage of all transformations
on video output inside QtQuick.

Change-Id: I73d05404b1ac9c5f74a234d9393b981a6fbcb317
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoBlackberry: Grab viewfinder frames from native window
Tobias Koenig [Wed, 13 Feb 2013 10:57:02 +0000 (11:57 +0100)]
Blackberry: Grab viewfinder frames from native window

Since the conversion from NV12 to RGB on the CPU does not scale
for larger photo/video resolutions, this patch uses a different
approach. It uses the low-level screen API to grab screenshots
of the native viewfinder window and provides them as QImage to
the QAbstractVideoSurface. Even for large resolutions this
is quite performant.

Change-Id: I59a7cbe6850b3b07575ea10026f3180cfd22e935
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.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 agoadd error handling in image capturing in camera
Jing Bai [Thu, 13 Dec 2012 13:00:02 +0000 (14:00 +0100)]
add error handling in image capturing in camera

Task-number: QTBUG-28589
Change-Id: Ib3a04038c16beba66f8b8cff85b310dad9a4460a
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
11 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Tue, 19 Feb 2013 16:14:43 +0000 (17:14 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
src/multimedia/doc/qtmultimedia.qdocconf
src/plugins/blackberry/mediaplayer/bbmetadata.cpp
src/plugins/blackberry/mediaplayer/bbmetadata.h
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp

Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a

11 years agoBlackberry: Add support for reading meta data in QMediaPlayer
Tobias Koenig [Thu, 14 Feb 2013 16:19:50 +0000 (17:19 +0100)]
Blackberry: Add support for reading meta data in QMediaPlayer

Provide an implementation of QMetaDataReaderControl for the
QMediaPlayer.

Change-Id: I58c04e40ae3f07013450997410d0a379273c7bde
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoBlackberry: Extend platform-specific documentation
Tobias Koenig [Tue, 19 Feb 2013 08:17:12 +0000 (09:17 +0100)]
Blackberry: Extend platform-specific documentation

Reflect camera support in Blackberry-specific documentation page.

Change-Id: I5267a32b99aa88cd73f33fe045d67579442f9932
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoBlackberry: Fix resolution selection for video recording
Tobias Koenig [Tue, 12 Feb 2013 09:26:55 +0000 (10:26 +0100)]
Blackberry: Fix resolution selection for video recording

Fix the selection of the video viewfinder resolution depending
on the features provided by the camera. If the viewfinder is responsible
for encoding the video frames, the resolution of the viewfinder
and the video output must match. Otherwise only the ratio must match
and we can use a lower resolution for the viewfinder to improve
the performance of the NV12->RGB frame conversion.

Change-Id: I66ace84841a69be84f83bf9c5240cd23d96fbb76
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
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 agoRemove QEXPECT_FAIL on Linux for QPainterVideoSurface::shaderPresent
Andy Nichols [Tue, 19 Feb 2013 10:49:20 +0000 (11:49 +0100)]
Remove QEXPECT_FAIL on Linux for QPainterVideoSurface::shaderPresent

These tests seem to be passing consistently now, so this is an attempt
to reenable them on Linux, as right now passing them on some Linux
machines in CI is causing failures.

Task-number: QTBUG-26320
Change-Id: I4f2b219dc694e24d8beee651919f3b805922bde1
Reviewed-by: Tobias Koenig
Reviewed-by: Sean Harmer <sean.harmer@kdab.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 agoFix MinGW-warnings about mismatched types.
Friedemann Kleint [Thu, 14 Feb 2013 11:09:58 +0000 (12:09 +0100)]
Fix MinGW-warnings about mismatched types.

Change-Id: I6170e3aa49f5b60ba68c1ef5bb2c6c7ec6688060
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoDSVideoWidgetControl: Fix constructor order.
Friedemann Kleint [Thu, 14 Feb 2013 11:06:19 +0000 (12:06 +0100)]
DSVideoWidgetControl: Fix constructor order.

Change-Id: I804427867a0f400750ef1df423c89fb4948bb0a3
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoFix warnings about unused variables.
Friedemann Kleint [Thu, 14 Feb 2013 11:00:46 +0000 (12:00 +0100)]
Fix warnings about unused variables.

Change-Id: I147ff8624faa98396d6c48801c41a731fd02ac10
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoFix MinGW64-warnings about unknown pragmas.
Friedemann Kleint [Thu, 14 Feb 2013 10:57:46 +0000 (11:57 +0100)]
Fix MinGW64-warnings about unknown pragmas.

Change-Id: I1bd2178f5986846aede371193e98b55e4bde6414
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoDSVideoWidgetSurface: Pass on parent to base class.
Friedemann Kleint [Thu, 14 Feb 2013 10:56:04 +0000 (11:56 +0100)]
DSVideoWidgetSurface: Pass on parent to base class.

Change-Id: If4f2819a0767234e5fffeafe1ab038cbf13bdd2a
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoReduce MinGW64-warnings about mixerID.
Friedemann Kleint [Thu, 14 Feb 2013 10:52:33 +0000 (11:52 +0100)]
Reduce MinGW64-warnings about mixerID.

warning: cast to pointer from integer of ifferent size.

Change-Id: I4294fe7b67c56d1eca59f81c3af26919ad5089a8
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
11 years agoFix signature of the waveInProc/waveOutProc callbacks.
Friedemann Kleint [Thu, 14 Feb 2013 10:43:18 +0000 (11:43 +0100)]
Fix signature of the waveInProc/waveOutProc callbacks.

Parameters are DWORD_PTR instead of DWORD, which did not matter
on 32bit but caused MinGW64-compiler warnings and potential
crashes on 64bit.

Change-Id: I840ae3ea7ea532746f73f20b3233cae842931d45
Reviewed-by: Yoann Lopes <yoann.lopes@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 agoBlackberry: Fix orientation of taken photos
Tobias Koenig [Fri, 8 Feb 2013 16:38:25 +0000 (17:38 +0100)]
Blackberry: Fix orientation of taken photos

Ensure that the taken photos are always upright.
As long as the QCamera API does not provide information about
the native orientation of the camera, we have to do the rotation
inside the BBCamera plugin.

Change-Id: Iebb04a5417274c2baee5e944dadf10fc706484d9
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
11 years agoBlackberry: Restart camera viewfinder after standby
Tobias Koenig [Fri, 8 Feb 2013 12:35:28 +0000 (13:35 +0100)]
Blackberry: Restart camera viewfinder after standby

Listen to the CAMERA_STATUS_POWERUP signal, which is sent
after standby, and trigger a restart of the viewfinder
in this case.

Change-Id: I426f23657844bb270ddfd0e4bfb35880040aa583
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoBlackberry: Ensure that camera viewfinder texture is upright
Tobias Koenig [Fri, 8 Feb 2013 09:51:07 +0000 (10:51 +0100)]
Blackberry: Ensure that camera viewfinder texture is upright

Make sure that the texture is upright when the device is upright.
When rotating the device, it's the applications responsibility to
rotate the texture of the viewfinder (e.g. through the
QDeclarativeVideoOutput::orientation property).

Change-Id: I6e453ce9bdde5197104533f844b1079b3c3db908
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoBlackberry: Add camera support for BB10 platform
Tobias Koenig [Thu, 31 Jan 2013 09:48:16 +0000 (10:48 +0100)]
Blackberry: Add camera support for BB10 platform

Reimplement all camera related controls as they are supported by the
BB10 camera API.

Change-Id: Ie7d2258be22c1c1821489bd7074b80cff4242afa
Reviewed-by: Bernd Weimer <bweimer@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 agoBlackberry: Fix warning about unsigned integer comparison
Thomas McGuire [Thu, 31 Jan 2013 16:14:42 +0000 (17:14 +0100)]
Blackberry: Fix warning about unsigned integer comparison

Change-Id: I00592dd078e85497589156e156e7a665f935d325
Reviewed-by: Sean Harmer <sean.harmer@kdab.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 agoBlackberry: Refactor plugin directory structure
Tobias Koenig [Thu, 31 Jan 2013 08:53:51 +0000 (09:53 +0100)]
Blackberry: Refactor plugin directory structure

Move the mediaplayer related code in its own subdirectory.
This is a preparation for adding camera support in the future.

Change-Id: I880ff90e154165c2a3a31fd2b51e1dd224fea8fd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.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 agoRemove QT_{BEGIN,END}_HEADER macro usage
Sergio Ahumada [Sun, 27 Jan 2013 08:19:58 +0000 (09:19 +0100)]
Remove QT_{BEGIN,END}_HEADER macro usage

The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@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 agoBump Qt version to 5.1.0
Frederik Gladhorn [Fri, 11 Jan 2013 12:53:15 +0000 (13:53 +0100)]
Bump Qt version to 5.1.0

Change-Id: I68f5c34fe14860c40537a23f28e741f0ac1eef1e
Reviewed-by: David Faure (KDE) <faure@kde.org>
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>