| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Change-Id: I79177b7f398c418ab3ba723e9ff2cd5ef3de1cf6
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
(cherry picked from commit d750ae98cd3b13d96eb9865a1eb0ec328278de14)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
The example is broken and was never too useful.
Change-Id: I24ccc3f316713ccba73104f2d6f4a2b1dd3727e0
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 7e2ae885f6292b3b2623797e51de89bed11ce57a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Change-Id: I836a3a371e54b88ffe75ff464c326fa33a6a9f5b
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 34bb2dbfa3b8cce2f8deaf300e410420ea5749b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
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>
(cherry picked from commit a3c15ba4984f2e7f903e48cfd273af2f3861f083)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It should be possible to set the active audio/video track to -1
and with that disable audio/video playback the same was as for
subtitles.
This doesn't yet work on gstreamer and is untested on the other platforms.
Change-Id: If4d5bac23caea8476a1f1b60982ebc15ccfbad55
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 56bd792aacc67adbeadc7653dd7232ed3628b224)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: I51127a199b858639a693fd6d86fe4e3bb97a24a7
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 0339c8ef155387b6ac99ac011e8859e24b53b502)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QMediaPlayer::bufferProgress() is float based in Qt 6 and return a
number between 0 and 1. Adjust the player example to correctly
convert the numbers.
Change-Id: Iaec285b91e9e82c88fb976da4c5b346155bc8998
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 0f091a399b3cd5207f2c873b82e02fedbad64538)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Added Q_PROPERTY in QMediaPlayer.h for the obtaining track metadata and
for setting active track
Changed mediaplayer QML example to add track information and change.
Change-Id: I1ff228a858079a87b1253d3c7a1ff24d815f2182
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 72c36a33dbb510d9eb098033cd5a4087211418fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Hardcoding a path might not be always guaranteed to give a writable
path.
Change-Id: Ia6f049bbaa173857c544fbb9b6fad70532713eaf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 9e16bf2eace2a66ac93b507f9fd284628c91fdc3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Put the controls on the button of the screen and lock the view on
portrait mode on Android.
Task-number: QTBUG-96077
Change-Id: Ib09068723d892285cc15dd0ef5a708a21220abdd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
(cherry picked from commit 62454915c3293c5d5825709ad4e1938148b0223f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: I32219b4c3719a8d75268ff867e166acd33a65a3a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 9a5f644a113c7791289c244fafa33dac9d1ef677)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
This isn't supported in 6.2, get rid of the dead code.
Change-Id: Ie2af81d0b74f16a126c718d09368ee04774809cf
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 1083861fd1534d28858dca552784c7daa9d3bd54)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
This amends 7038c860dbb3c329c567e5dc0a87d4063700d549.
Change-Id: I60207a32b7133096ffba4e53d8e7481c88e9d324
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 11c735f68f35b7b33aa7fe26d6f9718c2746aac1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This hides some parts of the example that makes it cluttered
and mobile layout wasn't accounted for when making this example.
This means the example won't look the exact same as other platforms,
but at least it will be decently usable.
Change-Id: If667d91e569b7022a8da5f4fcea409d9b10a0341
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 471735cff86d5e7af99e035330d451a5eac8947c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove qmake information from widgets page.
Move relevant information out of qml-multimedia.qdoc and remove.
Fix incorrect reference to the obsolete QML audio type.
Remove reference to qmake for widgets
Task-number: QTBUG-94646
Change-Id: If3fe045307dd2a39518408a55785496379428153
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit e8b989998613ad376f161795f6f391df0fd918bb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Since this example is made as a command line tool, it won't be easy
using it on Android. This adds a QMessageBox to explain what the
example expects and does.
Change-Id: I26af8b59a36de7c154baaeed5590b310f5bc5752
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 14788016edea6d9062ffdd52c024eadb6c4e9403)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
devices example is a command line example and doesn't run properly on
Android and iOS.
Change-Id: Iabe1185d5481b6fdfb1c47f9b71fe921d99eea23
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 7038c860dbb3c329c567e5dc0a87d4063700d549)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Add an Info.plist file for camera and microphone usage too.
Change-Id: Ia1fafec2f01dcb1c3d85ce6efcc642fc9d5216b8
Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 1b7f5a052dd4972e19748d3831b60788ff56aadb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This is an example, so a simpler file is better.
Change-Id: I712e83789d58eacf135dbb71987fefc7a08c4dff
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit ae66fa27ec43871b684e36bdfaed016f956efd11)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Adjust the example to MediaDevices API changes
Change-Id: Ie67016c9ff57cda5a1000099f553b76174c39513
Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 6546e6da5d53a798ba15a1b53843aaa5062713fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-95636
Change-Id: I67a136d4437269f9afea9bf71d424d46132f4fa4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 8276adc9104f3bfa71b8014d87be69c8703e1289)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: Ib863b1497c9b2714f22b81667c236afb6472af87
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 9ca528259062c1c0ebcba61834c5fdfcbb08c4b3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Avoiding code duplication is a noble goal, but the examples need
to be self-contained. E.g. Qt Creator sometimes does copy the example
(and just the example) to a tmp directory, where navigating out of
the source directory will fail.
Pick-to: 6.2
Change-Id: I009c3f253fea9bf260f9cd58a58f2541a249d3af
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
We can always assume that the example is built with at least the
current Qt version it is shipped with. Everything else is not
supported.
Pick-to: 6.2
Change-Id: I1cd58c976f6916de7bc4465741f2820c30d73b33
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
| |
API docs review and changes to solve qdoc warnings
Task-number: QTBUG-95115
Pick-to: 6.2
Change-Id: I165360e66930fc3cc1c27ff158a188a7c054d86d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Remove Audio QML type
Add links to technical definitions
Spelling and grammer check
Changes to adhere to Qt Doc guide
Integrated change to qt 6 page (porting guide)
Break out Audio QML type removal into it's own line in changes table
Reflow docs text within 100 characters
Task-number: QTBUG-94646 QTBUG-94906
Change-Id: I65ca7083e68d0bf534fd4faecfa7c501bab83b24
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We regression-test in the CI by building examples with qmake.
This partly reverts commit 7b28765dd0898e0638555e990308dc2fa09b79da.
Pick-to: 6.2
Fixes: QTBUG-95065
Change-Id: Ib146eeb974d4e94d580597dbaae93378aa5561a9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
The QML examples have QML in the name, and therefore are tagged
with 'qml'. Make sure that the examples using MultimediaWidgets
are also tagged with 'widgets'.
Pick-to: 6.2
Change-Id: I02495f6d08b24e1f84a975d1d7bd9118bf1c4e7a
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It is not obvious why the example did go to quite a length to
make ffpeg a separate dynamic library. Just build it always
as a static library. The code is LGPLv2.1, but that is compatible
with the BSD-3-Clause license of the example.
Also move the actual application out of the sub-app directory
into the top level directory. This is much more intuitive to use.
Pick-to: 6.2
Change-Id: Ib6173ce21dab78d02190fb0b38c90629b41d26cd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
| |
Do not activate camera until it is not set
Change-Id: Ief04826f93bb6c52b82d8f0f764d6af93bb8d1ad
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After calling setPosition() while being paused, gst_element_query_position()
can return false while the pipeline is still prerolling the new
position. So simply return the last position in that case instead
of 0.
Also moved some methods that are only used on the pipeline from
QGstElement to QGstPipeline so that we can cache the position there
without having to add data to every element.
Fixes: QTBUG-95251
Change-Id: Ice56975fcf7d519f0dd54db75103b97b025cd085
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Properly determine whether seeking is allowed on the given
source. Add an auto test.
Fixes: QTBUG-95246
Change-Id: I6a81a4690c6f9d53ef1ef9c217a3077fa63c05d0
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
| |
Change-Id: I342536e89469a6127d8136b8d6cea563c66518bf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
| |
The public permission API is being postponed until 6.3, for now,
we can use the private API.
Change-Id: Idbcbe06996f8334bd7d5b4cab86132c35fdc0862
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
| |
Amends 1c4dd0c23c0a
Pick-to: 6.2
Change-Id: Id84a6b12b5e15b20be265858446a4fca1517f77e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
TODO:
* src/multimedia/audio/qaudiobuffer.cpp:333: (qdoc) warning: Cannot find 'QAudioBuffer::StereoFrame'
* multimediaquick/camerafocus.qdoc content refers to now-removed classes
* multimediawidgets module doc needs CMake build instructions/snippet
* Lots of undocumented parameters, enum values, other minor things
Pick-to: 6.2
Change-Id: I4861aa0edf2904e5e43783f5167c5d2ba575b91b
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Make it compatible with QAudioInput/Output::setVolume() which
also uses floats.
While at it, fix the volume setting in the player example to
work correctly with [0,1] ranges (it used to be [0,100] in Qt 5).
Change-Id: I62c0575abd60b6dd05975a2e8702686d37ae6ec5
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
| |
The media player doesn't have a volume property anymore, it's the
audio output that has it.
Change-Id: I5dd1ca42a63ae6d1b5b3e550616b20be5aa146c3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As the class is called QMediaRecorder this is required
for API consistency. Also cleaned up the front end code
and examples where they used encoder instead of recorder.
Cleanup of the backend will have to come in a separate change.
Change-Id: I6e63e607473e68f628b1f89ffa3edcbc5bf5c2c8
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
So far the data only contained information about the total size in
bytes. That does break down for planar formats where the different
planes do not have to be connected in memory. So rather provide
the data size per plane.
Also clean up the API and remove the methods that access the mapped
data without a plane argument, as their semantic is not well defined.
Change-Id: I3fb2c74172c31720e66d9856472e8786e9004afa
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|