summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Collapse)AuthorAgeFilesLines
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-033-10/+10
| | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I1a4bef16be79ced35c47da865153ebe1bee22f9c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Move win32 and Alsa audio backends into plugins.Christian Strømme2014-01-3014-5233/+1
| | | | | Change-Id: I9835cf5ee97900569f26421a19543b485e933051 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Alsa: fix crash when detecting devices.Yoann Lopes2014-01-301-52/+57
| | | | | | | | | Some old versions of Alsa crash when snd_device_name_hint(-1, ...) is called. This patch works around the problem by iterating manually over all the available sound cards. Change-Id: Ic380a371acc15013d137553ff30d68bed5af664e Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Yoann Lopes2014-01-303-1/+279
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-273-1/+279
| |\ | | | | | | | | | Change-Id: I83d589c55e8463cce23068dc81096aa66ec596a5
| | * Allow plugins to override the QML VideoOutput type.Andrew den Exter2014-01-203-1/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move QDeclarativeVideoOutput to the private QtMultimediaQuickTools library to make the QDeclarativeVideoOutputBackend interface implementable by a plugin. Change-Id: I763c483a1fc9ec56dc7b8be0bc71523f029a36ee Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | | whitespace fixesOswald Buddenhagen2014-01-3011-69/+69
|/ / | | | | | | | | | | | | | | remove trailing spaces & expand tabs. Change-Id: I05ef110abed90f13b47752760ffb4567a11a6a5e Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-172-6/+11
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
| * Use QStringRef instead of QString whenever possible.Jędrzej Nowacki2014-01-151-6/+6
| | | | | | | | | | | | | | That way we reduce count of temporary QString instances. Change-Id: Id806c68ea616828c2355c07b8576616fa6a8da17 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Allow the camerabin source selection to be overridden.Andrew den Exter2014-01-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | Prefer the default camera-source element if there is one or an element identified by an environment variable to a static list of possible elements which may not be appropriate for the target environment. Change-Id: I53816c949307953780f9046eb11e09effe059be0 Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | BlackBerry: Changed documentationBernd Weimer2014-01-132-2/+2
|/ | | | | | | Changed platform notes title to be able to reference it from elsewhere. Change-Id: I0edcebc6aa04e7a063cbe8b386ca8b38e0ae22a9 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fix some typos in documentation.Jeff Tranter2014-01-076-8/+8
| | | | | | | | Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code. Change-Id: Ieb7be17bd1d50751f00620f7ac28d09355856ac0 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* PulseAudio: fix crash when failing to create a context.Yoann Lopes2014-01-061-2/+3
| | | | | | | | | | Don't try to call a function on a null PulseAudio context. If pa_context_new() fails, we now try again to connect to the pulse audio daemon later. Task-number: QTBUG-35456 Change-Id: I0b848d3f25f57651ab31b9eca7ceb1bc9df2f682 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Correct QSoundEffect::supportedMimeTypes() documentation.Mitch Curtis2014-01-021-1/+1
| | | | | Change-Id: I154b124949ee4f07ea413d8cdb419fcc08cb8324 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Android: automatically deploy playlist plugins.Yoann Lopes2013-12-101-1/+2
| | | | | | | Include the playlistformats directory for automatic plugin deployment. Change-Id: Ie61a4b1c1637a493e1bdb7354b33060728ccabda Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Use the backend to notify the QCamera state changes.Yoann Lopes2013-12-051-9/+1
| | | | | | | | | | We were emitting the stateChanged() signal no matter what was actually done by the backend. QCamera now emits this signal only if the backend actually changed the state. Task-number: QTBUG-35070 Change-Id: I9f32361cd815dbcc366ad30033692f9ae732ec46 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Don't use integers to describe volume internally in QSoundEffect.Christian Strømme2013-11-285-22/+22
| | | | | | | | | The public api takes floating point values and so does most of the back- ends. Conversion should be done in the back-ends that expect other value types to avoid unnecessary float -> int -> float conversions. Change-Id: I0ee1bfbe350f985294c20f897ffa3bd55288b4c9 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Document asynchronous nature of QMediaPlayer::setMedia()Sze Howe Koh2013-11-231-0/+5
| | | | | | | | | | | | The function name can be interpreted to mean that it loads the media. Users have made this mistake before: http://comments.gmane.org/gmane.comp.lib.qt.user/9189 https://bugreports.qt-project.org/browse/QTBUG-28514 Change-Id: I9e9b36405d67d40db42b77d8eeb8f9d528ee16e2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: Add permissions/features for Qt Multimedia moduleEskil Abrahamsen Blomfeldt2013-11-081-0/+5
| | | | | | | | | | To avoid potential exceptions when using Qt Multimedia, the applications needs to request camera and audio recording capabilities by default. Task-number: QTBUG-33953 Change-Id: I75061e24c65a24f7f45dcfdbb5edb1874c1eb4da Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I3971987490ef7c2f8060383ffc2e141558f827c9 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* use private linkage where possibleOswald Buddenhagen2013-10-312-3/+3
| | | | | | Task-number: QTBUG-34463 Change-Id: Iffbeed2f1a27fd38b5960afa9715815ac11b722a Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* QSoundEffect: Set playing to true before starting the audio-device.Christian Strømme2013-10-301-2/+1
| | | | | | | | | | When the audio-device starts playing it should be able to read from the source immediately. The OpenSL plugin would fail because the source was blocking the audio-device from reading, as the state still was in its initial state (stopped). Change-Id: Ia26fa2eb442e239f5209947e6c9cd464b7d976a4 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Remove unnecessary warning in QMediaPlaylistNavigator.Yoann Lopes2013-10-091-3/+1
| | | | | | Task-number: QTBUG-33862 Change-Id: Ie74e649ebb5819ccf6300492bdce2a0046b87f02 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Fixed missing links to Qt Audio EngineJerome Pasion2013-10-083-6/+6
| | | | | | | The title changed from Positional Audio to Qt Audio Engine. Change-Id: Ie9901c7bc6c394c1c429a16a8a1b1c18b1a87f46 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Various fixes to Qt Audio Engine documentationJerome Pasion2013-10-032-46/+37
| | | | | | | | | | | -fixed \since to "\since 5.0" (Qt version 5.0) -made a \qmlmodule page so the list of related classes are automatically listed -made changes in the Qt Multimedia documentation to link to the Qt Audio Engine documentation Change-Id: Ibdd3da02871648988a73172934e684840c4ce0ae Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Doc: Removing version number from the QDoc comments.Jerome Pasion2013-10-022-24/+24
| | | | | | | | | | The version is not needed anymore and QDoc handles them as a different module, causing errors. Task-number: QTBUG-32172 Change-Id: I55054a6c7bce9e001ef03cce944b03375c851d15 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Updated usage of \qmlmodule and \inqmlmodule.Jerome Pasion2013-10-022-2/+2
| | | | | | | | | | -\qmlmodule denotes the import statement "QtMultimedia 5.0" -\inqmlmodule shouldn't have the version number and this commits removes it because it is confusing. Task-number: QTBUG-32172 Change-Id: I76f58ddd5ea2d5ae51eaae83a8408fd67611838a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Android: refactor video renderer.Yoann Lopes2013-10-012-3/+4
| | | | | | | | | | | | | Removed the overhead of having to create a shared OpenGL context in the GUI thread and pre-render the frame into a FBO. We now directly render the GL_TEXTURE_EXTERNAL_OES in the QtQuick render thread, using an Android-specific QSGVideoNode. We also use a callback from the render thread to create the texture from there and not have to create a separate shared OpenGL context. Change-Id: I6c8eb94b47d0a03329c912701b8af3fb5ebd1876 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix lupdate warning in playlistparser.Friedemann Kleint2013-09-271-1/+2
| | | | | | | playlistfileparser.cpp:278: Class 'PLSParser' lacks Q_OBJECT macro. Change-Id: I062bd90b7cd5de82683dc02c6a6400855982a163 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: Make sure the OpenSL plugin is included on Android.Christian Strømme2013-09-261-1/+2
| | | | | Change-Id: Ic46dd8afe50250bb30754ce12eda57138d05b81d Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Some cleanup in the GStreamer plugin.Yoann Lopes2013-09-205-387/+0
| | | | | | | | | | | | Removed QGstreamerVideoOverlay and related classes. It was used as 'Window' control but performs worse than QGstreamerVideoWindow which does basically the same thing using GStreamer ready-made components instead. Removed X11 dependencies and related configuration tests. It was only needed for QGstreamerVideoOverlay. Change-Id: I2ad2636ccf0060e56cd64f3d9e5b3c24dc75f5a3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* CoreAudio: Create an audio plugin supporting iOS and OS XAndy Nichols2013-09-1910-2904/+6
| | | | | | | | | | This removes the Mac audio backend that was hardcoded into QtMultimedia and adds a new audio plugin using the CoreAudio API. Change-Id: Ib15291825f9452a3763e0eeb281d952deb0bad3d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Android: added camera support.Yoann Lopes2013-09-121-3/+3
| | | | | | | | | This patch includes all camera features: viewport, settings, image capture, and video recording. It also adds support for QAudioRecorder. Change-Id: Ib962177cc8de4bac03f42a2bc0f534e03464bbfc Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Fix the X11 build errorPier Luigi Fiorini2013-09-091-3/+3
| | | | | | | | | | | This makes qtmultimedia build again by moving down X11 includes. See http://lists.qt-project.org/pipermail/development/2013-September/012986.html Change-Id: If6cd5e80c27de7aaa8d2a65ded05500ed9d0e692 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-061-1/+1
|\ | | | | | | Change-Id: I2cba36426d8af40f94712f7f05f4e0dd4efce6e7
| * Fix QAudioOutput::setVolume() limited 50% on 32-bit Windowsold/5.1Bill Somerville2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A signed 16 bit integer was being used to pack a normalised double into half of a DWORD. It needed to be unsigned 16-bit to get the full range of the Windows volume control. Task-number: QTBUG-33160 Change-Id: Ic17f572a188401ee686c6e6af3984d52328ccda6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | QGstXvImageBuffer: fix warning about class/struct mismatchTobias Hunger2013-09-021-1/+2
| | | | | | | | | | Change-Id: I98df1ce92fab69ad1200066d310aa8bd016b5aca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-271-1/+1
|\| | | | | | | Change-Id: I469f258c4838f87edaedc8620d925a3c537d1619
| * Enable QSoundEffect with loopCount of Infinite to playAndy Nichols2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previously if the loopCount property of a QSoundEffect was set to QSoundEffect::Infinite then no sound would be played at all. This is because QSoundEffect::Infinite == -2 and playback was only continued on values above 0. Task-number: QTBUG-32882 Change-Id: I739919a3e538128fc16f26ede5eb6cc4f2eb29fb Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | AVFoundation: Enable use of QMediaPlayer for audio on iOSAndy Nichols2013-08-271-3/+0
| | | | | | | | | | | | | | | | | | 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 "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-08-131-14/+11
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-121-14/+11
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/plugins.pro Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
| | * Fixed bug in QWaveDecoder.Yoann Lopes2013-08-051-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | When looking for a specific chunk, it was entering an infinite loop if not finding it in the next two chunks available. It now correctly tries to find the chunk until it reaches the end of the IO device. Change-Id: I29252318566fe3a47f267410c91dacaf302d9618 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | | Doc: Renamed HTML file for "Qt Multimedia on Windows" page.Jerome Pasion2013-08-121-1/+1
|/ / | | | | | | | | | | | | | | Conflicts with the platform page for Windows in qt5/doc Task-number: QTBUG-32580 Change-Id: Ibcf51c5dcd93ac388fa799644004c51aa88fe93d Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-052-8/+47
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54
| * Make PulseAudio implementation of QSoundEffect more robust.Yoann Lopes2013-07-252-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | It was crashing when the PulseAudio daemon was not running or was killed. When the connection to the daemon fails (or is terminated), it now tries to reconnect every 30 seconds. Sounds created before a connection loss will be recreated after reconnection. Task-number: QTBUG-32487 Change-Id: Ia63707aa5c70434b834b3079a9950a9b35057b26 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Doc: Setting \qtvariable values in module pages.Jerome Pasion2013-08-021-0/+1
| | | | | | | | | | | | | | \qtvariable is the QT variable in .pro files. Change-Id: Ib2e78579bbc67346b6c3431d03e01a4858439ac4 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-2/+2
|\| | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-272-11/+18
|\| | | | | | | Change-Id: I48a140d1bbe82ab65e54683d77aea8c97c06ec80
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 01:53:01 +0000