summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0763-321/+927
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I20470ed193e818eefedd975d89f755fb9d673241
| * Emit the StoppedState change after the file has finished writingAndy Shaw2017-05-233-6/+16
| | | | | | | | | | | | | | | | | | | | | | Where possible, we should be emitting the stateChanged() signal to StoppedState when we know the file is no longer being written to. The finializing status can be used to indicate it is finishing and when it is actually finished then StoppedState should be used. Task-number: QTBUG-50588 Change-Id: Ie3ac1c5cd00a6a36978e72b5485622e3302054ce Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * Fix build for -no-feature-temporaryfileStephan Binner2017-05-081-0/+4
| | | | | | | | | | | | | | | | | | If a backend does not support streaming then playing from qrc is impossible for -no-feature-temporaryfile case. Change-Id: Ibb0518c4afe0598c6f3a1c03b75cc00e76b8eead Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * de-duplicate gstreamer_encodingprofiles configure testsOswald Buddenhagen2017-05-081-9/+3
| | | | | | | | | | | | | | take advantage of the system now supporting 'use' by exported name. Change-Id: I7879d4c2e31b279bbbe17916e805ee60c108351d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * DirectShow: Expose the camera control interfacev5.9.0-beta4Christian Stromme2017-05-032-0/+22
| | | | | | | | | | | | | | The interface is needed to implement Qt's camera control classes. Change-Id: I468527dd1f5e9e7a0f8868f0b7addc3c069adf54 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * DirectShow: Merge the helpers and common folderChristian Strømme2017-05-0322-25/+19
| | | | | | | | | | Change-Id: Ie1c39c26ae6dec288daafb24b5aa0b6cc2bdd218 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * DirectShow: Enable audio and video probes in DirectShowChristian Strømme2017-05-033-17/+381
| | | | | | | | | | | | | | | | | | | | | | | | This change enables the video and audio probe functionality, so it can be used with the media player. [ChangeLog][DirectShow] Added support for audio and video probes in the mediaplayer. Task-number: QTBUG-56415 Change-Id: If6f36a693b1d22372eab130df07d435c9df5a796 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * Fix licensingJani Heikkinen2017-05-037-98/+140
| | | | | | | | | | | | | | | | | | - Remove unused license files - Switch old LGPLv21 license headers with LGPL one Task-number: QTBUG-57147 Change-Id: If939b9a09e0cd5ccda7f12172363cbc8f78297e8 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| * Android: Fix crash caused by stale video-frame objectsChristian Strømme2017-04-272-18/+36
| | | | | | | | | | | | | | | | | | | | Make sure that the frame being processed is still valid, that is, the size is valid and correct, and that the frame buffer is accessible. Task-number: QTBUG-60115 Change-Id: Ic64b6f7d45d92b7923d97d6ecdc630da31abee17 Reviewed-by: Michael Dippold <mike@dippold.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * AVF: Fix mediaplayer state and status issuesChristian Strømme2017-04-263-52/+90
| | | | | | | | | | | | | | | | | | This fixes the issues that were causing the whole qmediaplayerbackend test to be blacklisted on macOS. Task-number: QTBUG-46368 Change-Id: I59a35dd50a9c07e4e4382c5facb391f5c8a27ee7 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * DirectShow: Fix namespaced build with MinGWFriedemann Kleint2017-04-2639-37/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove QT_USE_NAMESPACE from headers and enclose headers/sources in QT_BEGIN/END_NAMESPACE. Fixes MinGW build error: qtbase/src/corelib/global/qtypeinfo.h:246:7: error: specialization of 'template<class T> class tn::QTypeInfo' in different namespace [-fpermissive] class QTypeInfo<TYPE > \ ^ qtbase/src/corelib/global/qtypeinfo.h:265:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO_BODY' Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS) ^ helpers\directshowmediatype.h:92:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO' Q_DECLARE_TYPEINFO(DirectShowMediaType, Q_MOVABLE_TYPE); ^ qtbase/src/corelib/global/qtypeinfo.h:57:7: error: from definition of 'template<class T> class tn::QTypeInfo' [-fpermissive] class QTypeInfo ^ Task-number: QTBUG-60118 Change-Id: Idfe7a49b50a0046a5cb17630a3ec99615ec6150a Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * DirectShow: Fix uninitialized memory read in DirectShowMediaTypeEnum::Next()Friedemann Kleint2017-04-253-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Newly allocated memory was passed to DirectShowMediaType::copy(), which calls DirectShowMediaType::clear() on the target, which crashes when trying to release a COM pointer. Split out a DirectShowMediaType::copyToUninitialized() helper function which does not call clear() for this purpose. Task-number: QTBUG-59515 Change-Id: I2801f4ba2c8da618ff8a1c57c4cea215fff292b4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Android: Run-time permission checks for cameraChristian Strømme2017-04-233-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The camera should ask for permission before being used. Normally this should be handle by the user, which can provide proper reasons for why the camera is used. To verify that we are allowed to open the camera, and as a good default, we'll check the permission and request access if needed. [ChangeLog][Android] Added run-time permission checks for accessing the camera. Task-number: QTBUG-55992 Change-Id: Ifb4e176728aab3076fdba292e17e17d33b1260a2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Remove m_stopEventsToIgnoreJames McDonnell2017-05-302-14/+2
| | | | | | | | | | | | | | | | | | 6.6.0 and 7.0.0 mm-renderer don't appear to produce spurious stopped state updates. From the MMR_STOPPED in one of the comments, it looks like this was a problem with the BlackBerry mm-renderer. Change-Id: Ia336195b48df342c376b7fb3c8eb2a65ef748032 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Remove handleMmStatusUpdateJames McDonnell2017-05-302-16/+0
| | | | | | | | | | | | | | It was only used by the BlackBerry code which is gone. Change-Id: I9311824b643c3c97205e1f13656ea3a2eeebfe7a Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Fix a format stringJames McDonnell2017-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | Used wrong class name. Probably a Copy-FailToChange. Get rid of a warning about the conversion specification that didn't match argument type. Change-Id: I4f24b737dd5f72cc1dc61c58de6ad21d9a07c8ed Reviewed-by: Dan Cape <dcape@qnx.com> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Fix build with QT_STRICT_ITERATORSSergio Martins2017-05-201-1/+1
| | | | | | | | | | Change-Id: I1d646cf7d8f68a7ec5c713735c233c71bc3f338b Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Rename the QtMultimediaQuick libraryYoann Lopes2017-05-021-1/+1
| | | | | | | | | | | | | | | | | | Dropped the _p suffix from QtMultimediaQuick_p to be more consistent with other modules. Change-Id: Ibb0bbb2d24bc013df6c5623cba179508c5f1becf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-2120-16/+312
|\| | | | | | | Change-Id: I06cd631ca9d3b6b2ed5709a7697a26b9eb7171d1
| * Android: Fix camera preview orientationChristian Strømme2017-04-203-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Before API level 24 the display orientation (the preview) was always set to 0. On newer versions of Android the clockwise rotation is set to be either 0 or 180, depending on the hardware. Since we don't want Android to apply transformation on our surface, we'll just enforce that the display orientation is always set to 0. Task-number: QTBUG-56536 Change-Id: Ie1aacda97540d5c97e6cbd8edb2afc53e7041e1e Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-1812-5/+278
| |\ | | | | | | | | | Change-Id: I7cd203eec77f3b5689c14b81b0862c5b70bab1a6
| | * OpenSL ES: Added run-time permission checks for recording on Android5.8Christian Strømme2017-03-301-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we have permission to record before starting a recording session. [ChangeLog][OpenSL ES][Android] Added run-time permission checks for recording on Android. Task-number: QTBUG-55992 Change-Id: Iab7416384336975fdf4de8024f02ab2414033163 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Android: Add run-time permission check for recordingChristian Strømme2017-03-303-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check and request permission to record audio if needed. [ChangeLog][Android] Added run-time permission checks for media-recording. Task-number: QTBUG-55992 Change-Id: I781e5a5447f1ad03c069b2171637525ae9108d78 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * GStreamer: improve the list of default recording formatsYoann Lopes2017-03-301-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | Add some common codec combinations such as MP4/H.264/AAC or with alternative audio codecs such as MP3 or AC-3. Change-Id: If67c68112d0f170a1391bef750e2bc8fc0d246de Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * GStreamer: Fix position value at EndOfMediaChristian Strømme2017-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Return the duration when we're at the EndOfMedia Task-number: QTBUG-59604 Change-Id: If057257a65d73aa456dd7dc52b6cb624dd4712d3 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Android: Add convenience method for checking and requesting permissionsChristian Strømme2017-03-222-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | This will be used to check and request permissions at run-time. Task-number: QTBUG-55992 Change-Id: I344859aeb05fecf09ac46064e9452787d615a8a1 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Android: Add logging categoryChristian Strømme2017-03-223-2/+57
| | | | | | | | | | | | | | | | | | | | | Adds logging category for the android plugin. Change-Id: I0b0868fa7da4ce5426b3682ab40c4317afb79cd0 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * DirectShow: support audio and video codec metadataYoann Lopes2017-03-201-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | Retrieve the audio and video codec metadata from media files. As the GUID of these codecs are only defined in the WMF API, we have to hardcode them here. Change-Id: I9a057e62d9473f605cf5078d3386c5827784ae28 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | GStreamer: add QT_GSTREAMER_PLAYBIN_AUDIOSINK env variablev5.9.0-beta2Yoann Lopes2017-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Allows to set a custom audio sink to be used by the media player, instead of the default 'autoaudiosink'. Change-Id: I13ea93a787ba6412a42bf48ecf7d3a822060cbe4 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | Remove newlines from JSON stringsPaul Olav Tvete2017-04-031-6/+3
| | | | | | | | | | | | | | | | | | | | | Newlines in strings are not allowed by the JSON standard. Change-Id: I0ee0b699f0b1157443662028605689931681abcd Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Remove unnecessary #includev5.9.0-beta1Paul Olav Tvete2017-03-241-1/+0
| | | | | | | | | | | | | | | | | | | | | Fixes build error with -no-feature-dialog Change-Id: I51a2dc2a515e9c3449ef3d3ece78ea3ba32d34fb Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | wasapi: Enable config tests on windowsMaurice Kalinowski2017-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The initial commit disabled running the wasapi config tests for unknown reason. Re-enable them again for windows builds. Task-number: QTBUG-59527 Change-Id: I0c8485911b49e657833376de0633fc81e3789e86 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | winrt: Fix video playback without autoplay enabledMaurice Kalinowski2017-03-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to ensure that a device handle is present and valid when calling setSource. Otherwise the engine switches into an error state when trying to continue loading. With autoPlay enabled that implicitly happened. Task-number: QTBUG-58152 Change-Id: Id504efd9b1b77b418ae05baed3ac0c52852cf49e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | wasapi: Define CLASSIC_APP_BUILD for desktop buildMaurice Kalinowski2017-03-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This partly reverts 7e48870c182e66a8408bbcb4c9469d751a777daa. The define is still needed for successful compilation of the wasapi backend on windows desktop. Change-Id: I1be1c08f5dd4a4cf5e0fa2211f0f8b330b0204a9 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Implement QAudioRoleControl for QNXJames McDonnell2017-03-289-6/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The system must provide a JSON file that maps Qt audio roles to the system's audio types. This is necessary because QNX doesn't dictate the audio types that a system must use. Anyone creating a QNX system is free to define whatever audio types they deem to be appropriate for that system. Set the audio role for the Qt player example to VideoRole and added code to dump the supported audio roles. Change-Id: I34d2c5da0033f69b9dd476a0eadccf3d87d07bfd Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | io-audio based audio management for QNX 7.0.0James McDonnell2017-03-274-27/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code to setup and handle io-audio based audio management notifications. Add InterruptedState to QAudio::State. Indicates that this stream is in a suspended state because another higher priority stream currently has control of the audio device. Playback cannot resume until the higher priority stream relinquishes control of the audio device. Adjust the documentation for QAudio::State SuspendedState to reflect the fact that audio management events can also put the stream into this state. Add InterruptedState handling to the spectrum example. Change-Id: Ie8616af03ae4c503de1d0571a222e5853035cc0e Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Propagate audio category into the QNX audio output objectJames McDonnell2017-03-272-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QNX 7.0.0, set the QNX stream type to the audio category. 6.6.0 doesn't support stream types. Add a -category command line argument to the spectrum example so that the audio category can be specified. Change-Id: I6a81210ce07dc4bd2f6cf81983c2f3e4c480ef0d Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Use qFuzzyCompare() instead of equality on floating-point valuesEdward Welbourne2017-03-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCamera::FrameRateRange is a struct with two qreal members; its operator== was comparing the members; which triggered a -Wfloat-compare that's an error in developer builds. This is what qFuzzyCompare() takes care of, so use it. Change-Id: Id45a2a7e9b6ccbf575bdedb5b90889859899bf38 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-2159-302/+284
|\| | | | | | | | | | | Change-Id: Ifd122e78933870e39e0e79d78930931d8ce10dba
| * | Build fix for -no-feature-timezonePaul Olav Tvete2017-03-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the QDateTime constructor that takes an offset from UTC instead of creating a timezone that has the same offset. Change-Id: Iceb1bf598263e7d81786fbf847012993d07e08ba Reviewed-by: Yoann Lopes <yoann.lopes@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-1050-282/+211
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/gstreamer/camerabin/camerabincontainer.h Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
| | * Clean up some strange GL defines in windowgrabber.hJason Erb2017-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: I1d332537b80e165fa794e433fb205f86ed24b209 Reviewed-by: Fabian Bumberger Reviewed-by: Dan Cape <dcape@qnx.com> Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
| | * Drop unused QProcess includeUlf Hermann2017-03-021-1/+0
| | | | | | | | | | | | | | | Change-Id: I2edc0a1a41d63a456ef2e87bdd1d0872dff0aee1 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Use QT_CONFIG macro to check for featuresLars Knoll2017-02-2741-171/+146
| | | | | | | | | | | | | | | | | | | | | And remove many custom defines. Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * WMF plugin: Prevent detaching of QMediaResourceListHannah von Reth2017-02-062-4/+4
| | | | | | | | | | | | | | | | | | Change-Id: I2bf0fa346a166bdb20ce76b1fd4d7227680810dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Make pulseaudio dependency privateAlexander Volkov2017-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise projects that depend on multimedia module fail to build. Change-Id: I44a614fd3b2bea934149f8bf55eaeb17069258d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * DirectShow: Port to new configure system (evr, wmsdk)Friedemann Kleint2017-02-037-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | Replace old legacy defines by QT_CONFIG. Fixes warnings when using MinGW: qtmultimedia/src/multimedia/qtmultimedia-config.h:4:0: warning: "QT_NO_WMSDK" redefined Change-Id: Ifbfc2cea3bf5bfd06d94fd70e6ea4afb6d6fbb4b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * actually delete obsolete qmultimediadefs.hOswald Buddenhagen2017-02-021-71/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defining a deprecated forwarding header leads to all kinds of "interesting" effects when the header is actually still there. amends 24a1c04b. Task-number: QTBUG-58432 Change-Id: I4a32bd55fe7bd14e1aff2f3a6ca46439ce1510de Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Suppress the -Wfloat-equal warningThiago Macieira2017-01-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | qcamera.h:261:36: error: comparing floating point with == or != is unsafe [-Werror=float-equal] Task-number: QTBUG-57649 Change-Id: I15b62e0f9cec482fbb40fffd1490df20dda23c46 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-264-9/+29
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/configure.json Change-Id: Ide124447e1667f0b6557b6ab1ba7188ae76772c5
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 14:10:34 +0000