| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
| |
Change-Id: Ia0457a2d6e5cedc1aae9e980ccf82763147c0bcc
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| |
|
|
|
|
|
| |
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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When defualt buffer size (100000us) and period time (20000us)
are out of range, currently buffer size is computed with
respect of either 2 or 4 chunks of maximum buffer time.
Which is not enough.
Fixing computing of buffer time based on minimum period time:
How many minimum periods could fit in maximum suggested buffer time.
Fixes: QTBUG-43256
Task-number: QTBUG-79526
Change-Id: I722e5145e3b6d323e306da420ec764db3575225f
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Since RestrictedBool conversion operator was introduced, objective-C
method calls require explicit .data() on our smart pointers.
Fixes: QTBUG-79686
Change-Id: Ie32ebf0442cd56a01466aa58b89651d7c293de6d
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | |\
| | |
| | |
| | | |
Change-Id: I6bd582b1d4dee508c0e694b806b43c85c55fddd4
|
| | | |
| | |
| | |
| | |
| | | |
Change-Id: I4cc304daa4098bd1209152bb84cae7ee93d92933
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
| | | |
| | |
| | |
| | | |
Change-Id: Ic40941bd63720eb1d753abd457f5861782f99105
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There is support for rendering video without OpenGL on most platforms
although some features are unavailable as a result, so we can make sure
that what is available can be used.
Change-Id: I63938e8e4e8063fcc2064d0f9d8d5f10e0fb06f9
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | | |
| | |
| | |
| | |
| | | |
Change-Id: Idf13b2f851b78a9134b0c22ec9333f28f5b265cf
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| |\ \ \
| |/ /
| | |
| | | |
Change-Id: Ib880ad9150a59700878942fa6c3b711004bec4b0
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
DirectShow capture control supports only RGB32 to capture to buffer,
which fails the test.
Decided to fix the test to avoid checking against Jpeg format and just
make sure that it returns proper QImage.
Change-Id: Ibcd565d6157cf3543eb15d3e1e371df271fc358c
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since for Android GStreamer is distributed in archives,
and should be staticlly linked, so by default it is not built
and should be explicitly enabled within configuring by -gstreamer option.
(currently it is auto and enabled if gstreamer exists)
("libs" of the gstreamer library in configure.json is empty
to prevent any libs to be added while building any code that uses
gstreamer library)
Some base gst archives are fully included to Qt5MultimediaGstTools.
Users would need to just use:
QT += multimediagsttools-private
Before building, GSTREAMER_ROOT_ANDROID env var should be set to point to
gst binaries.
Also all necessary plugins must be registered in user's code by
GST_PLUGIN_STATIC_DECLARE/GST_PLUGIN_STATIC_REGISTER macros after
QGstUtils::initializeGst().
and e.g. project file might contain:
INCLUDEPATH += $$(GSTREAMER_ROOT_ANDROID)/armv7/include/ \
$(GSTREAMER_ROOT_ANDROID)/armv7/include/gstreamer-1.0 \
$(GSTREAMER_ROOT_ANDROID)/armv7/include/glib-2.0 \
$(GSTREAMER_ROOT_ANDROID)/armv7/lib/glib-2.0/include
LIBS += -L$$(GSTREAMER_ROOT_ANDROID)/armv7/lib/ \
-L$$(GSTREAMER_ROOT_ANDROID)/armv7/lib/gstreamer-1.0 \
__here_list_of_plugins__
See video/android/gstreamer example
Change-Id: Ie4e586fa8489f1bd23622763f5578abed1729272
Task-number: QTBUG-72125
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| |\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/multimedia/video/qvideoframe.cpp
src/plugins/directshow/player/directshowplayercontrol.cpp
Change-Id: I00840245e35861cf4fe1d62789815ca125b2052a
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QDeclarativeCameraViewfinder connects to QCamera's statusChanged() to
update its chached settings when the status becomes LoadedStatus or
ActiveStatus. However, it's updated after QDeclarativeCamera has
signaled cameraStatusChanged because QDeclarativeCameraViewfinder
connects the that signal after QDeclarativeCamera, making those
connected to cameraSignalChanged still receiving old values despite
camera.cameraStatus already changed.
This commit moves the creation of QDeclarativeCameraViewfinder into
the constructor of QDeclarativeCamera, before the later connects
to signals. This make values in camera.viewfinder reflects the correct
value by the time cameraStatusChanged is signaled.
A side effect of this change is that camera.viewfinder.resolutionChanged
and similar signals will be signaled before camera.cameraStatusChanged.
This might not be as bad as it seems; if the user of resolutionChanged
checks camera.cameraStatus, the value will be correct anyway as it's not
cached.
Change-Id: Ief0c3d55e441cc872d37de937ba54fed0f2b877d
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | |
| |
| |
| |
| |
| |
| | |
Additional to bf6ac0 commit, need to fix convert funcs
Change-Id: I8eb82234557489e66bc179e1696afc154332b656
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When qrc media content is set, it allocates and opens QFile.
If the same content is set again, the url remains the same,
but it creats new QFile, and need to update by new stream.
Change-Id: Iee6c50135bb8304177affbe70b27d24898fc5b5c
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When qrc media content is set, it allocates and opens QFile.
If the same content is set again, the url remains the same,
but it creats new QFile, and need to update DirectShowIOReader by new
stream.
Change-Id: If3f5c187c4e2987e1a593b45f9a46c3c1b77ce45
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If remote source is requested to play but there is a limitation in network bandwidth,
StalledMedia status is never emitted, also the playback is not resumed after buffer gets full again.
Based on AVPlayerItem.playbackLikelyToKeepUp introduced changing the media status
and resuming the playback.
Task-number: QTBUG-49806
Change-Id: If8aa10a1ea2cee2a40c679871b836d2dca622fcd
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Format_ABGR32 was introduced together with gst opengl support.
And is supposed to be used with QT_GSTREAMER_USE_OPENGL_PLUGIN=1,
Which should be fine for Raspberry Pi, but suddenly does not work for iMX boards.
RPI's omxh264dec provides buffers in RGBA format, and corresponding textures
will be created using GL_RGBA.
Since we return Format_ABGR32 as supported format, which is RGBA,
no conversion is needed and everything was ok.
But for iMX, imxvpudec provides buffers in I420 format.
And textures will be created using GL_RED with only 1 plane.
Following patch https://bugzilla.gnome.org/show_bug.cgi?id=779067 requests RGBA too.
Since incaps contains I420 and RGBA, and we say that we support RGBA,
this leads to use buffers in I420 but *passthrough*
in gst_gl_color_convert_element_prepare_output_buffer().
Since incaps and outcaps contain the same video format.
No conversion will be done there and textures will be rendered incorrectly.
Removing support of Format_ABGR32 from texture video node will cause to ignore
requested RGBA from DIRECTVIV and perform converting, I420->BGRx on iMX and RGBA->BGRA on RPI.
QT_GSTREAMER_USE_OPENGL_PLUGIN should be used together with decoders that use gpu memory.
Otherwise some converting/uploading operations will be done
which will also introduce some performance issues, so not recommended to be used for iMX.
Change-Id: I8f037316c40587c81b2116c43a7262c6a70a5b44
Fixes: QTBUG-78855
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| | |
After changing sequence in QVideoFrame, need to fix qConvertFuncs
Change-Id: Ie022676a66d9c47a1b89cf5ef61c2146921a2a0b
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| |\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/multimedia/configure.json
Change-Id: Ie887a5f4d718cb3e082b0e2ee996c6687af330cb
|
| | |
| |
| |
| |
| |
| |
| |
| | |
This amends commit f0ea2641.
Fixes: QTBUG-79014
Change-Id: Ib04d844ef64e335785408dc8d7e512a5a3651655
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Get real physical address of video frame data and provide it to
imx6 vivante videonode to prevent memory leak from kernel.
By default qtmultimedia does not depend on gstreamer-imx,
but the plugin should exist on imx platform.
So gstreamer_imxcommon will be disabled.
And should be manually enabled in yocto receipt.
Change-Id: I6e75746a2ba651d12bdd7697ae483699aad450fc
Fixes: QTBUG-73084
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| | |
Fixes: QTBUG-45064
Change-Id: I6b4a7a4b92affe80fc288e08d514092ac3d6899a
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some element can return caps with same resolution/framerate but
different features. gst_simplify_caps() won't de-duplicate this,
resulting in duplicated entries for the same resolution/framerate.
This commit add calls to also remove features from the caps in addition
to setting name to video/x-raw.
The GST_CHECK_VERSION macro is added to maintain compatibility with
earlier version of Gstreamer without GstCapsFeatures.
[ChangeLog][CameraBin] Fixed duplicated entries in supported resolution/
framerate if the underlying element uses caps' features.
Change-Id: I15101899eb0369925013ccc1d925afb890a01205
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the playback is already stopped, and after that
new position is requested twice, e.g.
stop();
setPosition(0);
setPosition(0);
this causes the playback to start.
Need to postpone setting of new position until play is requested.
Also no need to emit positionChanged when position is not changed.
Fixes: QTBUG-68778
Change-Id: Ib62942ee155d9c8ed2310132dcc6b501dfef1a04
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently if custom pipeline is set, old playbin elements are destroyed.
And if normal url is passed again after the custom pipeline, it is unable to play.
Because no playbin elements exist anymore.
Adding a fix to recreate playbin elements if "not a pipeline url" is passed.
Fixes: QTBUG-78079
Change-Id: I8b3498c4660639f5d757b322a136846ee82fdc28
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Media status should be emitted before any error.
Since error can cause changing the media and changing to new media
status.
Fixes
BFAIL : tst_QMediaPlayerBackend::playlistObject() Compared values are not the same
Actual (mediaStatusSpy.count()): 4
Expected (6) : 6
Task-number: QTBUG-46368
Change-Id: I8eb82e7a551d78abd143baa594cfda9bacd7e544
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixed tests about start times.
Since DirectShow can provide frames with negative start time, also from
the beginning, also pixels can vary, e.g. (rgb) 255:0:0 would be 230:19:19
after decoding.
Task-number: QTBUG-46368
Change-Id: I025f7cf9238ddf9ba2a04f63e3e54b77f3cceafe
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When QDeclarativeVideoOutput::releaseResources() is called,
means the window is going to be destroyed and it is too late to use
scheduleRenderJob() to clear filters.
This beforeSynchronizingJobs will not be handled in this case.
Which produces a leak of filter's runnable.
Fixes: QTBUG-51588
Change-Id: I71ec351463a2c4136d8b7e241d61e628a1b0c64b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| | |
* Add const & to function parameters
* Add const & to variables assigned from functions returning const &
Change-Id: Idc141bd48f37eae92a4d1775caade3c977a42391
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | |
| |
| |
| |
| |
| | |
Fixes: QTBUG-78616
Change-Id: Iad36d650530602e0e6d6504776a793e69b40bb4e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| | |
[ChangeLog] QRadioTuner and QRadioData classes are now deprecated.
Task-number: QTBUG-75943
Change-Id: I54023ad344c494f4cddb62503ab47612a8b367e9
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| |\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/multimedia/video/qvideoframe.h
Change-Id: I8458c4138be05f661d6528116cbc6b18298f0a91
|
| | |
| |
| |
| |
| | |
Change-Id: I2fc8d9c8b951092498f11a4a31c6c890df9d7495
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | |
| |
| |
| |
| | |
Change-Id: I9aab0c5c20f97bc45fa26cc3a0faf6cf10c916d2
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
YVU formats are likely not supported by the codecs and the pipeline
will not be negotiated in this case.
Fixes
BFAIL : tst_QMediaPlayerBackend::surfaceTest(YVU formats) 'surface.m_totalFrames >= 25' returned FALSE. (Expected >= 25, got 0)
Task-number: QTBUG-46368
Change-Id: I6bf1a5822481a018549fe58aaf5fe79c79ff8456
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Need to flush when at least one frame is probed
and stop is called, EOS or QMediaPlayer is destroyed.
Fixes
BFAIL : tst_QMediaPlayerBackend::probes() '(probeHandler.isVideoFlushCalled)' returned FALSE. ()
Task-number: QTBUG-46368
Change-Id: I09ebd6608c9a1b8a0a0707d83200d75ddb435734
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Commit 84d0d87699a2a92b3207beae30a52f25e23acb65 (CameraBin: Postpone
fetching supported viewfinder settings) checks if the camera is in
LoadedStatus before fetching supported viewfinder settings. However, if
viewfinder settings is never requested or not (yet) available during
LoadedStatus, it won't try to fetch it at e.g. ActiveStatus. In that
case, requesting supported viewfinder settings never works.
[ChangeLog][CameraBin] CameraBin plugin now fetches supported viewfinder
settings at status higher or equal to LoadedStatus if it has not been
fetched.
Change-Id: Ibd32c25feac9b1a133945e754d26181937190a24
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
|
