summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.2.0' in qt/qtmultimediav6.2.0-rc1Qt Submodule Update Bot2021-09-141-3/+3
| | | | | Change-Id: I4841f6ca695ca400c8587e162b8165d46203011d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* AVFVideoRenderer: Properly update video output when changing mediaDoris Verria2021-09-134-6/+38
| | | | | | | | | | | | | | | | | When changing the video source of the AVFMediaPlayer, the video frame was not updated and displayed the last frame of the previous video. To fix, before setting a new CALayer to the renderer, make sure to remove the video output and subtitle output from the previous AVPlayerItem and add them to the updated one. Also, clear the last video frame from the video output by setting a null QVideoFrame() to the sink whenever the mediaplayer stops or reaches end of stream. Fixes: QTBUG-96368 Change-Id: I74ed056c1ece0db319e857b89eaf5e5168a972a1 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 59a32742d66a1fe17320acd133922c105ec211f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QDarwinFormatInfo: Remove unsupported audio codecs for encodingDoris Verria2021-09-131-20/+3
| | | | | | | | | | | | From the Apple docs, AVFoundation can only support encoding to AAC, ALAC, and WAV from our list of codecs. Remove the rest of the audio codecs from the list of encoders. Fixes: QTBUG-96376 Change-Id: I4ceba470f5267212dd7088a15cc311ff2d07512f Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 4241af760259211cc52b6817b3a28c4dbf450dbf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add a timer reporting a change in the playback positionPiotr Srebrny2021-09-132-0/+12
| | | | | | | | Fixes: QTBUG-95576 Change-Id: I1b3cdd1d473f04687f33f75502c80ce548aaba51 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 80b82153b71a8a973a81703c8050d5e97f3b5a8f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Close WMF player session on media player destructionPiotr Srebrny2021-09-132-2/+1
| | | | | | | | | | Additionally removing some spooky function creating dangling pointer Fixes: QTBUG-95626 Change-Id: I887ef7a309dde42c9594d4f94a84d72d86380579 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit e93a3c66bef99e291c6ee5e5fd183900bc89b223) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Fix the capture button issuePekka Gehör2021-09-131-1/+1
| | | | | | | | | | The capture button does not works. Fixes: QTBUG-96102 Change-Id: Iac7a774cd81113e55550598423e9c19bc775c9b3 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 7ec77dd61de2e84280a5f104f2c96353372633f7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtmultimediaQt Submodule Update Bot2021-09-111-3/+3
| | | | | Change-Id: Ib9fdfabd828992bedcd3bdd15916a340104e78d7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtmultimediaQt Submodule Update Bot2021-09-111-3/+3
| | | | | Change-Id: I9dc65f058904fa9efb78680628bdf2acb26c14e5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix orientation of the created video while recordingLars Knoll2021-09-103-0/+12
| | | | | | | | | | | | Lock the orientation of a video once we start recording. Changing it's resolution or aspect ratio in the middle of a recording is not possible and would also look rather weird. Change-Id: Ibea27c6a9a603a2ac73e53d242305782e0adf5d5 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 0de80f19158d849b83426aacfaca289264751586) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Lock the Window orientation while recording in the recorder exampleLars Knoll2021-09-102-2/+20
| | | | | | | | | | And document the best practice in QMediaPlayer::record(). Change-Id: I3f9c69e869d36e3267a2dd33fa86f0b290541227 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit be6eb6f0c7b0b0bfb036ed268069970c1c9f57dd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix aspect ratio of recordings on iOSLars Knoll2021-09-102-18/+16
| | | | | | | | | | | When recording in portrait mode, ensure that the video size that we ask from the recorder is also in portrait. Change-Id: Ibca58d03fd69da637576e20cfd8ecaa484faa8fe Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 62e92cf60bfd43dba4a9910453aec9489daa9d36) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix capture view in recorder exampleLars Knoll2021-09-102-19/+22
| | | | | | | | | | | | | | Once the capture view had played back a video, it would never move the video output back to the camera, rendering the app unusable for recording until restarted. Fix this by giving the player its own video output, and properly hiding it when not in use. Change-Id: I19bc88b0c6a8bf20dd4d3846a5c843d11ee7f8cb Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 782a682be989e0738dff4ce25021e275cb92ff60) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Disable update orientation when recording on AndroidSamuel Mira2021-09-103-5/+24
| | | | | | | | | | | | | In Android, when the orientation is enabled it will restart the preview Doing so when the mediaRecorder is recording will crash the app when the recording stops. So this patch adds a flag in qandroidcamerasession to prevent updating orientation. Change-Id: Ibe22035ecb39e95481087e53212fb10c4a6153c5 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit ccb199bba91882981341a2539f2dace2d874c967) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't try to flush a live pipelineLars Knoll2021-09-101-1/+2
| | | | | | | | | | | | | When using a pipeline in a capture session where the input source are live, we can't do a seeking flush. Fixes a regression introduced in 8d5182d03c1967d77ca8da531b004e85bb0892f0 Change-Id: Id3e3d3ff3b0ac996ea6065f24ade0a0920f2b44c Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 6e96999bb1f61ec4bfdf93ad4438bfdcfdbd9ad7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2.0' in qt/qtmultimediaQt Submodule Update Bot2021-09-101-3/+3
| | | | | Change-Id: I264ca23ed25592102e3e06ce9df85c2550f00124 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix crash in Android Recorder example on permission requestSamuel Mira2021-09-105-12/+49
| | | | | | | | | | | | | | | | On the first time the app runs, it asks for permission for recording video as soon it starts and asks for permission to record audio only when it is needed. This permission to record audio can make a crash because requesting permission makes the app go to background which can make android to remove the camera surfaceTexture. Fixed by forcing the app to request permission before creating the surfaceTexture. Change-Id: I920917a6decf25f7b5f78ee8364d2b9403207aa4 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 3c6f6ae6b49ae397e1071245bea9d94a0cf919e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Docs: Add documentation for MetaData and QMediaMetaDataNicholas Bennett2021-09-101-1/+103
| | | | | | | | | | | Fully documented MetaData including all Q_INVOKABLE declared methods Documented data property, remaining methods, and operators for QMediaMetaData Task-number: QTBUG-95066 Change-Id: Ie6bd66f06eb2b6d8b8d90bc67438597feace9905 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 10253876545d001d0c2542f567ff35978bb9c1b7)
* Doc: Fix QDoc errors Qt MultimediaNico Vertriest2021-09-1011-77/+53
| | | | | | | | Task-number: QTBUG-95708 Change-Id: I978447fde6f10d4f8bfe2afad3191bd7e854272d Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 48ed9a26cc8c3335776ff0eff8ef62e9d4fc99bb)
* Update dependencies on '6.2.0' in qt/qtmultimediaQt Submodule Update Bot2021-09-101-3/+3
| | | | | Change-Id: Icf605b0cf14e9dc5c86ee5fd03ba25d490e03026 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not discard track that do not have language informationPiotr Srebrny2021-09-092-9/+6
| | | | | | | | | | | | | | Many track do not have the languange information or it may be not relevant, like in the case of video content. Instead of discarding these tracks give them a default track_x name. Fix how track indexes are handled. Change-Id: Ic8a3cf6feb6d00e05f317e4085ee852f71e4352d Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Samuel Mira <samuel.mira@qt.io> (cherry picked from commit 9bcb332f599fc7f2dccfac688d8d019533ccab76) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove VideoOutput.autoOrientation propertyLars Knoll2021-09-092-53/+0
| | | | | | | | | | | | | | | | | Late API change. This property got overlooked in earlier reviews. It doesn't make any sense anymore, as the received video frames are always oriented the same way. Adjustments for device/screen orientation on mobile happen inside the camera backend where we rotate the video frames to are aligned with the device orientation. Fixes: QTBUG-94845 Change-Id: Iaa85bf127e2a3144f9eba9baaf9560a49ff07abb Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 4c89d87b6d6499c917f5c9e4ac2a91b13151aeab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix camera orientation handling on iOSLars Knoll2021-09-094-2/+40
| | | | | | | | | | | Ensure the video frames coming from the camera are always upright with regards to the devices orientation. Change-Id: I30e816f0eaa2ee5c933ef1409fad77a43e4864ed Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit d326872b43c9cbe3d6d12fb50391d734edb7690d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove NSApplication from Info.plist filesDoris Verria2021-09-093-9/+0
| | | | | | | | | | This causes the applciation to crash on iOS as this class doesn't exist there. Change-Id: I393a63b2635475510f3fe1325d5c0cdace79f006 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit c24860a521670aa95ff954f98d2e7a59b3ce2347) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Drop misguided conversion from degrees to radiansEdward Welbourne2021-09-081-1/+1
| | | | | | | | | The angle was in degrees already and that's how QTransform wants it. Change-Id: I05c57e46d9bb8f849009ea82bc45650677295181 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit df058bed709b8d7b73fa35b216ae6b44cf9a9bd1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix orientation of camera frames on AndroidLars Knoll2021-09-083-16/+57
| | | | | | | | | | | | | | | | Properly adjust orientation of video frames coming from the camera. Now we show the video of both cameras the right way in all orientations. When in portrait mode, swap the width and height of the video frames we create, to get the correct aspect ratio of the camera device. Change-Id: I7168c672867988c419f160c817a380624392744e Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 18c1261976d7838814468cb1cc31a3858cf363cd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix default state of recorder exampleLars Knoll2021-09-082-2/+7
| | | | | | | | | | | Turn camera and microphone on by default. Change-Id: Ib4bbb2fdc16249018a51f8db5bcab4707658687f Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> (cherry picked from commit 4b6cde99e1cf6ad388b794bec3e98516120b0b7c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Improve QML Recorder exampleSamuel Mira2021-09-089-57/+95
| | | | | | | | | | | | | Changed QML and added some cases just for mobile. Tested mostly on android. Hid metadata adding feature on mobile since it is not implemented. Task-number: QTBUG-96077 Change-Id: I524767232561bef7716830ed0f9360e7c0662f0f Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit f52141f1cf85f84e0b2a93d9c4e88723cf1d622a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix a couple of compiler warningsLars Knoll2021-09-082-1/+2
| | | | | | | Change-Id: I537035b03034c237639955710b933decbb250a09 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit c6340c6b6c7e8af5e2a7fd16d196074c4180550e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix memory leak on macOS/iOSLars Knoll2021-09-082-2/+10
| | | | | | | | | | Correctly release some objects on destruction. Change-Id: I1a3486f76f971aa446b16ca9b952fb887f7a7a0b Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit e0f94543ff5b9310bfb735110949e66663179a34) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Only use available gstreamer video formatsSamuli Piippo2021-09-081-0/+5
| | | | | | | | | | | | | Check the gstreamer version before using video format that were added after GStreamer 1.14 release. * @GST_VIDEO_FORMAT_VUYA: packed 4:4:4 YUV with alpha channel (V0-U0-Y0-A0...) (Since: 1.16) * @GST_VIDEO_FORMAT_BGR10A2_LE: packed 4:4:4 RGB with alpha channel(B-G-R-A), 10 bits for R/G/B channel and MSB 2 bits for alpha channel (Since: 1.16) Change-Id: Ib2cc5265f43e4fcb059e897ef96969154f27c297 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 1115b5220eb5006b5193d634382bc0081f31e95b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-09-081-3/+3
| | | | | Change-Id: I8e964b1710dbcb51b520f6f58c9367507dbf50a6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix build issue with conflicting declarations in GL headersSamuli Piippo2021-09-071-2/+1
| | | | | | | | | | | | | | | | | | Some graphics stacks have old version of GL/GLES headers which have conflicting declaration and fail when GL and GLES headers are used at the same time. /usr/include/GL/glext.h:466:19: error: conflicting declaration 'typedef ptrdiff_t GLsizeiptr' | typedef ptrdiff_t GLsizeiptr; | ^~~~~~~~ /usr/include/GLES3/gl3.h:75:25: note: previous declaration as 'typedef khronos_ssize_t GLsizeiptr' | typedef khronos_ssize_t GLsizeiptr; | ^~~~~~~~~~ Change-Id: I98b96755ea1b27c942214adf3d76e65539302053 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 321d97b670e2b7a3b146d94dfcbbbb11c114ee76) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Only search for and link EGL if we have gstreamer and openglLars Knoll2021-09-071-3/+5
| | | | | | | | Fixes: QTBUG-96251 Change-Id: Id4aea9db83b54ba150c7d10ea443c48e6f2e5405 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 57332356a0d3c1afa447a3b59b4050fcb0d5b98d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Move gstreamer over to the new subtitle handlingLars Knoll2021-09-0712-31/+379
| | | | | | | | | | | | Implement a custom sink for subtitles that notifies the video sink about changes in the subtitles. Remove the subtitleoverlay we have been using so far. Change-Id: I6ecfb1ab8538169d7365f21e0c0648b4aa2cd769 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 8d5182d03c1967d77ca8da531b004e85bb0892f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-09-071-1/+1
| | | | | Change-Id: I23cd53bda760f60a195f12c8364ef01be46aa073 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* API fix: Give QVideoSink a videoFrame propertyLars Knoll2021-09-0728-49/+79
| | | | | | | | | | | | | Gives a more consistent API with a videoFrameChanged() signal instead of a newVideoFrame() signal. Add setters and getters for videoFrame and subtitleText. Change-Id: Ib6bb27b76cbf195dcc83eb00bca080ffd64ef538 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Samuel Mira <samuel.mira@qt.io> (cherry picked from commit 5c88c2f110c94b202554063d81ad696ff29bd307) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use the new subtitle infrastructure on AndroidLars Knoll2021-09-072-121/+3
| | | | | | | | | | | Move the subtitle support on Android over to use the new platform independent infrastructure. Change-Id: I51fc9a72a3241fbbd2d39c859f46527306e76363 Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 712efcb4f70352665209198e32abd3ee72e7dffc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add subtitle support to VideoOutputLars Knoll2021-09-075-11/+74
| | | | | | | | | | | Implement generic subtitle support for the QML VideoOuput element by rendering subtitles through a QQuickTextNode. Change-Id: Ib6cd2763769891758fb1bb96964f30a38bdadefe Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit d8ede46f1fcaf2322bb64daf48ad4565f7e0adfd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Implement platform independent subtitle renderingLars Knoll2021-09-0711-17/+334
| | | | | | | | | | | | | | | | | | | | Add support for rendering subtitles in a platform independent way using our own text rendering infrastructure. Implement support for subtitle rendering in QVideoFrame::paint(). Add a flag to disable subtitle the rendering if not desired. Support for Qt Quick VideoOuput is still missing, and will come in a follow-up change. Implement setting the subtitle text correctly on macOS/iOS. Other platforms will be done in follow-up changes. Change-Id: If5c689d4919d7a8df23399184f6e724028b0e980 Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 2c0b2b11a5c3d2972bacf5d4d1de34ab16126f79) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-09-071-6/+3
| | | | | Change-Id: I5530c609db1c3905ec94bd9df6e3c27126cd63eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix mediaplayer QML example's layout and iconsAssam Boudjelthia2021-09-067-17/+35
| | | | | | | | | | | | | | The play control buttons were overlaying the rate seekbar and have wrong layout on both portrait and landscape. Also make sure QtSvg is added to the project because mute/unmute button is an svg image and it's not being loaded properly without the fix. Change-Id: I98e26273ca5a2496d624c378d868ac497dd19741 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 671396809fd866e0e3d7793f8fd635b0ad33bed7) Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
* Get rid of a compiler warning about an unused variableLars Knoll2021-09-061-1/+1
| | | | | | | Change-Id: I68e2b2952fc932162ba5d445924dbd7b62fb5df7 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 3e99f4aa72aa0aebfa8c836dd76480bda168c5b2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Avoid emitting activeTracksChanged() if the active track doesn't changeLars Knoll2021-09-061-8/+20
| | | | | | | | | | Capture those early, by checking against the currently active track in qmediaplayer. Change-Id: I964deb994bd1490551191f6ed865e4f221dece0c Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 00c0f8be1d7747a9167c5e1970ca4b23327e4870) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Allow passing a media file as command line argument to the mediaplayerLars Knoll2021-09-062-6/+22
| | | | | | | | | | It's often convenient to be able to pass the file to play back on the command line to the QML based mediaplayer. Change-Id: I1b77184a614cb6a32a7243e242b99fcdc1bae300 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit f1f53f209e9fa50c0a199bdbf1fa153e55611bb1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove unused field and clean up member initializationLars Knoll2021-09-062-27/+18
| | | | | | | | | | Fix a warning about a member variable that's unused on iOS, and clean up member initialization while we're at it. Change-Id: I83c01e2f8435ecc8201b37e50562681ab6a80eb9 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit d6afa086dd690bf4c28cf91a9cab75abce3fc03f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Check correct pointer before calling a method on itPiotr Srebrny2021-09-061-1/+1
| | | | | | | Change-Id: Ic55dc6f5465b56339e86f1c6644dfb91c7abcab9 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 3eef3a20e9e7aa16f85074f95c581d01ac763721) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add qDoc comments for mediaplayerSamuel Mira2021-09-061-18/+96
| | | | | | | | | | After adding Q_PROPERTY to qmediaplayer.h, the qdoc should have been properly updated. Change-Id: I3540824264fbfda8318be8596de9a4b16de97980 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a35cf397e4653505ec8d3f8dc09c2a6a9d27c3cd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Docs: Add MediaRecorder QML type documentationNicholas Bennett2021-09-061-20/+210
| | | | | | | | | | | | Documentation was added into qmediarecorder.cpp file for corresponding QML type. Some reflow of the existing c++ documentation. Task-number: QTBUG-95066 Change-Id: Icb916b32bc030c9e05236f60a199ac2f9360d508 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 1d56bc453a3551f349159067eeb9d45ea8ba98eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-09-061-1/+1
| | | | | Change-Id: Ic8fd12426c1e9d4d41367eccc48c97eac1ba4eed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2021-09-041-3/+3
| | | | | Change-Id: Id937faa4a9a828b26411ba135739f04586669733 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 06:47:59 +0000