summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qmlvideo example, add missing #ifdef PERFORMANCEMONITOR_SUPPORTv5.1.0-beta1David Fries2013-05-081-0/+2
| | | | | | | | 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>
* VideoOutput: Take the surface's viewport into accountThomas McGuire2013-05-076-14/+74
| | | | | | | | Task-Number: QTBUG-30410 Change-Id: I480ce0bcd7ec136e54b5bfc5fec0e901141b72d8 Reviewed-by: Josh Faust <jfaust@suitabletech.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Fix missing element name in VideoMasaya TAKAHASHI2013-05-061-15/+15
| | | | | | Change-Id: I2237bf4a1da632f0528cfb9e6b32ea88f3930350 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Define example install paths in .qdocconfTopi Reinio2013-05-032-0/+6
| | | | | | | | | 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>
* Make it possible to bundle Android buildsEskil Abrahamsen Blomfeldt2013-05-035-14/+25
| | | | | | | | | | | | | 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>
* audioengine: update qmltypesFawzi Mohamed2013-04-301-43/+53
| | | | | Change-Id: I13488291f543748716891cfa0ab9b5dd548ccc86 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: Fix example paths referred in documentationTopi Reinio2013-04-3015-29/+29
| | | | | | | | | | | 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>
* Android: Added config tests for multimedia on android.Christian Strømme2013-04-293-0/+12
| | | | | | | | | 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>
* Fix bic autotestJan Arve Saether2013-04-294-112/+12
| | | | | | | | | | | | 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>
* remove pointless LIBS pathOswald Buddenhagen2013-04-261-2/+0
| | | | | | | QT+=multimedia handles that already. Change-Id: Ifc3be513be10d89de3ea03f11f9d41d7d56d432b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless codeOswald Buddenhagen2013-04-261-5/+1
| | | | | | | qt_plugin.prf handles it all. Change-Id: I689b68ee18d43723e2fa0d7c17b48a9dcac541aa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Several cosmetic doc fixes.Jerome Pasion2013-04-233-50/+65
| | | | | | | | | | -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>
* Reset VideoSurface pointer when deletedDominik Holland2013-04-232-3/+4
| | | | | Change-Id: Iec74c8a8b914d2c2765e0e1f319d89f3daedfe3f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Playbook: Work around failing screen_read_window()Thomas McGuire2013-04-191-0/+24
| | | | | | Change-Id: Ie029585b3ac1420fe461523b67aa8b65193e23b0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Mehdi Fekari <mfekari@rim.com>
* Doc: Fix module names in .qdocconf for Qt Multimedia & WidgetsTopi Reinio2013-04-192-30/+26
| | | | | | | | | | | | | 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>
* Fix crash on idle status change with 64 bit architectures.Andrew den Exter2013-04-171-1/+1
| | | | | | | | | | 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>
* AVFoundation: Emit error when media fails to loadAndy Nichols2013-04-172-8/+9
| | | | | | | | | | | 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>
* AVFoundation: Remove stray semicolon after conditionAndy Nichols2013-04-161-1/+1
| | | | | Change-Id: I1c9a822ee54e7c189fe8806a11334cd23cd79a31 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix file path bug in audiorecorder exampleAndy Nichols2013-04-162-22/+0
| | | | | | | | | | | | | 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>
* Fix hang in tst_qaudioinput (Windows).Friedemann Kleint2013-04-161-2/+2
| | | | | | | Task-number: QTBUG-28731 Change-Id: Iebe598f9e0760b05d05d5a6b6ecbeb535e745e2c Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Fix tr()-Context in BlackBerry-plugin.Friedemann Kleint2013-04-151-2/+2
| | | | | | | Do not use QObject::tr(). Change-Id: I0444a0abb319d3ae7044c269d8f280ebf63128e3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix for build break on QNXEl Mehdi Fekari2013-04-122-2/+12
| | | | | | | | 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>
* Fix warnings found by GCC 4.8 in qtmultimediaThiago Macieira2013-04-112-4/+5
| | | | | | | | 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>
* Doc: Fix minor typosSze Howe Koh2013-04-104-5/+5
| | | | | | Task-number: QTWEBSITE-514 Change-Id: Ie8f3689d18d15fd0e88e0ada4a745d9994d9c2ae Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-04-052-0/+50
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-032-0/+50
| |\ | | | | | | | | | Change-Id: I905886417147ceb529ded43896939f65e66d7424
| | * Add changes-5.0.2 filev5.0.2Sergio Ahumada2013-03-251-0/+48
| | | | | | | | | | | | | | | | | | Change-Id: Ic13e37a08fdb391796416ba3a9ea7aabe7934835 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | * Disable FFT when building in static modeDavid Faure2013-03-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Fix warnings in qtmultimediaThiago Macieira2013-04-033-1/+4
|/ / | | | | | | | | | | | | | | | | /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>
* | Install the jar fileBogDan Vatra2013-04-021-0/+4
| | | | | | | | | | | | Change-Id: Ife46aba11920c5109d974f9e388e49320bf1a95a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | Change-Id: Id5c4f69f35bd55f79797f36d766cfe0a6d665766 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add support for m3u8 playlist formatsAndy Shaw2013-03-241-5/+5
| | | | | | | | | | | | | | | | 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>
* | Fix calculation bug in QWaveDecoder.Christian Strømme2013-03-223-3/+7
| | | | | | | | | | | | | | | | | | 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>
* | Stabilizes QAudioInput auto-test.Yoann Lopes2013-03-221-2/+2
| | | | | | | | | | Change-Id: I85c7a38559e023f89271c0836730f6cec8f429cb Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-19293-1439/+12298
|\ \ | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I0f78796735fc37e092b6747bdc89cc0f41164472
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-1417-216/+368
| |\ \ | | | | | | | | | | | | Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13
| * | | Remove qaccessible2 bic data.Frederik Gladhorn2013-03-134-704/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2c83f05c18753f5c692ec0c6f7701faec9f04416 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | | iOS: Fix build issuesAndy Nichols2013-03-114-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | BlackBerry/QNX: Implement audio recording with QAudioInputTobias Koenig2013-03-114-2/+593
| | | | | | | | | | | | | | | | | | | | Change-Id: I62cad152a7b7fd92905744439de838306dc7a558 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | | Android multimedia plug-in.Christian Strømme2013-03-0630-0/+3443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds MediaPlayer support for Android. Change-Id: I4c7b1e19927b2e50b227f3a3b3f7ca2e99397618 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * | | BlackBerry: Mirror viewfinder for front cameraTobias Koenig2013-02-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-264-0/+1660
| |\ \ \ | | | | | | | | | | | | | | | refs/staging/dev
| | * \ \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-254-0/+1660
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I2cb815afa62d442419b0ee08088fb5d85907c2f1
| * | | | | Doc: Adding Qt Multimedia Widgets documentation.Jerome Pasion2013-02-267-5/+165
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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>
| * | | | BlackBerry/QNX: Add a new backend for Blackberry handling audioKevin Ottens2013-02-2512-0/+1170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Blackberry: Implement QVideoRendererControl for QMediaPlayer backendTobias Koenig2013-02-2210-17/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Blackberry: Grab viewfinder frames from native windowTobias Koenig2013-02-216-142/+453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | add error handling in image capturing in cameraJing Bai2013-02-193-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28589 Change-Id: Ib3a04038c16beba66f8b8cff85b310dad9a4460a Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * | | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-191042-1430/+65915
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Blackberry: Add support for reading meta data in QMediaPlayerTobias Koenig2013-02-199-1/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide an implementation of QMetaDataReaderControl for the QMediaPlayer. Change-Id: I58c04e40ae3f07013450997410d0a379273c7bde Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 09:05:13 +0000