| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\|
| |
| |
| | |
Change-Id: Ia0c325dc50b9a5a1cdd205609ba688ad9874f297
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since android.media.MediaPlayer does not support playing from data stream,
we create a temporary file and copy data to it.
Each such file contains unique name.
When the app is killed, dtor of QMediaPlayer is not called and thus
the temporary file is not deleted.
Also these files are located inside app's location, e.g.
/data/data/org.qtproject.example.app/files/, and no possibility to delete
them automatically.
Added a fix to rename the temporary file to original name which allows to keep
only one copy of the file when the app is killed.
Change-Id: I36c8bc4dd339fbf4091689a05f4d9c7febf046a5
Fixes: QTBUG-59517
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When AVFoundation reports that the media is now buffered, we only
should resume the playback if the QMediaPlayer is in the according
state.
Fixes: QTBUG-81912
Change-Id: Idba30ecf6c9c7b87a1c67896d89faa9a1bceae10
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
AVPlayerItem::seekToTime::CMTime is deprecated since 10.13
Also fixed to use accurate seeking by passing a time value of
kCMTimeZero for both toleranceBefore and toleranceAfter.
Fixes: QTBUG-81804
Change-Id: Ifafeb1fb5ca66ecba14d77abf315ebe6ffd45eab
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Will be moved to private API.
[ChangeLog] QMediaService and QMediaControl classes are now deprecated.
Task-number: QTBUG-75943
Change-Id: Ic40013ea52301cad812886e22940efa3b096f875
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Fixed to use negative playback rate.
Change-Id: I864e76710f2ea176262639d5e91059c71b9bb382
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Video surface property for QVideoWidget, QGprahicsVideoItem and QDeclarativeVideoOutput
should be CONSTANT and kept the same value while the object is alive.
Note, currently this property can be suddenly changed, when videoSurface is mixed/used
together with source property.
To keep the patch simple, this will be fixed in next commits.
Change-Id: I80046524a70bcb70bb45e7f1bbae74bff1b3b0f2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ic6618a0d2e40f7008d766d861f4d2cb0190a94dd
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the viewfinder settings are valid, need to lock the capture device
to avoid reseting settings to default values.
See also a8123e737140719549252806e0e6a1c121359f79
Fixes: QTBUG-81048
Change-Id: I834815ef6c5ef28d8017d04bdb9d5256c02d1de7
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This property holds the target video output,
and allows to render video to multiple items.
MediaPlayer {
videoOutput: [videoOutput1, 1, "ignored", videoOutput2.videoSurface]
}
Incorrect inputs are ignored.
The property also accepts single either QAbstractVideoSurface or QDeclarativeVideoOutput objects.
Task-number: QTBUG-32939
Change-Id: I41fc557dcac60be6d70b3889036ff4ae75734cc0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I0bc0e3caceaca0def467237983d9c611c46c5d7a
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It does not make sense to create a GstEncodingContainerProfile with a
non-supported media container.
The correct way to use it is to provide supported values for
mediaContainer together with videoCodec.
mediaContainer: "video/quicktime, variant=(string)iso"
videoCodec: "video/x-h264"
Task-number: QTBUG-81075
Change-Id: Ia25fff32a39dc9dd512c353d1ced7d7d7e4f6370
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Update instance of old code using JNI_VERSION_1_4 to make the code
consistent.
Change-Id: I21a3f7eb43614896536838f83bd5eb6027af64c1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ater ec0e9f29dfd0b45edf5fd33e8ccf763e604612d7, the logic of accessing to
platform plugins has been changed.
For Android the plugin suffix is not allowed to have "subdirs" anymore
in QFactoryLoader. But some multimedia plugins are located in subdirs
like:
video/videonode or video/declarativevideobackend
And the plugin loader was not able to find plugins by filter:
libplugins_video/videonode_*.so
Fixes: QTBUG-81006
Change-Id: Ie5bcfa0792cdb67073f08917541ae89387f1c0b5
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Use \value for \qmlproperty enumeration instead of \table.
Move some docs around.
On C++ side, add leading sentences to \enum docs and remove empty
lines from \value commands.
Fix some language issues.
Change-Id: If682c0a52d72babae563b075ed9ff987fdf16bd0
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix the QDoc code to use \value for \qmlproperty enumeration. Remove
empty lines within \value on the C++ side, because they break the
docs.
Fixes: QTBUG-81364
Change-Id: I5b26e4ec9d86292d63d70c3751865ca26ff13fa0
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I6deb8d5a282ecfe5cacc884ddfb3d4dc3ef3106d
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Supported formats might be changed, thus need to inform
the renderer control about this.
If gl textures are supported by the surface, the video frames
will be rendered to FBO instead of QImage, next time when
the update request will be received.
Change-Id: I7750def3e943ea2680bb8b83853cb987ab554f00
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Need to proxy supportedFormatsChanged signal from internal surfaces, since it impacts supported
formats, also GLContext property should be set to share gl contexts between renderers.
Change-Id: I9774be4d79dcd09190769def7e6ffd11a85fcc86
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ie511ad4ccac1b5bde6686bbe2c391dd175dd3274
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixed a bug when the media status was changed and emitted, but the state
was kept old, this prevented to start playing again in a loop
if the loops were requested.
This is a regression since 9dbdd5d.
Fixes: QTBUG-81122
Change-Id: Id2c7d03a25cc22f7f45c6017d2da0af9bb52e528
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In macOS, a capture session can still automatically configure the capture
format after you make changes.
If frame rates are applied to the capture device and the camera
is still not active, these rates will be overridden by old values
when the capture session will be started.
For this purpose lockForConfiguration is currently used within startRunning method
of capture session. But in case if the settings are already applied to the capture device,
we don't call lockForConfiguration within starting of the capture session
(since it is needed to be called only when the settings have been changed).
Suggesting to postpone setting of the format (to the capture device) until
the camera is started.
This will lead to apply settings before startRunning method with proper configuration lock.
Fixes: QTBUG-81048
Change-Id: I04664e7b63474ce28571e888e524170b995a38d6
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Added forgotten calls to parent's methods.
To make current object "active".
Change-Id: If31d751dc7d37b0b160bfb8eaad818f3843af65b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I2d9e9deb651a3602bef5feae30b147462bcb15a8
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-74602
Change-Id: If2e4c8ad9822999e9fe4c5d8dd820cc78e1e1924
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTQAINFRA-3407
Change-Id: I6719856c5e9749b7b3108406f6ace91001515379
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I3b9b75b9f55bbb13bd5751a49b072102af675c4f
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Ie81bd5a419665756dbdac5dafddf50fdde61019f
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Currently QVideoWidget, QGraphicsVideoItem and QML Video Output
tightly depend on QMediaPlayer, QMediaService etc.
Since QMediaService is deprecated and will be removed from Qt6,
its usage must be removed from rendering components.
* Also it is a part of a task to make all components independent,
e.g. without dependencies to another components, like the media player,
or video producer.
These video consumer components should be reusable without QMediaPlayer too,
which today is not possible,
and should have responsibility for a single part of the functionality.
* It is a part of a task to allow users to decide how to render video,
using either video surface or native windows.
Introducing
QVideoWidget::videoSurface()
QGraphicsVideoItem::videoSurface()
QDeclarativeVideoOutput::videoSurface()
that create a surface, if necessary, and returns the underlying video surface
which provides a possibility to render video frames without knowledge of any services and controls.
Can be used like:
QMediaPlayer->setVideoOutput(QVideoWidget->videoSurface());
or
QMediaPlayer->setVideoOutput(QGraphicsVideoItem->videoSurface());
This allows QMediaPlayer to get video frames from a backend,
without using QVideoWidget/QGraphicsVideoItem, and to present these frames to provided surface.
Moreover, now it is possible to render video frames without QMediaPlayer:
QVideoSurfaceFormat format(img.size(), QVideoFrame::Format_ARGB32);
videoWidget->videoSurface()->start(format);
videoWidget->videoSurface()->present(img);
[ChangeLog] Introduced videoSurface property to QVideoWidget, QGraphicsVideoItem and
QDeclarativeVideoOutput.
Task-number: QTBUG-80431
Change-Id: I49641750537160832e29c297279e72b8288e974c
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I83986a47f3ba47b978eaea485aa0085124df8fbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit 0e6171203731521fae5459e67420d965e46b7ed6)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ie912379a82447106f7708d09992425da3734e825
|
| |\
| | |
| | |
| | | |
Change-Id: I29d8f54569c08b66576ce65737753dc9c3d84ebf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Mesa's EGL headers #include <X11/Xlib.h>
In file included from /usr/include/X11/Xlib.h:44,
from /usr/include/EGL/eglplatform.h:130,
from /usr/include/EGL/egl.h:39,
from qsgvideonode_egl.h:48,
from .moc/moc_qsgvideonode_egl.cpp:10:
qurl.h:135:9: error: expected identifier before numeric constant
135 | None = 0x0,
| ^~~~
Similar to e16ac8b55c36586aa67b1d4ec5e1b4edf03cd06b (5.4).
Change-Id: Ic96c456e54524e25b03ffffd15dcc08f16385cbb
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When the webgl platform is being used then we do not want to load the
videonode plugins because this will cause it to potentially use a
backend that is not going to be supported by WebGL. This is due to the
fact that it will potentially use extensions to OpenGL (such as the
imx6 ones). But since the rendering is not happening on the device, but
in the browser then the standard backends will work fine in this case.
Fixes: QTBUG-79181
Change-Id: I03021d4ec01d9447dd1ca3815d32a167392ac781
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
|\| |
| | |
| | |
| | | |
Change-Id: Ic9ca37f9f5d047cb3addeece5bab7b71ae78ce19
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Some changes are being made to improve the consistency of the API.
Change-Id: Idb4b8ba5d73a5242c25d306dcc7c77e3654ac3b6
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |/
| |
| |
| |
| |
| |
| | |
Calling this with (1,2) on a list with 4 items would remove 1 and 3 instead.
Change-Id: I8135c982889c9f65daac9ca996adb3049014bf9d
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
It is being deprecated.
Change-Id: I26b871fe9b989972ab1d2c18de344dc9c9275e9f
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Ib250ceecd02291f752b7775f329f0f494c4aed38
|
| |
| |
| |
| |
| |
| |
| | |
Use specific function instead, e.g. qt_androidRequestCameraPermission.
Change-Id: I925e4d8ac4f1993c073930a79453894dd516d769
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If camera permission is granted and recording is requested
it also requires recording audio permission.
If it was not granted before the popup will be shown
to ask the user to grant the permission
and the app goes to inactive state,
which destroys the camera handlers.
When the camera is loaded but the app requires additional permissions,
it should not destroy the camera.
Change-Id: Iee3662a7ac3381b0eb29190779b0116f9f64304f
Fixes: QTBUG-79909
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
| |\
| | |
| | |
| | | |
Change-Id: Ie351f3c36eecf9e83a5b6a55ec0aac27387b5656
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If QAbstractVideoSurface is not used on rendering thread
added a way to pass shared opengl context via GLContext surface property.
Camera and media players that are created in Qt Quick will usually have
their rendering done on the render thread, but the callback for custom video
surface(s) (or probes) will usually be handle on the GUI thread, so to
make it convenient to for the user to access the frame data, which is rendered
on request, we now set-up context sharing and render to a fbo on the calling
thread, if needed.
Task-number: QTBUG-69333
Change-Id: I4cc5c1f741c82376f1402a047b946b59281c9a4c
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Mark member functions of \internal classes also as \internal, as
otherwise QDoc fails to match function documentation with the
declaration in the header.
Comment out one instance of \instantiates referring to an internal
class.
Fixes: QTBUG-79834
Change-Id: I056c060537ee60beca128166ae3903ae3289a413
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |\|
| | |
| | |
| | | |
Change-Id: I5b99b3d05502e15373ebaedcad06d6ab4d25d387
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It would be reset to this state at the end of updateMediaStatus() anyway, so
simply leave it alone.
Change-Id: I7fa24773ebb1dd43ecfa8d7eb28d6f8e7862fa75
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
OpenSL ES support acoustic echo cancellation via the SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION preset, but
this isn't exposed through Qt's wrapping layer. This change exposes new Qt constants to enable the use of this feature
Change-Id: Ie64a949313b5a5b35d24159d3549290893ce32dd
Fixes: QTBUG-70368
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When custom pipeline is requested, all playbin related elements must be cleared.
Also when QMediaPlayer is destroying, it disables showing preroll frames,
property of the video sink, which was already destroyed.
Destroying of m_videoOutputBin decreases refcounter for m_videoSink,
since the video sink is owned by m_videoOutputBin.
Fixes: QTBUG-79753
Change-Id: I2fcbd19372caf46adf2ae1ed2e5a7d0ee70040ad
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Interface in headers should not contain i-var declarations, these days
it must be in implementation part. Also, replace quite suspicious
'load' with 'loadAquire' to pair 'storeRelease'. Since I have QT_USE_NAMESPACE
in *.mm file, no need in ugly QT_PREPEND_NAMESPACE macro anymore.
Change-Id: Ia19e3c5b68687030c97e8e8e982ae89627e909f9
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I255dc22dc21d3629a41a8c2ae2076c48b594e626
|