summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
* | AVFoundation: Enable QVideoWidget on iOSAndy Nichols2013-08-272-22/+21
| | | | | | | | | | Change-Id: I88041e7a2ea052fe449542eeaada31c09d93d163 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | AVFoundation: Use CoreAnimation to render video to QVideoWidgetAndy Nichols2013-08-277-262/+115
| | | | | | | | | | | | | | | | | | Previously a QGLWidget was used as a target for the AVFVideoFrameRenderer. This was uncessary as it is possible to render directly on top of the QWidget using the CoreAnimation Framework. Change-Id: I08923c85fd56c8874c1d8c187ae5145e220fab92 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | AVFoundation: Enable use of QMediaPlayer for audio on iOSAndy Nichols2013-08-275-34/+48
| | | | | | | | | | | | | | | | | | This commit disables the video components of the AVFoundation mediaplayer backend when building for iOS and enables the use of QMediaPlayer with audio assets. Change-Id: Iadd6f9c61ed1e656301326e90a22cbca6428b654 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-128-1/+377
|\| | | | | | | | | | | | | Conflicts: src/plugins/plugins.pro Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
| * Implement resource policy plugin using libresourceqt.Robin Burchell2013-08-057-0/+375
| | | | | | | | | | | | | | | | | | | | This contains a new resource policy plugin, replacing the built-in code that was deleted when the plugin interface was removed in 138242fb2dc19438a0ead34b36af848800e27190 (which unfortunately did not provide a plugin). Change-Id: Iae7ed6edc330c69ca0c72d50bde6c7e12b8cca4e Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * Change libresourceqt's .pc file.Robin Burchell2013-08-051-1/+1
| | | | | | | | | | | | | | | | The one public port of this library to Qt 5 changed the .pc to libresourceqt5, to avoid clashing with the Qt 4 version. Change-Id: I6a248606e20c4e7a8f432612ca00aded846264d9 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-234-19/+45
|\| | | | | | | Change-Id: If52332b72560d21069e24cd31b13f08f33e1f406
| * DirectShow: avoid unnecessary RGB32 -> BGR32 conversion.Yoann Lopes2013-07-191-1/+1
| | | | | | | | | | | | | | | | | | Frames in the RGB32 format are actually using the BGR byte order, no need to do the conversion. Task-number: QTBUG-29206 Change-Id: I13527bd9dacc8330df78beb0965b31469c1d7a87 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * DirectShow: Don't create the widget and renderer controls until requested.Yoann Lopes2013-07-192-15/+31
| | | | | | | | | | | | Task-number: QTBUG-32282 Change-Id: If37ed4c35bcc2cc879f50d3b2ea3720b90603e9a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * WMF: fixed MediaPlayer buffering logic.Yoann Lopes2013-07-191-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To have a consistent behavior with other backends, the WMF plugin now starts the session after loading a media in order to start buffering some data and correctly notify when the media is buffered. It was previously reporting a BufferedMedia status only (and wrongly) after explicitly starting the media player. Not all source readers (usually a source reader is specific to a file format) implement the service needed to query buffering progress. In that case just report the media to be buffered immediately after loading. Change-Id: I6e6332ae08e96fc789556761e5169b88c36c5e37 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | OpenSL ES audio plugin.Yoann Lopes2013-07-1913-0/+2084
|/ | | | | | | | Adds support for QAudioOutput, QAudioInput and QAudioDeviceInfo using OpenSL ES 1.0.1. This plugin is used on Android. Change-Id: Idf2c22a861e067196f6c5139e51393b086f64183 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: Make it possible for MediaPlayer to read from assets.Christian Strømme2013-07-091-1/+14
| | | | | | | | | The Android MediaPlayer doesn't handle assets automatically, so we need to open it and pass it in as a file descriptor. Task-number: QTBUG-31422 Change-Id: Ic29c0ab6348d760cf21aa89ae423d41e15523976 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: wait to have a valid video surface before loading a media.Yoann Lopes2013-07-095-27/+130
| | | | | | | | Setting the video surface on the Android media player after it has loaded the media doesn't work on some hardware. Change-Id: I5e621a34ace9de458bfc65bfac8fa50c29cee9a5 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Android: release the Android media player before destroying it.Yoann Lopes2013-07-093-0/+8
| | | | | Change-Id: I18715efd7ff346a9f6f2214727ec66ee79ad0d33 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix resource leak in directshow plugin.tommyadam2013-07-041-0/+4
| | | | | | | | | Add two missing release calls to free file handles. Task-number: QTBUG-23822 Change-Id: I8f5b6d0dcf9ad66bdaa2f378c0d3e401388d7add Reviewed-by: Wouter Huysentruit <wouter.huysentruit@dzine.be> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2516-16/+32
|\ | | | | | | Change-Id: I9ad818eecef74983e09660871f39ee66a6b666a1
| * Multimedia plugins now have a unique JSON metadata 'Keys' property.Yoann Lopes2013-06-2116-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They previously had the multimedia services they provided as keys. This was a problem when several plugins were available on the same platform, providing the same multimedia service, but with different features or capabilities. Since they had the same key, only the first plugin in the directory was loaded. Nevertheless, it was actually working until commit 732dcfe7 in qtbase, as all plugins were loaded even when sharing the same key. The services a multimedia plugin provides are now declared in the 'Services' property. To preserve compatibility with third-party plugins, if that new property doesn't exist it falls back to the 'Keys' property. Task-number: QTBUG-31868 Task-number: QTBUG-31476 Change-Id: Ic3ba32eeef21b69b922bd3d4feb111101559d132 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-201-14/+14
|\| | | | | | | Change-Id: I0361cbb4f5398bb13e675c3de04519c414daea43
| * Android: Fix for uncaught java exception.Christian Strømme2013-06-131-14/+14
| | | | | | | | | | | | | | | | | | | | | | If an exception's getMessage() function returns a null object, we can't send it directly to the Log function, as it will throw an exception... To avoid this we can prepend the string from getMessage() with an empty string. Change-Id: Ie026cbf9af133352919a4536c152b6d35cb8c0a7 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | BlackBerry: Fix frame size of video playbackTobias Koenig2013-06-053-8/+49
|/ | | | | | | | | | 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>
* WMF-plugin: Fix warnings about unused variables.Friedemann Kleint2013-05-272-2/+3
| | | | | Change-Id: I2b7864463799b23418fc4c3099d73a63709fe8c5 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: fixed crash when resetting the video surface.Yoann Lopes2013-05-221-1/+2
| | | | | Change-Id: I64a28cbcb8a48d13a9e1c98005da9f4cce821cb4 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Make directshow-plugin available.Friedemann Kleint2013-05-155-4/+17
| | | | | | | | | | | | | | | 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>
* Decouple qmediametadata.h from qmultimedia.hSze Howe Koh2013-05-1411-2/+13
| | | | | | | | 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>
* Make it possible to bundle Android buildsEskil Abrahamsen Blomfeldt2013-05-034-14/+21
| | | | | | | | | | | | | 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>
* 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>
* 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>
* 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 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>
* Doc: Fix minor typosSze Howe Koh2013-04-102-2/+2
| | | | | | Task-number: QTWEBSITE-514 Change-Id: Ie8f3689d18d15fd0e88e0ada4a745d9994d9c2ae Reviewed-by: Jerome Pasion <jerome.pasion@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>
* 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>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-1412-185/+328
|\ | | | | | | Change-Id: Ifee8e5713e95d516081c4bc911e8f0bb6a169b13
| * GStreamer: fixed build when using GST_PHOTOGRAPHY.Yoann Lopes2013-02-2812-185/+328
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | iOS: Fix build issuesAndy Nichols2013-03-111-2/+5
| | | | | | | | | | | | | | | | 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-0629-0/+3438
| | | | | | | | | | | | | | 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>
* | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-19295-474/+4735
|\| | | | | | | | | | | | | | | | | | | 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
| * WMF: removed unnecessary dynamic_cast.Yoann Lopes2013-02-191-4/+4
| | | | | | | | | | | | | | Task-number: QTBUG-29722 Change-Id: Ia0e5c8fb90b231a8d9764524709d5848397c2afb Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| * BlackBerry: Fixed playback of streamed audioBernd Weimer2013-02-123-5/+17
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Doc: Fix module name formatSze Howe Koh2013-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * WMF: enabled HW-accelerated video decoding for the QML video item.Yoann Lopes2013-01-2311-66/+3765
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 14:20:48 +0000