summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * Fix plugin class name when using neutrino serviceJanne Koskinen2016-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes static linking issue with the plugin. Task-number: QTBUG-56966 Change-Id: Ie5803b048970a436f017251c0afd375fce11b2fb Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * | Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-242-8/+8
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I6690c4161c57734ad03ee3e03311a3e62f181e89
| | | * \ Merge 5.7 into 5.7.1Oswald Buddenhagen2016-10-064-71/+119
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: I72c166fd81e43c5a2a1b17a6e46e12d6c7389fc2
| | | * | | Pass the context to QtAndroidMediaPlayerBogDan Vatra2016-09-282-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way it can be used in a service Task-number: QTBUG-54506 Change-Id: I2d75b69dfbf7b345322f7625baf544af2af200c5 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | | | | Add proper global headers for QtMultimediaLars Knoll2016-11-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And deprecate the old qtmultimediadefs.h Change-Id: I2d4164f3a51d8e5d1813413b4f6691a721386fdf Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * | | | | Fix mir detectionLars Knoll2016-11-232-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old check would have never triggered unless you compiled with CONFIG+=mir by hand. Change-Id: I1d418dce09adaedbdff366dfeb8f4036cac0f075 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | | | | Remove Blackberry specific code pathsLars Knoll2016-11-149-443/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I187085984eb1b25d7f3de163dc05122df1259720 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * | | | | Fix compiler warningMaurice Kalinowski2016-11-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a0e9cfed72e67fe3d556264b135b6e7c5bf6b9b Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * | | | | Cleanup all maemo/meego specific codeLars Knoll2016-11-1414-248/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c6f28084c6b030928eebc53c5d0009b168ede6a Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * | | | | Move qtmultimedia over to the new config systemLars Knoll2016-11-1415-55/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. And move all command line options over from qtbase, so that we can remove them from there in a second step. Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * | | | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-1120-39/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qtmultimedia.pro src/multimedia/playback/qmediaplayer.cpp src/plugins/directshow/directshow.pro tests/auto/integration/qmediaplayerbackend/BLACKLIST Change-Id: I6dacdcbb223c1d12dd72eb308a67170983c709b3
| | * | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-0420-39/+49
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| Change-Id: Ib038c5e3ebb48c0e46569a35d530fa5ceaf06a32
| | | * | WMF: make it possible to build only the audio decode serviceYoann Lopes2016-11-0213-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The WMF plugin can now be built without the media player service. That enables the audio decode service even when DirectShow is used as media player backend. The default configuration on Windows is now: Camera, MediaPlayer -> DirectShow AudioDecode -> WMF Change-Id: Ic6f3c85ed849e0c603719cfb03794e6abd2d52fa Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | | * | WindowsAudio: fix volume when using multiple QAudioOutputsYoann Lopes2016-11-021-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using Windows' waveOutSetVolume() function to set the volume on an audio stream. That function applies the volume on the sound device and not on a particular stream, meaning all QAudioOutputs and QSoundEffects were sharing the same volume. All Qt audio streams are supposed to have their volume controllable separately; in order to respect that, we now apply the volume ourselves on the data before writing it to the device. Task-number: QTBUG-43765 Task-number: QTBUG-48049 Change-Id: I407588ca40cf4216454431fe3e6ce4d8740f391d Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | | * | Mark AndroidCameraInfo as movableChristian Strømme2016-11-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00b8444e00cbf3dc0d4a7c2ff8b83e217a8966f5 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | | * | Change PLUGIN_DISABLE_MMAP to PLUGIN_MMAPJames McDonnell2016-10-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PLUGIN_DISABLE_MMAP has been deprecated since 6.6.0 and it was recently removed from 7.0.0. PLUGIN_MMAP is favored as of 6.6.0. The DISABLE in the value name is unnecessary because the value is only used to call a function whose name already indicates that's how it'll be used. Change-Id: Ie714f0fe8e874bbd1c7d8ee998f5a65f38f24fd2 Reviewed-by: Dan Cape <dcape@qnx.com> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | | * | Android: emit mediaStatus changes before state changesYoann Lopes2016-10-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure all mediaStatus changes are emitted, even when some action is done on the media player as a result of a state change. Task-number: QTBUG-49578 Change-Id: I89594da2c2efc71103a7aa64f598eea4097425f6 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | | * | WMF: fix incorrect pointer dereferenceYoann Lopes2016-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-56134 Change-Id: I9c8799a96ff08f2657e4879dfbe14de3bfe3d25f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | | * | GStreamer: emit mediaStatus changes before state changesYoann Lopes2016-10-061-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure all mediaStatus changes are emitted, even when some action is done on the media player as a result of a state change. Task-number: QTBUG-49578 Change-Id: I60153cd8e1d665797a25549ab81afcfb553ce2cc Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | | | Alsa: Use QVarLengthArrayv5.8.0-beta1Friedemann Kleint2016-10-212-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix g++ / Clang warnings: alsaaudioinput.cpp: In member function 'qint64 QAlsaAudioInput::read(char*, qint64)': qalsaaudioinput.cpp:530:36: warning: variable length array 'buffer' is used [-Wvla] qalsaaudiooutput.cpp: In member function 'qint64 QAlsaAudioOutput::write(const char*, qint64)': qalsaaudiooutput.cpp:570:23: warning: variable length array 'out' is used [-Wvla] (variable length arrays being C99 features). Change-Id: Id5024af7a42dffb56fbbeda59e1fadb41c660e41 Reviewed-by: Christian Stromme <christian.stromme@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | | DirectShow: Use qFuzzyCompare when comparing floating points valuesChristian Strømme2016-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b3584a8d1f2039e138e4065de0d546a301b97bb Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | | DirectShow: Add generic logging category for the DirectShow pluginChristian Strømme2016-11-152-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I38cee48cc85baa5ad5e42e03f8cb05eab1287566 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | | DirectShow: Remove manual filter and pin disconnection in DsCameraChristian Strømme2016-11-151-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 3fb3231a9 we added code to disconnect all filters in the graph, that includes any filters we add our self, so there's no need to have special handling for those. Change-Id: Id601933b3ff749294cfa71a0cca99e7d25e94a39 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | | DirectShow: Reduce the size of DirectShowPlayerServiceChristian Strømme2016-11-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icde2c43af0128642721d0f7eda79b44eeca1b844 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | | winrt: Fixed emission of readyForCaptureChangedOliver Wolff2016-11-072-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal should only be emitted if the state of readyForCapture has actually changed. Change-Id: I4a4e2bf4451cd970f460813b2bdb32685067c453 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | | Fixed winrt/windows phone buildOliver Wolff2016-11-072-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readyForCaptureChanged cannot be connected to stateChanged as their arguments are not compatible (error: narrowing). Task-number: QTBUG-56927 Change-Id: I31ebc79a22a2d3565a16ab664163bf2d574a527f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-123-92/+118
|\| | | | | | | | | | | | | | | | | | | Change-Id: I126bc73db5b5d9b6c26cb9ff5da7ed13a16b378b
| * | | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-10-112-53/+59
| |\| | | | | | | | | | | | | | | | | | Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
| | * | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-042-53/+59
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp Change-Id: I4a30fc030c25e7b8da3eb9f386c4a5fa468df141
| | | * | AVFoundation: fix metadata controlYoann Lopes2016-09-272-53/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly emit metaDataAvailableChanged and metaDataChanged signals. Task-number: QTBUG-46368 Change-Id: Ic79acd519b47f4d864fa335c8f75758fe9185c39 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | | | winrt: Fix crash when locking/unlocking focusMaurice Kalinowski2016-10-111-39/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lock/unlock operation has to be created in the Xaml thread. Task-number: QTBUG-56034 Change-Id: I450ad0ba4a8f1275f878917bcd16c31fbf87e164 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-116-23/+77
|\| | | | | | | | | | | | | | | | | | | Change-Id: I7291f7a3bd5851eafe2bf0a4bd5c5f8e705a90bc
| * | | | Correctly include multimedia plugins in iOS and tvOS buildsJake Petroules2016-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken by the removal of exclusive simulator and device builds, (and so would be difficult to express in the new system), but it's not clear why it was ever necessary to exclude these plugins from simulator builds at all, so enable them everywhere. Change-Id: Iff184820cc98973d8928184a4a63793c66275d0b Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | | | GStreamer: Support video probe on QCameraDaniel Nicoletti2016-09-233-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I54889a72346da24654c8a0618056c14999ecf71e Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * | | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-232-18/+60
| |\| | | | | | | | | | | | | | | | | | Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
| | * | | Merge remote-tracking branch 'origin/5.6' into 5.7Yoann Lopes2016-09-222-18/+60
| | |\| | | | | |/ | | |/| | | | | Change-Id: I5bce2843ac62bb97efc1ccaaa9c671c4adf10640
| | | * GStreamer: print a warning when the camerabin plugin is missingYoann Lopes2016-09-211-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create the camera service when the camerabin plugin is not available on the system and print a warning. Task-number: QTBUG-50775 Change-Id: I56c7e6297bebe4b90596cb3c0323f1d38231bceb Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | | * PulseAudio: make code more robustYoann Lopes2016-09-211-17/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some asynchronous operations return a pa_operation pointer, which can be null if the operation fails. In some cases we were not checking that the returned object was non null, leading to some asserts being raised in pa_operation_unref. Change-Id: Iff1cc67b7f79b758fa81d79e658debb1d737b29f Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | | Remove deprecated QSysInfo APIs and dead code from macOS/iOS backendJake Petroules2016-09-2314-473/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Deployment targets are currently macOS 10.9 and iOS 7.0. Change-Id: I500a95c00eb3be6e693e38f0f2205941f7bc9601 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-2121-210/+604
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/multimedia/multimedia.cpp Change-Id: I38899391ec8d2fcec6f2d46514286759f7a27629
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-196-101/+116
| |\| | | | | | | | | | | | | | Change-Id: I022c07dab3ded6072f7c103e299822caaf40cf34
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-0/+2
| | |\| | | | | | | | | | | | | Change-Id: I27d68b69f2ad15e930b6adab5b2ff583f4642fac
| | | * DirectShow: support MJPEG camerasYoann Lopes2016-09-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map MEDIASUBTYPE_MJPG to QVideoFrame::Format_Jpeg, which makes sure that cameras that only support MJPEG are configured properly. Task-number: QTBUG-55359 Change-Id: I732c56afc51109aba0231c8537f795e8d276c194 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * | wasapi: fix typo for supported ratesMaurice Kalinowski2016-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-55630 Change-Id: I2f5defd78fbdd57e6121dde0287b615f7db8848b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * | wasapi: Fix thread affinityMaurice Kalinowski2016-09-134-100/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is expected from the user side that the QIODevice passed to the audio input/output is handled in the very same thread it has been created in. Previously we used the worker thread for it. Instead, schedule handling a buffer to the GUI thread and move on. This also helps simplifying many of the emits, as they happen in the same thread as the target device. Task-number: QTBUG-55894 Change-Id: I552a7a41562dccbaae5681e3c416267165720d30 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | winrt: Add QCameraFlashControlMaurice Kalinowski2016-09-196-0/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is without video modes so far, simply because video itself is not supported yet. Also included a cleanup for string conversions. Task-number: QTBUG-48541 Change-Id: Ib090f61861596e095d597cf7e5e74f7040fbc58f Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | winrt: Make focus actions synchronousMaurice Kalinowski2016-09-192-92/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The camera and its controls have been moved out of the xaml thread recently, hence acting asynchronously is not required anymore for the focus control. In addition to this, previous behavior caused troubles inside QML as QDeclarativeCameraFocus::setFocusMode always emitted a focus change even though it did not happen yet. This resulted in inconsistencies between QML and the plugin. Task-number: QTBUG-48539 Change-Id: I19a3a3512530b01b627476e233291d737cfee11f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Samuel Nevala <samuel.nevala@intopalo.com> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | Fix compilation after feature modularization in qtbaseLars Knoll2016-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7449a68cfb76798e9c4e3101da4a4e3ab713d4be Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | winrt: Fix QAudioDeviceInfo::default*Device to return name instead idMaurice Kalinowski2016-09-071-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c5bbb0dac7bed3199ddddc88c0175d5a2ac1036 added the default* functions to query a default device. However, IMediaDeviceStatics can only return ids and not the device names. Hence we need to invoke availableDevices to create the internal mapping and return the device name to properly initialize audio devices afterwards. Task-number: QTBUG-55631 Change-Id: I38b9205a933de5e41296a2e5880d0379db41ad97 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Yoann Lopes2016-09-015-16/+116
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudiosystemplugin.cpp src/plugins/directshow/helpers/directshowobject.cpp src/plugins/directshow/player/directshowiosource.cpp src/plugins/directshow/player/directshowiosource.h Change-Id: I0e4632c7705128f81429ddbcb0d4abbc04858a8b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 07:38:49 +0000