summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-08-10winrt: Add camera focus and focus lock controlsPeng Wu10-27/+1003
[ChangLog][multimedia][winrt] The winrt backend now supports camera focus and focus lock for Windows Phone. Task-Id: QTBUG-46120 Change-Id: Idb222798284d887a6e90a4986c69274e0ef765f5 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
2015-08-10Check and fix up bounds in QMediaPlaylist methods.Loïc Molinari2-6/+133
Change-Id: I665d665139dbe9663b20ecb08fa3dab9cbe3f899 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-08-10Blacklist failing test in tst_qsoundeffect on OpenSuse.Yoann Lopes1-0/+1
Change-Id: Iccf3e295fb79f043b2e64cb02528ac12e15a0ab6 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-10Clean up QMediaPlayer documentation.Loïc Molinari1-7/+7
Change-Id: I2d744542270f283ccd8ba0160aeda7faa56b2b86 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-08-10Added new playlist QML type.Loïc Molinari8-3/+897
Change-Id: I0788cc9719f427457ad0be9c9a5bfda00451a0c4 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-08-09Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn24-140/+117
Change-Id: I957b44c06fca7a3f552edc18f286de043d31e42d
2015-08-07Add new property to QVideoSurfaceFormat.Yoann Lopes4-15/+49
The 'mirrored' property indicates the QVideoFrames need to be mirrored along their vertical axis. This is typically needed for video frames coming from a front camera on a mobile device. This is implemented as a string-based property. In Qt 5.6, this should be replaced by a new public function. Change-Id: Ideb7de81e83f66826f4efb5f2951c4beec13546b Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-08-06Fix warnings about unused private fieldsThiago Macieira8-9/+5
avfaudioinputselectorcontrol.h:68:23: warning: private field 'm_service' is not used [-Wunused-private-field] Change-Id: I5722a2d1bf592862af3a4d36554419a653662892 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-08-06Don't list avfcamerainfocontrol header and sources twiceThiago Macieira1-2/+0
This produces Makefile warnings Makefile.Debug:351: warning: overriding commands for target `.obj/debug/avfcamerainfocontrol.o' Makefile.Debug:337: warning: ignoring old commands for target `.obj/debug/avfcamerainfocontrol.o' Makefile.Debug:514: warning: overriding commands for target `.moc/debug/moc_avfcamerainfocontrol.cpp' Makefile.Debug:506: warning: ignoring old commands for target `.moc/debug/moc_avfcamerainfocontrol.cpp' Makefile.Debug:351: warning: overriding commands for target `.obj/debug/avfcamerainfocontrol.o' Makefile.Debug:337: warning: ignoring old commands for target `.obj/debug/avfcamerainfocontrol.o' Makefile.Debug:514: warning: overriding commands for target `.moc/debug/moc_avfcamerainfocontrol.cpp' Makefile.Debug:506: warning: ignoring old commands for target `.moc/debug/moc_avfcamerainfocontrol.cpp' Change-Id: I2ec77cb92b4d218e5b07d895fdb96497061b527b Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-08-04GStreamer: use QMediaStorageLocation to generate capture file names.Yoann Lopes2-70/+14
Change-Id: I2111eb8e28f60ca6305a48a8ee9299bc14ab0df9 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-08-04GStreamer: fix possible integer overflow in comparison.Yoann Lopes1-1/+1
Change-Id: I6cf4349f89320f72cce4d04cdf909476e583d11f Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-07-28winrt: Fix crash during certain video operationsPeng Wu1-27/+10
The abstract video buffer pointer was being reused and (improperly) deleted when its reference count went to zero. As QVideoFrame utilizes an explicitly shared pointer which also tracks the video buffer, simply reuse the QVideoFrame instance instead. Task-number: QTBUG-47373 Change-Id: Idadae205cb520a0a1d752aa20256c0567b3be699 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
2015-07-23Exclude failing tests on RHEL and UbuntuSimon Hausmann3-0/+10
Change-Id: Ifbfb36f47da5f826c94777286fde27d5edd29d01 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-07-23Extend test exclusion for this test on OS XSimon Hausmann2-0/+5
The test doesn't work on OS X 10.9 and 10.10. It also doesn't work on OS X 10.8, but the current CI system doesn't actually run tests on 10.8. In the (future) event of us running tests on 10.8, this change is required. Change-Id: I6cbe6249aee2460353322d6f1254858238af3711 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-07-23Prospective fix for building QtMultimedia on Android against installed QtBaseSimon Hausmann1-1/+1
We try to link in Qt5PlatformSupport, which depends on libqtfreetype, which in turn is not installed. However we don't really need Qt5PlatformSupport, only QtCore private headers for the JNI bridge. Change-Id: Ic6d577081327eda7b80ce03c6fb7fd5cf024d05f Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-07-20Fix video nodes material comparison.Yoann Lopes3-0/+11
Don't consider a material equal to another when their texture IDs are not available yet. Change-Id: Id4127d71abb2db33950a206dc722b24ab626e960 Task-number: QTBUG-47205 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2015-07-17Unit test qaudiodecoder: Do not rely on qCompare(bool, int,...).Friedemann Kleint1-4/+4
The overload was added for NokiaX86 and RVCT and is bound for removal. Task-number: QTBUG-47260 Change-Id: I8eb0333e0e20323ab20f361186d9a47fd3ab9f24 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-07-15Doc: replace Mac OS X with OS XNico Vertriest3-3/+3
Task-number: QTBUG-40759 Change-Id: I11b3aa74d35064371cbbbeba660114e086b16aea Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2015-07-14GStreamer: fix supported values returned by CameraBinImageProcessing.Yoann Lopes1-11/+22
Change-Id: I5a4db9c055495714943421742dd237b6abf7daee Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
2015-07-13WindowsAudio: Fix compiler warnings by g++/MinGW.Friedemann Kleint1-2/+2
Replace NULL by 0 for parameters of type DWORD_PTR. qwindowsaudiodeviceinfo.cpp: In member function 'bool QWindowsAudioDeviceInfo::testSettings(const QAudioFormat&) const': qwindowsaudiodeviceinfo.cpp:220:50: warning: passing NULL to non-pointer argument 4 of 'MMRESULT waveOutOpen(LPHWAVEOUT, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null] WAVE_FORMAT_QUERY) == MMSYSERR_NOERROR); ^ qwindowsaudiodeviceinfo.cpp:220:50: warning: passing NULL to non-pointer argument 5 of 'MMRESULT waveOutOpen(LPHWAVEOUT, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null] qwindowsaudiodeviceinfo.cpp:223:50: warning: passing NULL to non-pointer argument 4 of 'MMRESULT waveInOpen(LPHWAVEIN, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null] WAVE_FORMAT_QUERY) == MMSYSERR_NOERROR); ^ qwindowsaudiodeviceinfo.cpp:223:50: warning: passing NULL to non-pointer argument 5 of 'MMRESULT waveInOpen(LPHWAVEIN, UINT, LPCWAVEFORMATEX, DWORD_PTR, DWORD_PTR, DWORD)' [-Wconversion-null]# ==[ Please wrap at 72 characters ]===================================| Change-Id: Ie8f65e0e1f4f1274a1b634f3701ae0103e716d97 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-07-06Blacklist failing part from tst_qsoundeffectJani Vähäkangas2-2/+5
Task-number: QTBUG-46689 Change-Id: I195d5cea8a588afcdefae5a91acb511fadbb839c Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
2015-06-30Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devLiang Qi30-84/+561
2015-06-30Blacklist cases from qaudiodecoderbackend and qmediaplayerbackendJani Vähäkangas4-2/+83
Change-Id: I73156f18f79afbdb26ba31462162dde9c1d0094b Task-number: QTBUG-46368 Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
2015-06-29Merge remote-tracking branch 'origin/5.5' into devLiang Qi30-84/+561
Conflicts: .qmake.conf Change-Id: Ib38fe1e0a4c937068741a9556748a18e35ba59af
2015-06-29Blacklist part of tst_qaudiodeviceinfoJani Vähäkangas2-1/+5
Task-number: QTBUG-46409 Change-Id: Iebfc6595b7be3fc29f1fca61fa71a706dbe64ebb Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
2015-06-29Bump versionOswald Buddenhagen1-1/+1
Change-Id: I0dbadc590809bed7a24a8721a3b4a42a207bcc7b
2015-06-26Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi22-44/+240
Change-Id: I5a5b387b93a4b9dbaa9710e78fd7bf1ca09aa3b3
2015-06-23winrt: Implement QImageEncoderControl for cameraPeng Wu7-15/+260
Implement QImageEncoderControl for camera still image capture. It provides the functions to set camera capture resolution and get supported resolutions list. Task-number: QTBUG-46456 Change-Id: Ideb1aa02d420be3a30d588bebf31714fa4fa6415 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2015-06-14QCameraViewFinderSettings: add missing includeMarc Mutz1-0/+1
The header should not depend on indirect includes. It uses QSize in inline functions, so include the header. Change-Id: I3a5fca458ded47c98b7f71749ad75660c6e049e9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-06-12QAbstractVideoFilter: make ctor explicitMarc Mutz1-1/+1
Change-Id: If091d751c7e164c0480b48301358833705cd4870 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-06-12QCameraViewFinderSettings: make op== transitiveMarc Mutz1-2/+2
Using qFuzzyCompare in operator== makes it impossible to create a consistent qHash() overload for the class later on (qFuzzyCompare is not transitive). It is unlikely that there will be numerical instability for frame rates. If there is, qFuzzyCompare should be overloaded for either this class or the FrameRateRange class. Change-Id: Id975ea410b373e2987da160504f7618a8c498b5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-06-12QCameraViewFinderSettings: declare sharedMarc Mutz1-0/+7
Requires implementing member-swap. Also implemented move assignment operator. Change-Id: I077ee85346a8c542cd344720e45a0795a6947e4c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-06-12QCameraViewFinderSettings: make op== non-memberMarc Mutz2-16/+22
...and inline op!=. Mark them as nothrow. More idiomatic C++ (symmetry between lhs and rhs). Change-Id: I65ecbef961383897e4e17325ad62d45e1772fbb0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-06-12QCameraViewFinderSettings: use correct includeMarc Mutz1-1/+2
Change-Id: I71f24922872f64d86d55f420b0e27028a6368097 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-06-11Added 5.5.0 change file.Yoann Lopes1-0/+118
Task-number: QTBUG-45455 Change-Id: I832dcd02215e6ae004b6f1e6cf3905b95a838e4a Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-06-11Define QCamera::FrameRateRange as a struct.Yoann Lopes4-12/+48
Instead of an alias for QPair<qreal, qreal>. Task-number: QTBUG-46563 Change-Id: I7e1ac68242810f7e5f7e161571a11f5de7850e29 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-06-10AVFoundation: don't use shared OpenGL contexts unless needed.Yoann Lopes1-11/+15
We were always using shared OpenGL contexts to render media player frames into an OpenGL texture. There's no need to do that when there already is a current context on the current thread. This happens in non-QtQuick cases, when the OpenGL thread is also the main thread. Change-Id: Icb97ed49609c764263007a43b6bb481e23768111 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-06-10Support BGR format for OpenGL textures in QPainterVideoSurface.Yoann Lopes1-4/+25
Also, use the correct shader for RGB formats, we should be using the one that does swizzling in that case. Change-Id: I77b6327501f833fb2f7b30411fbe853e975a59c7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-06-04WinRT: fix namespaced buildJoerg Bornemann13-13/+39
Change-Id: I06b18e2a1318bda826befde52ee1fd874e25dd47 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
2015-06-03Add an env var to disable OpenGL texture-based video frames.Laszlo Agocs1-0/+11
Right now we will always use GLTextureHandle frames with Quick. This is great in many cases, but not always. Applications that wish to examine the frames (e.g. via video filters) will sometimes prefer frames in system memory, even if this is slower to display. Add QT_QUICK_NO_TEXTURE_VIDEOFRAMES which can be used to disable texture-based video frames. [ChangeLog] The environment variable QT_QUICK_NO_TEXTURE_VIDEOFRAMES can now be used to disable OpenGL texture based video frames. This can be useful in applications that wish to filter and process the video frames and are not GPU based. Change-Id: I5ca6f6d485d5bc6c2da8d47db563cd910c238ac9 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-06-03Media asset writer - use the right macroTimur Pocheptsov1-10/+10
QT_PREPEND_NAMESPACE, not QT_MANGLE_NAMESPACE. Change-Id: I9eb4130b203a5fb8f9f7964a0a642686814d5990 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-06-03Merge remote-tracking branch 'origin/5.5' into devLiang Qi63-358/+1843
Change-Id: I7ac7db69c37cc9e5c5241a25b9a874986a23a886
2015-06-03winrt: fix camera preview on Lumia 530Peng Wu1-0/+1
Lumia 530 has the same QTBUG-44838 device bug that gives black frames when blitting to the target texture for image preview. Add it to workaround blacklist. Task-number: QTBUG-45920 Change-Id: Ia411793b90e487fa57b943ed7f01e370bfb84a1f Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
2015-06-02GStreamer: remove unnecessary qWarning().Yoann Lopes1-2/+0
Change-Id: Ibbf5d5b7e3675fe6fee30e7486e3bc7b59fa231d Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-06-02AVFoundation: fix a problem when changing the camera viewfinder size.Yoann Lopes1-1/+3
We need to restart the video surface when the frame size changes. Change-Id: I81af3cb40fb40f7d157174ac96d42213880fbacd Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
2015-06-02AVFoundation: fix wrong Q_ASSERT.Yoann Lopes1-1/+1
The assert was always triggered, at least on OSX. Change-Id: I9aabb6103b7f5540cff42facc448ffcf6a6de511 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
2015-06-01pulseaudio: Remove unused static member variableSergio Martins1-2/+0
Change-Id: I79f8ce318d4fb72ddbd9d4e5c030df01c36084fa Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-05-30Use QSet::intersects() instead of QSet::intersect()Sergio Martins1-2/+2
It's much faster. Change-Id: Iee42359147ebb76b5848f3ac2e17eb92214c8ab6 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2015-05-29Video asset writer for iOSTimur Pocheptsov11-10/+1199
AVFoundation on iOS lacks the ability to use AVCaptureVideoDataOutput and AVCaptureMovieFileOutput simultaneously. Right now viewfinder stops working as soon as we add movie file output. The only workaround we have now is to write video/audio 'maually' - creating asset writer and feeding it with audio/video samples. Change-Id: I33a63546783279c545f0433b5051287269825d3f Task-number: QTBUG-37655 Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
2015-05-29AVFoundation: fix default camera viewfinder pixel format.Yoann Lopes3-41/+33
It was hardcoded to ARGB32, which is not a good idea, at least on iOS where the necessary conversion is slow. We now pick the QAbstractVideoSurface's preferred format, or if no surface is set, we pick the default from AVFoundation. As a result, the QML VideoOutput will now always use the NV12 format. Change-Id: I65205c706455502883b8098f0b5c0577b4106e01 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 18:25:09 +0000