summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix deprecation warningsv5.13.0-alpha1Friedemann Kleint2019-02-053-18/+21
| | | | | | | | | | | | | | | | Replace trUtf8() by tr() and implement QAbstractItemModel::roleNames(), fixing: multimedia.cpp:76:5: note: in expansion of macro ‘Q_OBJECT’ multimedia.cpp:143:77: warning: ‘static QString QMultimediaDeclarativeModule::trUtf8(const char*, const char*, int)’ is deprecated [-Wdeprecated-declarations] from multimedia.cpp:40: .... qdeclarativecamerafocus.cpp:403:23: warning: ‘void QAbstractItemModel::setRoleNames(const QHash<int, QByteArray>&)’ is deprecated [-Wdeprecated-declarations] setRoleNames(roles); Change-Id: I2648551a1b2774c45101ab1cad9e0ea3ab79ccbc Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
* Introduce QVideoFrame::buffer()VaL Doroshchuk2019-02-042-0/+10
| | | | | | | | Returns video buffer if available. Is useful when need to get an access to impl specific data. Change-Id: I6b9855397db2396ed0a76835d083be0457721f9b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Gstreamer: Return GstBuffer from QGstVideoBufferVaL Doroshchuk2019-02-041-0/+1
| | | | | | | Useful to get some impl specific information from video buffer. Change-Id: I7fccf2855f0be180bd438a59e4fbaefce15b4ed8 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-0212-44/+35314
|\ | | | | | | Change-Id: Ia13d887c3e3bf00b6ded5d052384fc5689b816fe
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-013-0/+35228
| |\ | | | | | | | | | Change-Id: I1d3188a758fc89c2fedfc9a2274bf808bbe2b56e
| | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-151-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 27ab485e6a28dc081152ed8a8867ae51220479ba Gstreamer: Fix camera example to apply video settings + 630738f9ef1ba7467c3c280a1cb64471c37d62d1 Gstreamer: Fix compiling issue with < 1.1.3 ver + be919fd68a844a2e7e0d15c70fc5ccacce8d4edc Alsa: Do not open device twice in QSoundEffect + cce3e8a019a3272ff422b1cdb1ce11bb7b00feea Gstreamer: Do not create video profile if no codec provided + 05a58a81db51564f93397dcf8f7cd37c8d4d1a9d DirectShow: Fix compiler warnings + d9bf568551c9e101374ba842e831650d34d0d41e Bump version + 6dd0e0141bbb8ca8571f7d142c7b0314e8c63f57 CoreAudio: Decrease volume when playback is stopped on macOS + 2c974280aa8c40d29ec89bdc73bc6bf384c010c9 EVR: Prevent redefinition of MFVideoNormalizedRect + 6966a09c9a6a2c134a739446cc582e47d0c6ed6d Add changes file for Qt 5.11.3 + c459810caf72be43275e983b01cf97556ad55562 DirectShow: Display windows error string when camera fails + 9fb8dd4e76700da8d321a8677e44e771a0213a7e DirectShow: use supported pixel formats for QCamera video surface + 67a826716a9a58659f7272cbce3c450af384da5a Windows: Repaint QVideoWidget when WM_PAINT or WM_ERASEBKGND received + a9889e9e853b2b0e9b3736a258c908fa7559b35c DirectShow: Restart not active surface when frame is received + 06f1f32daa89265269532a02457e73912da3c2d7 DirectShow: Don't queue video buffers from sample grabber + 4e9b9c1f268b333efd4b266091976585e4660352 WMF: Map PKEY_Media_EncodingSettings to QMediaMetaData::Description + 4fb0aa479ea6b5ea7e72ba880cf01bbaa59d93fa Add binary compatibility files for 5.12 for QtMultimedia + 7064057843bd474115055acdc76a886953acf898 QGstUtils: fix build with MSVC + 885ad4bd1de3c0e8d14bae94f63d10e54b36283c GStreamer camera bin service plugin: remove bogus export macros + 982d4c9505cf427709aac18346dd9df4a13f76c5 GStreamer: remove unnecessary <unistd.h> includes + 5d7531192bbb411c24039dd5c68805d42383f547 Fix QCamera::testCameraLockCancel test + 8c26502e386e76fa7db6ce8c4d073e9dabf00b44 Fix test to pass when wave is not available + afc952f93922db36ff7a93ce3c4e558cb78177e2 Bump version + 80898b03be54e2855472987f60f4c2526344389b Return ServiceMissingError if no camera found by name Change-Id: Ib012fed3c29d300df9101f1db7f38387e5288c23 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0813-39/+97
| | |\ | | | | | | | | | | | | Change-Id: Ic42cf93c3be21a84d711effae28a3292f2b5c600
| | * | Add binary compatibility files for 5.12 for QtMultimediaMilla Pohjanheimo2018-12-182-0/+35160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility files added. Change-Id: Id9346f9e75d9fdbcf8ad30409d706829f1ba2573 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | | Android: Fix memory leak of GL resourcesVal Doroshchuk2019-01-312-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeferredDelete events have implicitly higher priority, which makes this event to be handled before MetaCall events. See QSGSoftwareRenderThread::sync(): ... QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete); Where it processes deferred deletes and no meta calls will be delivered even if they were requested before the deferred delete. Task-number: QTBUG-67280 Change-Id: Iba23550d2cffb1cea1b4c2fe4c903078d9f2f046 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | | Fix comment for YUV fragment shadersSamuel Gaist2019-01-295-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment contains information which makes it misleading to understand how the components are passed. Change-Id: I29cdb5eec1e8014fa7f0ca3f1a0f54258fdb431f Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
| * | | Gstreamer: Set custom pipeline using urlVaL Doroshchuk2019-01-232-31/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced possibility to set custom pipeline using url. Now the pipeline should be set only via QMediaPlayer::setMedia using url with scheme "gst-pipeline". For example, "gst-pipeline: videotestsrc ! autovideosink" Since setting the media should be done after renderer in QML, hence a surface is ready to be used and "qtvideosink" is available in pipelines. To use it with QVideoWidget, setting the pipeline should be done after passing video output. Change-Id: Id43f8681069e4bca2eafb154df2c5d446a0ca498 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | | | GStreamer: support video orientationAlexander Volkov2019-02-016-38/+55
| | | | | | | | | | | | | | | | | | | | Change-Id: I233c45824f517c185cb245d8a7d77cab8551fc51 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | | GstTools: move headers to correct folderJochen Seemann2019-01-3126-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to have the headers of QtMMGstTools in a separate directory of the QtMultimedia module. Change-Id: If304ab5ee5741aec7cf7785352f5a571bc4ec240 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | | Make QPulseAudioOutput::elapsedUSecs prone to OS time changeTomasz Olszak2019-01-292-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulseaudio implementation of QAudioOutput used QTime as time counter. Hence when output was started and timezone or time has changed the QAudioOutput::elapsedUSecs() returned faulty values. It happened because QTime::elapsed is undefined after system clock update. Using QElapsedTimer instead of QTime seems safer. Change-Id: I1f0c27deea550f249e2ccad0fc716b95a32608ae Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | | Return default camera with not empty nameVal Doroshchuk2019-01-282-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCameraInfo::defaultCamera() should not return empty name. QCamera() uses first found camera service. QCamera(QCameraInfo::defaultCamera()) uses the service which supports provided camera's name. Change-Id: I7a18b111997a605881eb6ec9788cb6e1d324c011 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | | | Enable gstreamer support for Windows and macOSVal Doroshchuk2019-01-282-7/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I29b411a517d24e89eaac944507abbe2c471abb5d Reviewed-by: Christian Strømme <christian.stromme@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-223-10/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icf8b9f73c50b16d6f5765040eb7bd918231df94a
| * | | WavFile example: drop needless includesRolf Eike Beer2019-01-171-3/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I26033a3d853dca8023fe4ec5f1eb7c53ef5d013f Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
| * | | WavFile example: fix indentationRolf Eike Beer2019-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibc117caf24daef75cf2e71f04b058ffadd30c273 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ia716cc04cebf19cc1c2514d1ab2f8b2080dd29da
| * | | Migrate QGstUtils to use QRegularExpressionSamuel Gaist2019-01-121-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the QGstUtils class to use QRegularExpression in place of QRegExp which is to be considered deprecated. Fixes: QTBUG-72589 Change-Id: I67e189c48688b512cc76c884fd2a7e51e1b188f9 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
| * | | Gstreamer: Negotiate default settings before encoding container profileVaL Doroshchuk2019-01-111-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | In case if container format, video and audio codec are not provided, need to fetch default ones. Change-Id: I616fabc7bf9ec7c7a08a4c5dacad87a1748209f3 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Fix QCameraInfo to be invalid if camera failed to find deviceVal Doroshchuk2019-01-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since QCameraInfo uses deviceControl and infoControl to get info about camera, it needs to clear these controls if the camera failed to find a device by name. Change-Id: I1404f70234f978fa4568b6c883a5676f61e08145 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Gstreamer: add support for ksvideosrc within camerabinVal Doroshchuk2019-01-172-2/+54
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-72125 Change-Id: I12bc684a796c6abb6af3a51edca52011495f4ac9 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | DirectShow: Fix video and audio probes in media playerVal Doroshchuk2019-01-153-39/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added using ICaptureGraphBuilder2 to connect source filter and sample grabber to probe video and audio buffers. The capture graph builder can automatically add some intermediate filters as needed. Video buffers are always requested in ARGB32 format. Task-number: QTBUG-71819 Change-Id: I7382635758ba3bd76c8806cabd0895c67072be6c Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Windows: Build directshow media player with wmf if availableVal Doroshchuk2019-01-1411-66/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed -mediaplayer-backend configure param. It allows to build directshow media player together with wmf's one, if the last is available. It is useful to switch to another backend without rebuilding. By default directshow media player will be used. [ChangeLog][Platform Specific Changes][Windows] Removed -mediaplayer-backend config param which allowed to build wmf together with DirectShow. Task-number: QTBUG-32783 Change-Id: I486a93d9493407af3793cfe338b35daab7c642db Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Introduce QT_MULTIMEDIA_PREFERRED_PLUGINS env varVal Doroshchuk2019-01-141-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added comma-separated env var to define preferred backend plugins in descending order if multiple backends are available. Also short names of plugins could be used, e.g. "gst" instead of "gstreamermediaplayer", "av" instead of "avfoundationmediaplayer" etc. [ChangleLog] Added QT_MULTIMEDIA_PREFERRED_PLUGINS to specify preferred plugins if multiple backends are available. Change-Id: Iae1a24f2a36d7d133c5771626e68e89f8273b1bf Task-number: QTBUG-56400 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Fix warnings about deprecated QPalette enumerations and functionsFriedemann Kleint2019-01-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | videowidget.cpp:625:32: warning: 'Background' is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] qgstreamervideowidget.cpp:56:36: warning: 'Background' is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] qgstreamervideowidget.cpp:56:36: warning: 'Background' is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] qgstreamervideowidget.cpp:83:55: warning: 'const QBrush& QPalette::background() const' is deprecated: Use QPalette::window() instead [-Wdeprecated-declarations] Change-Id: Ieb55a57c5672d3023a48461ec347fbb30210fd1e Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* | | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-01-111-24/+19
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/multimedia/camera/qcamera.cpp Change-Id: If06a4c6a7dde35d5b95abcc5213ff281dca9374e
| * | Return ServiceMissingError if no camera found by nameVaL Doroshchuk2019-01-071-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | If no camera devices found with requested name, the object should be invalid. Task-number: QTBUG-54901 Change-Id: I54037c5c7caad09da2df51eb0624eb0e88f12bf8 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | | | | | Change-Id: Ia7fef54ffced53efa146b15ae64e4090f0546a58
* | | Allow disabling directshow or wmf pluginVal Doroshchuk2019-01-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Directshow or wmf now could be disabled by -no-directshow or -no-wmf within configuring. Change-Id: I5408f8b5ff0fcaa18da2b15df637eb04effecff1 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | avfoundation: fix compiler warnings regarding Objective-CJochen Seemann2019-01-046-51/+53
| | | | | | | | | | | | | | | | | | | | | warning: declaration of instance variables in the interface is deprecated [-Wobjc-interface-ivars] Change-Id: I3763d207d916bc4f0355a282b47769d5404ea087 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
* | | multimedia: modernize by using nullptrJochen Seemann2019-01-0448-294/+294
| | | | | | | | | | | | | | | | | | Change-Id: Id1084fec084b972aaa1d2389ee56ee831a821172 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | avfoundation: modernize by using nullptr and overrideJochen Seemann2019-01-0449-270/+270
| | | | | | | | | | | | | | | Change-Id: Ifd483f925ed69f0ba35c46facfdb571dea87c1ac Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-0418-51/+202
|\| | | | | | | | | | | Change-Id: I5394a9d75850771068d43d2509b14a3ac4efcf83
| * | Fix test to pass when wave is not availableVal Doroshchuk2019-01-041-4/+8
| | | | | | | | | | | | | | | Change-Id: I97023663c4232146f844de1d1b380f5a7bf11264 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Fix QCamera::testCameraLockCancel testVaL Doroshchuk2019-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since QCamera(0, provider) does not make any sense, because provider should not be passed to ctor, it is already inited as default. Change-Id: I398671ef9885a94d5f651a33f7f5376252611a1e Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | GStreamer: remove unnecessary <unistd.h> includesJ-P Nurmi2018-12-262-2/+0
| | | | | | | | | | | | | | | | | | | | | This makes it possible to build the GStreamer backend on Windows. Change-Id: I5b705524072d8bd89a7c9b834201b97e0d01d6cc Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
| * | GStreamer camera bin service plugin: remove bogus export macrosJ-P Nurmi2018-12-264-4/+4
| | | | | | | | | | | | | | | | | | | | | Results to inconsistent DLL linkage errors on Windows. Change-Id: I0aebe05e40dbb4fac130c536849c68dd61aa12fe Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
| * | QGstUtils: fix build with MSVCJ-P Nurmi2018-12-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC didn't like the #iffery that was done with GST_STATIC_CAPS(). The build error was: qtmultimedia\src\gsttools\qgstutils.cpp(1323): error C2121: '#': invalid character: possibly the result of a macro expansion qtmultimedia\src\gsttools\qgstutils.cpp(1323): error C2059: syntax error: 'if' qtmultimedia\src\gsttools\qgstutils.cpp(1323): error C2143: syntax error: missing ';' before '{' qtmultimedia\src\gsttools\qgstutils.cpp(1311): error C2143: syntax error: missing ';' before '}' qtmultimedia\src\gsttools\qgstutils.cpp(1325): error C2059: syntax error: 'return' qtmultimedia\src\gsttools\qgstutils.cpp(1326): error C2059: syntax error: '}' qtmultimedia\src\gsttools\qgstutils.cpp(1326): error C2143: syntax error: missing ';' before '}' qtmultimedia\src\gsttools\qgstutils.cpp(1329): error C2143: syntax error: missing ';' before '{' qtmultimedia\src\gsttools\qgstutils.cpp(1329): error C2447: '{': missing function header (old-style formal list?) Change-Id: Ic9ac64648aba396fc4ef433e73d5c72a8c1c3da1 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+58
| |\ \ | | | | | | | | | | | | Change-Id: Ibe4bdfa7d77d0e2740c6f203546797bcc9ad7636
| | * \ Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+58
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I4e7e3d5802e4d656194b0890a6175383a20a0b1c
| | | * | Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-201-0/+58
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + f844a2acbb7ecc4d7b1776d1d6eeb8feab7044f1 Add OpenGL core profile support to QtMultimediaQuickTools + c5400d31a40847e2905b11759090400653624a94 Fix Gstreamer plugin to pass tst_QMediaPlayerBackend + 2c5efb49495e31afa399a1c1ea003a9b630ba113 Pulse: Fix crash when stop() is called while reading buffers + 32708d53946da77b6137fa04b1849b27e84f2d0f Fix video window parenting and positioning + e8a82901e2456bd6112cb1298b795f202b80a36d Android: Fix crash when play() is called but state is not set + 6ed348b476938c9401f1f9bb751f3a0f2f4ac310 EVR: Fix crash when video source is changed and ANGLE is used + 6b0bbfadf483c5eaca90a4737399fa98ef0d9347 Retrieve some information from the track metadata if available + 78a57c2e335ba3eb5324275b7a33b4a244488f57 EVR: Fix crash when no resources created + ab9f3f089c6f9537ae316697ee151ad63c6618fd DirectShow: Fix crash when camera destroyed + fc33195f87d7b2b036f1df625a8fda12557e05e4 Use the setDataSource(String) overload for non assets/file paths + d9bf568551c9e101374ba842e831650d34d0d41e Bump version Change-Id: I449d7953a02ae491688ceecd2862668f6b1609bf Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | / WMF: Map PKEY_Media_EncodingSettings to QMediaMetaData::DescriptionVaL Doroshchuk2018-12-101-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | According to https://docs.microsoft.com/en-us/windows/desktop/medfound/metadata-properties-for-media-files PKEY_Media_EncodingSettings is closed to description. Task-number: QTBUG-72287 Change-Id: I2cafc4b922ffc8ad01db43f8dfb97097f8185501 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+59
| |\ \ | | | | | | | | | | | | Change-Id: Ia402a507d6508029b75149d2f6ee5a6d964ef8f4
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.0Antti Kokko2018-11-051-0/+59
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic3bc5e5bc49ebc034eef8d6b6edc78a2e33c8bca Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * | | DirectShow: Don't queue video buffers from sample grabberVal Doroshchuk2018-11-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed an issue when buffers are sent using queued connection. Thus all buffers were collected before they were handled. Now only last buffer is kept. Also moved handling of device lost timer to main thread. Task-number: QTBUG-72012 Change-Id: I338587c5854739d6081c5cb502377e5779776417 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | DirectShow: Restart not active surface when frame is receivedVal Doroshchuk2018-11-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If playback is not stopped but EndOfMedia is received, it would be still possible to seek to previous position and start playback again which will cause empty video output because the surface has been already stopped and should be restarted. Task-number: QTBUG-42057 Change-Id: I5ca496ba3af5c27c0ad61edb35d758e201061595 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | | Windows: Repaint QVideoWidget when WM_PAINT or WM_ERASEBKGND receivedVal Doroshchuk2018-11-293-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since updates are disabled, and no paint events will be sent to QVideoWidget, need to somehow repaint the video window. When BeginPaint is called outside of the expose event, the window might not be refreshed. So moved calling the repainting within the expose event. Also added repainting when the display rect is changed to immediate refreshing. Task-number: QTBUG-71326 Change-Id: I7c29b3f8ad35e33590c7b138a5141546ce3c1a42 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 20:29:01 +0000