| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
Added a step through of the code and added images and animations to
support the explanations.
Large videos were uploaded to YouTube and embedded.
Task-number: QTBUG-100512
Change-Id: Ie79de8e7af7908d8f2728c2af273ed5f4ae51a65
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 29eb3cc4d8a00f889b989730d65f8b7d074bef6a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Codesigning with entitlements is not needed unless the
hardened-runtime option is enabled, so we can remove this
post-build step.
Fixes: QTBUG-101719
Change-Id: I35181220dbe4ef6b59072dcd3e76f066ab85db60
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit fa8e9a39bfbffaa23200a88bb700e86490389183)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These examples use resources files with qml files inside but the
resource files were added in the project sources. That prevented
the app to find and use the resource files. To fix the issue the
resources were added using qt6_add_resources macro.
Note that adding the cmake flag set(CMAKE_AUTORCC ON) would also
work, but the qt6_add_resources macro is more consistent with the
rest of the examples.
Fixes: QTBUG-101518
Change-Id: I5fb2481d5576683171a2292bdc35e417ee6d8fab
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit bdacf2b290e9d341ffc5d96e7bcc696ef3b7add7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Remove "# generated from xyz.pro" comment from pro2cmake
- Remove automatic use of CMAKE_AUTORCC
- Only opt into CMAKE_AUTOUIC if .ui files are involved
- Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR
- Combine multiple find_package(Qt6 ... calls)
- use REQUIRED COMPONENTS
- sort components alphabetically
- Fix wrong indentations
- Use (only) one empty line after multi-line commands
Change-Id: I9f60da23df1547d685439b0263fa5bf533b7c69e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 236eec9cbe35f018f0c0617d4a0d707dea85b0ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
qt_examples_build_begin needs the EXTERNAL_BUILD flag
to know that it's safe to build examples as ExternalProjects.
It still won't do it in CI until we enable building
examples as ExternalProjects for prefix builds.
This is preparation for that.
Task-number: QTBUG-90820
Change-Id: Ie7b3be8d74c1eb9e5f09dbe1819d56c2a42653fc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit b094da4bee0954f4e77b8c406d0c760741e31ca4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
After the fix, seek works s it should be.
Task-number: QTBUG-99038
Change-Id: I6658dd3e860e88c9fee8e457d7cdcd31df840426
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit bc2c92b483d3a45e426722b50bf2f1e4ad97d648)
|
|
|
|
|
|
|
|
|
|
| |
After the fix, metadata of the video shown correctly on MetaData page.
Task-number: QTBUG-99038
Change-Id: I3ef2d90c237d1740c550ff4537fe5184a88bea5f
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit b2ce9610ce434ce5e779f2ae1ce04260dd0cb5b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Add install command to deploy the examples correctly.
Change-Id: If9c24c4267a801078a4bf3f783587afeeb734be0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit a0437e324bad99685072aa7f7a5fc4d20846bb12)
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-97838
Change-Id: I355958b99f62fc85228b3dd3afd06aa01005008c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit e95f7256fb534c3dd03b3091dd9835cd2f33d327)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The camera example was simply trying to get the format with
the highest possible resolution. But that often lead to formats
with a very low frame rate being chosen. Change the algorithm
to find the highest resolution format with at least 30FPS.
Fixes: QTBUG-97817
Change-Id: I5e043188a4ed3d4acd72190b96fba4095a3f9aa2
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit c76508f8a2d121a428d90648b4c894c845c3f010)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Factor out a function to calculate the level from the data
to make it clearer that push does not require reimplementing
a QIODevice.
Complements a71362d9ef7098c1d7869b3768a0990a61474980.
Change-Id: I4899b96d1e8d0336f960e514bfd355a894522aa8
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
(cherry picked from commit 28932bcc4c40a6c5f96bf2beb860c916c1161056)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Use a QWidget instead of a QMainWindow since no QMainWindow
functionality is used and the controls are wrongly parented
- Change the update signal of AudioInfo to levelChanged(level),
removing the need for a lamba
- Streamline the code
Change-Id: Ic03a5414ee5da4841532ad23db112d0594f458e5
Reviewed-by: Doris Verria <doris.verria@qt.io>
(cherry picked from commit a71362d9ef7098c1d7869b3768a0990a61474980)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Apple needs apps to specify proper entitlements in order to grant the
executable permissions to use services like camera and microphone.
The multimedia examples using microphone and camera were sometimes
crashing because of missing entitlements. To fix, add an entitlement
file to all examples using these services, and add a post-build
command to codesign the executables with the specified entitlements.
Task-number: QTBUG-98419
Change-Id: I6a578def1f6a41b4d106ee49c0c32fad304ef3cb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 767315b2049f0685f12de3418c658313851e8c0f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-90820
Change-Id: I7b3fe87c4dc9b3ed71c97598d07c592c7e707db8
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 11d810823522c9d850e1db96c0027f7ba50e89d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
After the fix, the buttons on video side will behave as they should and preview plays the video.
Fixes: QTBUG-99134
Change-Id: I593aad3f37b93b3699781c6b143e7e0c9a157ec3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 452caffc791e4be614ffc46ae6dc34e3da8be90d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Update the metadata information to show track-specific metadata for
the active tracks, besides the media's metadata.
Add a missing signal emmission on darwin's mediaplayer.
Pick-to: 6.2
Change-Id: I0513d3ab0c2b62cf74ef060bc1367e2589f68bcd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
| |
After patch, you can use the camera in portrait and landscape mode on mobile devices.
Task-number: QTBUG-96077
Change-Id: Idd46498e1166bab09a27d182ce707d8bb4528c24
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
src/gui/kernel/qwindowdefs.h #defines
main to qMain and qtentrypoint_win.cpp expects qMain
to have 2 parameters in its signature: argc and argv.
The 'devices' example was missing the parameters, which caused the app
to fail at link time with
qtentrypoint_win.cpp:97: undefined reference to `qMain(int, char**)'
Add the parameters to the example signature.
Pick-to: 6.2
Task-number: COIN-762
Change-Id: I8baa4e84abf4c08f462f041a30d261023282a0b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The Spectrum app does not crash anymore after the fix.
Fixes: QTBUG-96953
Pick-to: 6.2
Change-Id: Ia555bdd21c3bc1ab0ada585c49441d6f8f548f8d
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
| |
After fix file name and file extension will pass as a initial name to the file name field of the QFileDialog.
Fixes: QTBUG-96957
Pick-to: 6.2
Change-Id: Iea97b1249195fee1021163beb23130141093c3a4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
|
| |
WinRT doesn't exist anymore as a platform we support.
Pick-to: 6.2
Change-Id: I85ebb73b5c24d5415847925b0f3462b29232c6c9
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
The combo boxes should show a list of matching formats/codec that we can
handle give the constraints from the other combo boxes.
Fixes: QTBUG-97839
Pick-to: 6.2
Change-Id: I1a3f66c27f3ede06f188b9320600dde7c561a409
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
| |
Don't assume the list of camera formats is non empty.
Pick-to: 6.2
Change-Id: Id64772b8db165357d350456df9174a6659f7c8d8
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Improves look and feel of the position slider significantly for
short videos.
Pick-to: 6.2
Change-Id: I3b2cf3e66317cffcb1ffaec26bf3f5787b4264b4
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Fix format error in .plist.in file which was causing the permission
dialog to not show up.
- Provide separate .plist.in files for iOS and macOS so we can set
needed keys specific to the platforms.
- For qmake builds, fix the shared.pri to provide an INFOPLIST
dictionary for macOS. The provided one has iOS specific keys.
Fixes: QTBUG-97408
Pick-to: 6.2
Change-Id: Idd8e00c91b935328352cc513f419205303d9356d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
After fix the list of output devices will be update.
Pick-to: 6.2
Fixes: QTBUG-96956
Change-Id: Iaae3e1098ed11fb21477cd7dcf2a6054f169ddea
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We're not using gstreamer on Android and the example is in any case
relying on code that is not supported anymore in Qt 6.
Pick-to: 6.2
Fixes: QTBUG-95369
Change-Id: I24c814bbb820ff42c2830d4d9661c1485f8dc0f3
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Multiple widgets are being created, but, in case of mobile ui, not all
of them are added to layout. Those that are created with the player as
the parent are added but not correctly positioned or used.
Reordered calls to better understand what was being created and where.
Prevented creation of widgets not being used on mobile.
Fixes: QTBUG-96747
Pick-to: 6.2
Change-Id: I390ea534d7ea7f58b0fb30faac2bf5491d9723dd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Handling a back button with in Android in VideoWidget was not being
handled. The app would get back to previous screen but the VideoWidget
did not stop fullscreen mode and would continue reproducing behind the
UI.
Fixes: QTBUG-96750
Pick-to: 6.2
Change-Id: I2b9fbfc91275cf024e8f5f54f368eb4d96f705b5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.2
Fixes: QTBUG-96955
Change-Id: I4c9d2da8d8f0dd3af9ce7482deaab3dedafa7755
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Changed the resolution list (widthxheight) to camera a format list
(PixelFormat widthxheight MinFps-MaxFps FPS)
Changed the Frames per Second to be a spinbox and a slider so it would
give feedback of the selected FPS while being easy to change on a
mobile device. This way users can fine tune how many fps they want
for the capture (previously was either min or max)
Set the selected cameraFormat to the camera in the captureSession
since it was needed for saving all the changes and it fixed QTBUG-96739
by coincidence
Fixes: QTBUG-96719
Fixes: QTBUG-96739
Pick-to: 6.2
Change-Id: I9eaacfbf860d8a4d03c2044b41de5d84139b3b17
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
There is no need for the assertion. If we receive partial
samples, we can simply ignore that partial sample for the
max volume calculation.
Fixes: QTBUG-95063
Pick-to: 6.2
Change-Id: Ia1022f87ac4f23e154fc7627ace477c07ecef55a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
After the fix, we get a list of available resolutions and frame rates of
the camera. This also fixes the code in the widgets camera example that
uses the video resolutions and frame rates.
Task-number: QTBUG-96097
Pick-to: 6.2
Change-Id: Ie5fa1e89f658f0c816015944fa5a4c1f34625c12
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
| |
The example implements a simple video player using
QVideoWidget, not QVideoSink.
Pick-to: 6.2 6.2.0
Change-Id: I2392c82b12b69d4845c681b7a7b28652be1639fe
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
|
|
|
|
|
| |
They contained some ugly borders from the capturing tool.
Remove those.
Pick-to: 6.2 6.2.0
Change-Id: I75c8a5b85ff856144eb7611dda5d9e0840706f0b
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
|
|
|
|
| |
Fix all qdoc warnings inside the Qt Multimedia module.
Pick-to: 6.2 6.2.0
Change-Id: I4a581aa4f9fa9d96d58279884116ed10ca7bf837
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
|
|
|
|
|
| |
Don't add_subdirectory(devices) for Android and iOS, instead
of throwing a warning.
Pick-to: 6.2
Change-Id: Iaa4300d3ad875557f11504f80d0224d72debe2f9
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The QML type should be MediaMetaData (as the namespace
is mediaMetaData).
Pick-to: 6.2 6.2.0
Change-Id: I0b45ef390fc9662c534033977f56d3ce607bcb3e
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove all properties that don't exist in Qt 6. Move the QML
docs into qmediaplayer.cpp, add docs for some missing methods
and document the AudioInput and AudioOutput QML types.
Fixes: QTBUG-96641
Fixes: QTBUG-96653
Task-number: QTBUG-95066
Pick-to: 6.2 6.2.0
Change-Id: I8c2339d85cf06ae39f8baf7f44543e961e01c433
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Hook up those examples in the correct places, remove a stale
link to the qmlvideofx example and fix the highlighted examples
list to include four examples, showing playback and capture for
both C++ and QML.
Pick-to: 6.2 6.2.0
Change-Id: I79177b7f398c418ab3ba723e9ff2cd5ef3de1cf6
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The example is broken and was never too useful.
Pick-to: 6.2 6.2.0
Change-Id: I24ccc3f316713ccba73104f2d6f4a2b1dd3727e0
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.2 6.2.0
Change-Id: I7ec3e321335877831930b7ffa1076b79c87fcdef
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
| |
Pick-to: 6.2 6.2.0
Change-Id: I836a3a371e54b88ffe75ff464c326fa33a6a9f5b
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
| |
The capture button does not works.
Pick-to: 6.2 6.2.0
Fixes: QTBUG-96102
Change-Id: Iac7a774cd81113e55550598423e9c19bc775c9b3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
| |
And document the best practice in QMediaPlayer::record().
Pick-to: 6.2 6.2.0
Change-Id: I3f9c69e869d36e3267a2dd33fa86f0b290541227
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Pick-to: 6.2 6.2.0
Change-Id: I19bc88b0c6a8bf20dd4d3846a5c843d11ee7f8cb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Fix linking issues
* Document all QMediaFormat::AudioCodec enum values
* Fix example \quotefromfile paths
* Document QMediaFormat::ResolveFlags
* Drop links to removed classes/functions
Pick-to: 6.2 6.2.0
Fixes: QTBUG-96340
Change-Id: Iae82295e9cd396b392af2e577b21158ad1509fd3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Pick-to: 6.2 6.2.0
Change-Id: Ic8a3cf6feb6d00e05f317e4085ee852f71e4352d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
|
|
|
|
|
|
|
|
|
| |
This causes the applciation to crash on iOS as this class doesn't
exist there.
Pick-to: 6.2.0 6.2
Change-Id: I393a63b2635475510f3fe1325d5c0cdace79f006
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Turn camera and microphone on by default.
Pick-to: 6.2 6.2.0
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>
|