summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-1110-30/+158
|\ | | | | | | Change-Id: Ia2cf3c55e57d7ac17f02965915fa6933ff2c8cce
| * Android: removed unnecessary init class for QtMultimedia.jarYoann Lopes2013-07-091-2/+2
| | | | | | | | | | Change-Id: Ib13597389a3896da8b619993d197623e7c74a7e0 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/stable' into devFrederik Gladhorn2013-06-2719-41/+64
|\| | | | | | | Change-Id: I48a140d1bbe82ab65e54683d77aea8c97c06ec80
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2517-17/+38
| |\ | | | | | | | | | Change-Id: I9ad818eecef74983e09660871f39ee66a6b666a1
| | * Multimedia plugins now have a unique JSON metadata 'Keys' property.Yoann Lopes2013-06-2117-17/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Use correct default audio output and input devices on Windows.Yoann Lopes2013-06-251-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was returning the first available device as the default, which might not be the actual default device. Use the WAVE_MAPPER device ID instead that tells Windows to use the most appropriate device. Change-Id: Id1e9324e889bbaaab54bc0e0da810a7ce5fcb592 Reviewed-by: Andy Nichols <andy.nichols@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>
* | | Doc: Setting navigation variables for Multimedia and Multimedia WidgetsJerome Pasion2013-06-262-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | -for navigation bar Change-Id: I2d60e0145952c99afb6b103d0188ce846c192634 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-208-16/+118
|\| | | | | | | | | | | Change-Id: Iaadfcd68fec91611b6341860e41a70b9023719de
| * | Doc: Fix some broken links and quote pathsSze Howe Koh2013-06-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-124-5/+66
| |\| | | | | | | | | | Change-Id: Ic82ed2ba60d9855f1490d4ca66451dbc42ae6e2f
| | * Doc: Add Qt Multimedia platform notes for Windowsv5.1.0-rc1Topi Reinio2013-06-042-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Doc: Adding import statement for in Qt Multimedia QML TypesJerome Pasion2013-06-031-4/+7
| | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix typo in QMediaPlayer docs.Mitch Curtis2013-05-311-1/+1
| | | | | | | | | | | | | | | Change-Id: I0b9110488a2d116cea73abe30f80fc1f487029aa Reviewed-by: Jerome Pasion <jerome.pasion@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>
* | Purged ALSA implementationBernd Weimer2013-06-112-153/+75
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-046-5/+22
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
| * Update all plugins.qmltypes filesLiang Qi2013-05-271-0/+13
| | | | | | | | | | | | | | Task-number: QTBUG-31388 Change-Id: Ia65490a262417f98fe69a89637ec2f9e7c0d0095 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.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>
| * Update qmldir file for QtAudioEngineLiang Qi2013-05-271-0/+2
| | | | | | | | | | Change-Id: I2fe64c72520a7b2b6b1d79bbddfdeb7d0bf4f977 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Doc: Removed multimedia overview from "technology-apis" group.Jerome Pasion2013-05-241-2/+0
| | | | | | | | | | | | | | The group in qtdoc was removed. Change-Id: Ifa8b67421f4eb7b117ee947b186c85bfdd5a8c5d Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Android: add libQt5MultimediaQuick_p to the list of dependencies.Christian Strømme2013-05-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-2337-111/+226
|\| | | | | | | Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
| * 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>
| * Fixed signal not being emitted in QDeclarativeCameraFocus.Yoann Lopes2013-05-171-1/+4
| | | | | | | | | | Change-Id: If504ec5ecc59c46edeac24442181eedaacc7e5d8 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-1414-4/+15
| | | | | | | | | | | | | | | | 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>
| * 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-301-15/+15
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-2916-104/+145
|\| | | | | | | Change-Id: I0f0457e9863f540b7bd8bc104c92891d8cf5c483
| * 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 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 14:40:16 +0000