Frederik Gladhorn [Thu, 20 Jun 2013 14:29:21 +0000 (16:29 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iaadfcd68fec91611b6341860e41a70b9023719de
Sze Howe Koh [Sun, 26 May 2013 22:38:02 +0000 (06:38 +0800)]
Doc: Fix some broken links and quote paths
The correct paths are relative to:
- <reporoot>/examples/<module>, or
- <reporoot>/src/<module>
Removing the module specifier fixes these links/quotes.
Change-Id: I6be4f28c44bd26361b60a394158b0e6cc46b1ec0
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Frederik Gladhorn [Wed, 12 Jun 2013 12:45:09 +0000 (14:45 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ic82ed2ba60d9855f1490d4ca66451dbc42ae6e2f
Bernd Weimer [Mon, 27 May 2013 10:58:59 +0000 (12:58 +0200)]
Purged ALSA implementation
Avoided potential memory leak and null pointer access, removed unused
variables, reduced redundant code, etc.
Change-Id: Ia0ddf56a7a1a0f142f2edb070c2c0b32cbf76ce7
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Tasuku Suzuki [Tue, 8 Jan 2013 13:16:24 +0000 (22:16 +0900)]
disable module when gui is not available
Change-Id: I414b67d8c4fe34a41e1d96d51879138c01c6e3a5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Tobias Koenig [Tue, 4 Jun 2013 14:09:32 +0000 (16:09 +0200)]
BlackBerry: Fix frame size of video playback
Adapt the frame size dynamically, since mmrenderer resizes
the source viewport of the native video window at runtime on
some hardware platforms.
Task-number: QTBUG-31534
Change-Id: Ie637d7a80697175dacb454535fbe251b2c7a6809
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Frederik Gladhorn [Tue, 4 Jun 2013 17:50:11 +0000 (19:50 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
Topi Reinio [Fri, 31 May 2013 14:02:06 +0000 (16:02 +0200)]
Doc: Add Qt Multimedia platform notes for Windows
Add a page with details about Qt Multimedia backends on Windows, and
link to it from the module index page.
Initially, cover the status of camera backend in WMF and DirectShow
plugins.
Task-number: QTBUG-29552
Change-Id: I53e5901e2d621c4bbc96a61d5dbb249b4debb8d4
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Jerome Pasion [Thu, 30 May 2013 13:43:19 +0000 (15:43 +0200)]
Doc: Adding import statement for in Qt Multimedia QML Types
Change-Id: I17e108c5d8524fe428ab8f0ca14130cd4bb78d2d
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Mitch Curtis [Fri, 31 May 2013 08:32:39 +0000 (10:32 +0200)]
Fix typo in QMediaPlayer docs.
Change-Id: I0b9110488a2d116cea73abe30f80fc1f487029aa
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sergio Ahumada [Tue, 28 May 2013 18:24:04 +0000 (20:24 +0200)]
Bump MODULE_VERSION to 5.1.1
Change-Id: Id8ce3bd0f245e25930506cdaf8d9a7a23bed2cc1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Eskil Abrahamsen Blomfeldt [Tue, 28 May 2013 07:57:08 +0000 (09:57 +0200)]
Android: Fix compilation on Windows
The qtCompileTest function in configure.prf does not work when
cross-compiling on Windows because it detects the wrong make executable.
And it's anyway not the best way to do this, since what we really want
to check for is the existence of the SDK version, whereas the compile
test could potentially hide a lot of other problems under the same
error message.
Task-number: QTBUG-31405
Change-Id: I2c16b214e40bac5751d4e7098edcc30318756621
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Liang Qi [Mon, 27 May 2013 12:05:36 +0000 (14:05 +0200)]
Update all plugins.qmltypes files
Task-number: QTBUG-31388
Change-Id: Ia65490a262417f98fe69a89637ec2f9e7c0d0095
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Friedemann Kleint [Fri, 24 May 2013 07:15:53 +0000 (09:15 +0200)]
WMF-plugin: Fix warnings about unused variables.
Change-Id: I2b7864463799b23418fc4c3099d73a63709fe8c5
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Liang Qi [Mon, 27 May 2013 12:05:05 +0000 (14:05 +0200)]
Update qmldir file for QtAudioEngine
Change-Id: I2fe64c72520a7b2b6b1d79bbddfdeb7d0bf4f977
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Sergio Ahumada [Fri, 24 May 2013 20:21:15 +0000 (22:21 +0200)]
sync.profile: Point dependencies to an empty string
This means that we are going to use the same branch name for the
dependencies as the branch of the repository under test.
If we are testing the 'stable' branch, all dependencies will point
to the 'stable' branch as well.
Change-Id: I8f899a9a9fb9e94b99a9250eb5eb2dbe2eed8fc5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Jerome Pasion [Fri, 24 May 2013 08:45:52 +0000 (10:45 +0200)]
Doc: Removed multimedia overview from "technology-apis" group.
The group in qtdoc was removed.
Change-Id: Ifa8b67421f4eb7b117ee947b186c85bfdd5a8c5d
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Frederik Gladhorn [Thu, 23 May 2013 11:15:45 +0000 (13:15 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
Christian Strømme [Tue, 14 May 2013 08:14:39 +0000 (10:14 +0200)]
Android: add libQt5MultimediaQuick_p to the list of dependencies.
libQt5MultimediaQuick_p is first loaded as a result of a qml import, and
is therefore not detected as a dependency.
Note that libQt5MultimediaQuick_p will only be added as a dependency if
QtQuick is used.
Task-number: QTBUG-30861
Change-Id: I8ce818ef1648302bbbbdf63ef133185a66b66cca
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Yoann Lopes [Tue, 21 May 2013 14:09:33 +0000 (16:09 +0200)]
Android: fixed crash when resetting the video surface.
Change-Id: I64a28cbcb8a48d13a9e1c98005da9f4cce821cb4
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Yoann Lopes [Thu, 16 May 2013 17:03:50 +0000 (19:03 +0200)]
Fixed signal not being emitted in QDeclarativeCameraFocus.
Change-Id: If504ec5ecc59c46edeac24442181eedaacc7e5d8
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Friedemann Kleint [Wed, 8 May 2013 09:34:31 +0000 (11:34 +0200)]
Make directshow-plugin available.
No longer include <qedit.h> in directshow-plugin,
which no longer ships in newer SDKs.
Ensure it only provides the camera service if the
WMF-plugin is built by using a different .json-file.
Adapt qcamerabackend-test to use widgets.
Task-number: QTBUG-28047
Change-Id: I22ea441b9edb56ff55bc275dba37c01c77d8dd90
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Sze Howe Koh [Sun, 28 Apr 2013 07:01:25 +0000 (15:01 +0800)]
Decouple qmediametadata.h from qmultimedia.h
qmultimedia.h is included in more places, but qmediametadata.h is
larger. This patch should reduce unnecessary #include-ing.
Change-Id: I4a3d174bafc555d794bb75087c1f6b79745ae903
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
David Fries [Tue, 2 Apr 2013 04:00:00 +0000 (23:00 -0500)]
qmlvideo example, add missing #ifdef PERFORMANCEMONITOR_SUPPORT
This usage of PerformanceMonitor needs to be protected by the same
preprocessor check as the header include that makes it available.
Change-Id: Ie8a1b6e99a61c333ceedcf2e9751235fc2efb415
Reviewed-by: Martin Smith <martin.smith@digia.com>
Thomas McGuire [Thu, 25 Apr 2013 14:06:08 +0000 (16:06 +0200)]
VideoOutput: Take the surface's viewport into account
Task-Number: QTBUG-30410
Change-Id: I480ce0bcd7ec136e54b5bfc5fec0e901141b72d8
Reviewed-by: Josh Faust <jfaust@suitabletech.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Masaya TAKAHASHI [Wed, 1 May 2013 05:18:48 +0000 (14:18 +0900)]
Doc: Fix missing element name in Video
Change-Id: I2237bf4a1da632f0528cfb9e6b32ea88f3930350
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Topi Reinio [Fri, 3 May 2013 13:07:48 +0000 (15:07 +0200)]
Doc: Define example install paths in .qdocconf
QDoc needs to know the directory under which the examples are
installed in QT_INSTALL_EXAMPLES. Without them, example manifest files
may contain invalid paths.
Change-Id: I3d27517e41e3b1deb7643ca1a40f3905c0e5cc1a
Reviewed-by: Martin Smith <martin.smith@digia.com>
Eskil Abrahamsen Blomfeldt [Thu, 2 May 2013 09:30:55 +0000 (11:30 +0200)]
Make it possible to bundle Android builds
We need to adapt to the way the jar builds are split on Android,
into a jar file which can be bundled and one which can be distributed
and loaded on the classpath.
We also need to add meta-information about which plugins the
module depends on so that they can be bundled as well.
Task-number: QTBUG-30751
Change-Id: I5cca51c3732ce72985df29672a219c3fd4fe7bac
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Fawzi Mohamed [Tue, 30 Apr 2013 10:39:05 +0000 (12:39 +0200)]
audioengine: update qmltypes
Change-Id: I13488291f543748716891cfa0ab9b5dd548ccc86
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Topi Reinio [Fri, 26 Apr 2013 13:50:01 +0000 (15:50 +0200)]
Doc: Fix example paths referred in documentation
qdocconf files for both Qt Multimedia and Qt Multimedia Widgets already
define the correct example path. This change fixes also the example
documentation to use the correct path, as well as the link to examples
in Multimedia Overview.
Change-Id: I72d75027ee18f6398eb76dc40bcc3d122541b1c9
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Christian Strømme [Fri, 26 Apr 2013 12:49:45 +0000 (14:49 +0200)]
Android: Added config tests for multimedia on android.
The Android multimedia plug-in requires API level 11 to compile, so the
config test will check and issue a message about the requirement if the
API level can't be satisfied.
Change-Id: I6c21fe1255024e853023bd8168dfa917b00c4c23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Jan Arve Saether [Mon, 29 Apr 2013 13:03:25 +0000 (15:03 +0200)]
Fix bic autotest
Caused by https://codereview.qt-project.org/54820
I actually tried to avoid this with
https://codereview.qt-project.org/54837
but my assumption was wrong.
Change-Id: If0db8c9b5a317e07d97bcf97056b44e2124d1e1b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Frederik Gladhorn [Mon, 29 Apr 2013 12:19:29 +0000 (14:19 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0f0457e9863f540b7bd8bc104c92891d8cf5c483
Oswald Buddenhagen [Fri, 26 Apr 2013 12:58:31 +0000 (14:58 +0200)]
remove pointless LIBS path
QT+=multimedia handles that already.
Change-Id: Ifc3be513be10d89de3ea03f11f9d41d7d56d432b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 26 Apr 2013 12:57:57 +0000 (14:57 +0200)]
remove pointless code
qt_plugin.prf handles it all.
Change-Id: I689b68ee18d43723e2fa0d7c17b48a9dcac541aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Jerome Pasion [Tue, 23 Apr 2013 11:13:45 +0000 (13:13 +0200)]
Doc: Several cosmetic doc fixes.
-changed title of "Qt Multimedia Overview" to "Multimedia". It follows
the other topic titles from qtdoc.
-fixed column widths of paragraphs
Change-Id: I8a12d1d9a2a9c3ca184d69ebe464c80721a117f7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Dominik Holland [Thu, 18 Apr 2013 15:16:38 +0000 (17:16 +0200)]
Reset VideoSurface pointer when deleted
Change-Id: Iec74c8a8b914d2c2765e0e1f319d89f3daedfe3f
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Thomas McGuire [Fri, 19 Apr 2013 14:44:02 +0000 (16:44 +0200)]
Playbook: Work around failing screen_read_window()
Change-Id: Ie029585b3ac1420fe461523b67aa8b65193e23b0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Topi Reinio [Wed, 17 Apr 2013 13:14:58 +0000 (15:14 +0200)]
Doc: Fix module names in .qdocconf for Qt Multimedia & Widgets
This change fixes QCH documentation title for Qt Multimedia Widgets.
Also, the project names are changed to use CamelCase - this is required
as qdoc will generate visible output (tags in example manifest files)
based on those names.
Also, removes documentation topic for QML types from Qt Multimedia
Widgets as it doesn't have any.
Change-Id: Ic5f3b7a3094a1012f3c356f0195a8eb40d9d9e35
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Andrew den Exter [Wed, 17 Apr 2013 05:13:56 +0000 (15:13 +1000)]
Fix crash on idle status change with 64 bit architectures.
bool and gboolean are not necessarily the same size on all
architectures, and if gboolean is larger than bool then passing it
as an argument to g_object_get can trash the stack. In this case
overwriting some of the session pointer.
Change-Id: Iaa7be6a327e9f69212bd7d5bb372d33f2026db0f
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Andy Nichols [Fri, 12 Apr 2013 12:10:26 +0000 (14:10 +0200)]
AVFoundation: Emit error when media fails to load
This also makes sure that if you attempt to load an invalid media file
while another file is playing that the old session is stopped.
Task-number: QTBUG-30411
Change-Id: Ied4dbaffeac50465112c1e94e7c69d1600a6de51
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Dan Winkler <dantwinkler@gmail.com>
Andy Nichols [Fri, 12 Apr 2013 12:13:49 +0000 (14:13 +0200)]
AVFoundation: Remove stray semicolon after condition
Change-Id: I1c9a822ee54e7c189fe8806a11334cd23cd79a31
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
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>
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>
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>
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>
Frederik Gladhorn [Fri, 12 Apr 2013 10:55:44 +0000 (12:55 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If2b8ea3be8fdaee2469c5d1c6b29c19dba1eb192
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>
Stephen Kelly [Thu, 11 Apr 2013 13:09:39 +0000 (15:09 +0200)]
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Stephen Kelly [Thu, 11 Apr 2013 12:05:54 +0000 (14:05 +0200)]
Delay deletion of the QNetworkAccessManager.
Fixes unit test which crashes on exit.
Task-number: QTBUG-30630
Change-Id: I1e13cdc21c4297e492bf74d9a546a91510894288
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
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>
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
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>
Frederik Gladhorn [Wed, 3 Apr 2013 14:06:45 +0000 (16:06 +0200)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I905886417147ceb529ded43896939f65e66d7424
Frederik Gladhorn [Wed, 3 Apr 2013 12:58:39 +0000 (14:58 +0200)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I9478c1d06b4b4c3bedf1947c709028c6435caf5c
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>
Frederik Gladhorn [Wed, 27 Mar 2013 13:31:38 +0000 (14:31 +0100)]
Update module version to 5.2.0
Change-Id: Ibff36fc348efc7e3282de10a0c73bc68a2b7d4b5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Frederik Gladhorn [Wed, 27 Mar 2013 13:31:37 +0000 (14:31 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I6b92013d9fb14b11141d1a15c183776b2b3309fa
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>
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>
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>
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>
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>
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>
Tobias Koenig [Tue, 26 Feb 2013 11:00:43 +0000 (12:00 +0100)]
Add autoOrientation property to QDeclarativeVideoOutput
The autoOrientation property is a flag to switch on/off
automatic rotation of the video output, depending on the
current screen orientation, to always show the output
upright. This is useful when the VideoOutput is used as
viewfinder for a Camera.
Change-Id: I72753888592dc59c9adaa3343bfec8b168343229
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
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
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>
Frederik Gladhorn [Thu, 14 Mar 2013 08:25:28 +0000 (09:25 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13
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>
Frederik Gladhorn [Tue, 12 Mar 2013 10:31:49 +0000 (11:31 +0100)]
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ia4e3edead13e2526a77133e7067e649784fd1358
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
Frederik Gladhorn [Mon, 25 Feb 2013 11:00:09 +0000 (12:00 +0100)]
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2cb815afa62d442419b0ee08088fb5d85907c2f1
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>
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>
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>
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>
Johanna Aijala [Thu, 21 Feb 2013 07:30:40 +0000 (09:30 +0200)]
Merge branch 'stable' into release
Change-Id: I21911e86a651caa599110317a5e677cd61db4e86
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>