spec fix: version check error

RPM spec does not allow "<", ">" for strings although it does not generate
build errors for that. Only the rpmbuild's runtime (buildtime) behavior
is affected in "undefined" way.

Change-Id: I2182b285b4ccd638da513fb11b3abbd437bdc77a
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

Bump package version to 5.5.90+alpha1

Change-Id: I66afa3f3bfd46714f7f9f3e5da9fa12bb95d41f7

Bump package version to 5.4.1

Change-Id: I52ecf19b287a72f9deecc9d90557b4a31d2f6bdf
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Simplified spec file.

Now gstreamer version depends on Tizen version not on profile name.

Change-Id: I05294b06072ce36f5e3fecf78e4912a0ca37d7e9
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.4.0

Change-Id: Ia8bb503cbdd3a568068e2bc184130b635a984d96
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

packaging: using gst-1.x on tizen-3+

Change-Id: I1a8377e918081451071e17d3b54e65593e94e0d1
Bug-Tizen: TC-2147/related
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

Updated to Qt 5.3.99+beta1

Change-Id: I6c08fc5fd65da363f328e7dba10a6284913a7d9e
Bug-Tizen: TC-1008
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Added .gbs.conf file to follow upstream tags format

Change-Id: I2f037bc7e59d5a4062c0cae0eb098d0ae546a24b
Bug-Tizen: TC-1008
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Changed source package name in prep step to allow incremental builds.

Change-Id: Id1548ee24d700fab972be56bcfb10dba36060f76
Bug-Tizen: TC-1008
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.3.1

Change-Id: I2caa6344cc4fde0e8c2916850399b7a5b46c451d
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

packaging: Added wearable adaptation

Change-Id: I11d96363cd41a502b38ae84188aec2541b92493f
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.3.0

Change-Id: I082f9269ae9bf09472166b6bec8071843ba38e9a
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.2.96+rc2

Change-Id: I95a4c76cc9e65444950e958efd7a32f536b699b0
Bug-Tizen: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.2.95+rc1

Change-Id: Id560456a2d8c6404367335c524d0731b216ba20f
Bug-Tizen:TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Added handling of gstreamer0.10.

Removed currently not handled camera plugins.

Bug-Tizen:TIVI-2416

Change-Id: Ic20cd13cbc1ccc12636feddd5fdb7550bc57855c
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Added manifest file according to smack 3-domain model.

Bug-Tizen:TIVI-2416

Change-Id: If79d45c79ea14e96449c61d1faf9f5ab3ce6bc88
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Changes qtmultimedia.spec to qt5-qtmultimedia.spec.

For consistency with other qt packages.
Bug-Tizen:TIVI-2416

Change-Id: Icfe43ddc9e7be86aedf549a0dc3e6f278c4ee18f
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

spec: use gstreamer 1.+ on Tizen Common

Change-Id: I59f4df58dd380408310e760046de33d7f45840dd
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>

spec: use gstreamer 1.+ on Tizen 3.0 Mobile

Bug-Tizen:TIVI-2416

Change-Id: I0917044639dd4c72a53df8ed7c21aa23a65e559e
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Bump package version to 5.2.90+alpha

Bug-Tizen:TIVI-2416

Change-Id: I32785ac31eae1a09a2362b97aea050ee89140568
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

spec: Explicitly add all content of cmake and qml/QtMultimedia.

Bug-Tizen: TIVI-2416

Change-Id: I6c1e914a3779096151646d7111ea35c75339da30
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Exclude QtMultimedia from generic profile.

Generic lacks gstreamer-0.10 framework.

Bug-Tizen: TIVI-2416

Change-Id: I3c9271460328d7d8fdfbdefc0666c2e4c8a77518
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Added QtMultimedia spec

Change-Id: Ie4db10c015c8a15387b4acfc4c152dc972b55b04
Tizen-Bug: TIVI-2416
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>

Add 'resourcepolicy' to MODULE_PLUGIN_TYPES of multimedia.pro.

Fix warning:
WARNING: Project ERROR: No module claims plugin type resourcepolicy
discovered when running lupdate to create the translations.

Change-Id: I9fdde3e86219164cabbfe10672899eb2984f06d2
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>

Fix MediaPlayer::playlist documentation.

Added missing '\since 5.6' tag.

Change-Id: I46e0ea8bad85fb1f51f5502766c13549c6dad9d5
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Fix QCamera::lockStatus() documentation.

Change-Id: I1f7c063ef1e465ba658f637754b10b7af44b8373
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
src/imports/multimedia/qdeclarativeaudio.cpp

Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13

Android: minor refactor of the camera frame callback.

Change-Id: I6b281c9b2d02cf223e66e04e31fdd0268aa277fc
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Android: fix video probes when recording the camera.

The preview frame callback is cleared by the Android Camera whenever a
MediaRecorder is set up. We need to reset the callback after starting
the media recorder.

Change-Id: I604320b11eb3a7f6f8d7d3167d5aae371999be14
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Fix 2 more tr()-contexts of messages in QPlaylistFileParserPrivate.

Use QPlaylistFileParser instead of QObject.

Change-Id: I5dd4b56f7f580ca4089db67bbfabdd58ef7e2778
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

QMediaPlayer: clear current playlist on deletion.

Makes sure the current playlist is unbound when QMediaPlayer is
destroyed.

Change-Id: If25efa67bf79af0326f6125d9615165a2c7dd6bb
Reviewed-by: Jim Hodapp <jim.hodapp@canonical.com>
Reviewed-by: Loïc Molinari <loic.molinari@canonical.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Fix tr()-context of messages in QPlaylistFileParserPrivate.

Use QPlaylistFileParser instead of QObject.

Change-Id: I83f6b0384fc60b356a8ae8b316d2aaa768e7ac4d
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Make QWinRTImageEncoderControl a Q_OBJECT.

Fix lupdate warning:

qtmultimedia/src/plugins/winrt/qwinrtimageencodercontrol.cpp:60: Class 'QWinRTImageEncoderControl' lacks Q_OBJECT macro

when parsing the tr() in
QWinRTImageEncoderControl::imageCodecDescription().

Change-Id: I004c05c8cea620e30bff7a2b35b83eed01b7ed4c
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>

GStreamer: refactored widget and window control.

Instead of always using xvimagesink as GStreamer backend for the
widget and window control (works only with X11), we now try to
pick a video sink that fits the current configuration.
It first tries a set of known video sinks that can work with
the Qt platform plugin in use. If none is available, it
dynamically picks a video sink available on the system that can be
used with our backend.

Even if the video sink is now picked in a smarter way, xcb is still
the only supported platform plugin. The reason is that it's the
only Unix plugin which can provide a valid native window handle.
Additional work is needed to support other plugins like wayland
or directfb.

Change-Id: I3843dea363d6a0b85a6cc1f2952783b743e48ac6
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Fix QCamera viewfinder capabilities functions..

- Filtering the results for a specific pixel aspect ratio would return
  wrong values.
- Correctly sort the frame rate ranges returned by
  supportedViewfinderFrameRateRanges().

Added missing auto-tests for all viewfinder capabilities functions.

Change-Id: Idfb40d4139cc48a5996ce2ddd98131a2f5be76bb
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

winrt: Fix aspect ratio deviation between preview and encoding streams

The source texture size from camera was wrong due to a missing
IMediaDeviceController::SetMediaStreamPropertiesAsync call for the
preview media type. Therefore Viewfinder and StillImage capture modes
behave tha same from QCamera point of view. By default, the camera
takes the lowest capture resolution and the lowest preview
resolution with a matching aspect ratio. If the capture resolution
is set, the preview resolution is set to the lowest possible resolution
with a matching aspect ratio. Until viewfinder settings are implemented
for WinRT, there is no way for user to change the viewfinder resolution.

Change-Id: I4b76ceb46bd4c366561f5206d913b97c0d0df211
Task-Id: QTBUG-47465
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>

Avoid races when sending EOS

In order to avoid races when sending EOS, we need to make sure that the
pipeline is in playing state first.

Task-number: QTBUG-45707
Change-Id: I518e89badf38bea8ab8e2cead9a1ca09659af8b2
Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

GStreamer: added convenience function in QGstUtils.

-> qt_gst_element_get_factory_name(GstElement *elem)

Change-Id: Icf806488b49fbcdecdd605b6316bd1ef8796a883
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Add the GPLv3 license text

LGPLv3 refers to it but does not include it in its body.

Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

Fix camera plugin selection.

When requesting a camera plugin for a given device id, it should fall
back to any available plugin if that device id is not found.

Change-Id: I685294c7fdcaa72bce70178b0aae2ec92e79e107
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Remove obsolete check in QMediaService

The macro QT_NO_MEMBER_TEMPLATES was removed eons ago.

Change-Id: Ifc4f3ac8bcf1e9b42fad5dcfb101e3446a254abc
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Bind the playlist connected to a player.

Change-Id: I3c2e00773c88f671bdffcfe8c8175330ca405d4a
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Doc: Corrected a typo.

Change-Id: I53ab7ddf0a8c0416dce19bf2b642e7e294f3c868
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Fix documentation for QML metaData property.

For Audio, Video, MediaPlayer and Camera types.
Group the sub properties as a \qmlproperty group, which makes
the doc much clearer.

Change-Id: Id990d7b14a4c3f86768c6b3b4990845f84839944
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>

Fix qdoc warnings.

Change-Id: Ie351f33f88270186b7df0f9cd671fa4e31624231
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

Doc: update qml module version to 5.5.

And remove import statements from snippets.

Change-Id: I109beabd445186f96f0750b6f23fb623c125181e
Task-number: QTBUG-47620
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

Improve documentation for mediaObject property.

In Camera and MediaPlayer types.

Change-Id: Iaf17dc7e5f7075ce7eeefcf7992b970d1ea99e83
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>

Add audio role API to QMediaPlayer.

Change-Id: Ia5e3e2fe714f10b6aad62f0a4801c607905c7e0d
Task-number: QTBUG-41054
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Emit mediaAboutToBeRemoved() before mediaRemoved() in QMediaPlaylist.

When a new playlist's mediaObject is set, the content is cleared and the
mediaRemoved() signal is emitted without a former
mediaAboutToBeRemoved(). This is an issue for QAbstractItemModel
implementations, like the coming QDeclarativePlaylist, which call
beginInsertRow() and endInsertRows() in the respective signal handlers.

Change-Id: I7ec512ff2736e92858df94d9479741e05162e1f0
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

winrt: Add camera video probe controls

[ChangLog][multimedia][winrt] The WinRT backend now supports QVideoProbes
on camera objects.

Task-number: QTBUG-46228
Change-Id: I7850c5ec6f61e5824064d4be8afc8a0b55d05806
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>

winrt: Add camera focus and focus lock controls

[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>

Check and fix up bounds in QMediaPlaylist methods.

Change-Id: I665d665139dbe9663b20ecb08fa3dab9cbe3f899
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Blacklist failing test in tst_qsoundeffect on OpenSuse.

Change-Id: Iccf3e295fb79f043b2e64cb02528ac12e15a0ab6
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

Clean up QMediaPlayer documentation.

Change-Id: I2d744542270f283ccd8ba0160aeda7faa56b2b86
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Added new playlist QML type.

Change-Id: I0788cc9719f427457ad0be9c9a5bfda00451a0c4
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I957b44c06fca7a3f552edc18f286de043d31e42d

Add new property to QVideoSurfaceFormat.

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>

Fix warnings about unused private fields

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>

Don't list avfcamerainfocontrol header and sources twice

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>

GStreamer: use QMediaStorageLocation to generate capture file names.

Change-Id: I2111eb8e28f60ca6305a48a8ee9299bc14ab0df9
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

GStreamer: fix possible integer overflow in comparison.

Change-Id: I6cf4349f89320f72cce4d04cdf909476e583d11f
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

winrt: Fix crash during certain video operations

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>

Exclude failing tests on RHEL and Ubuntu

Change-Id: Ifbfb36f47da5f826c94777286fde27d5edd29d01
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

Extend test exclusion for this test on OS X

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>

Prospective fix for building QtMultimedia on Android against installed QtBase

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>

Fix video nodes material comparison.

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>

Unit test qaudiodecoder: Do not rely on qCompare(bool, int,...).

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>

Doc: replace Mac OS X with OS X

Task-number: QTBUG-40759
Change-Id: I11b3aa74d35064371cbbbeba660114e086b16aea
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

GStreamer: fix supported values returned by CameraBinImageProcessing.

Change-Id: I5a4db9c055495714943421742dd237b6abf7daee
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>

WindowsAudio: Fix compiler warnings by g++/MinGW.

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>

Blacklist failing part from tst_qsoundeffect

Task-number: QTBUG-46689
Change-Id: I195d5cea8a588afcdefae5a91acb511fadbb839c
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>

Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev

Blacklist cases from qaudiodecoderbackend and qmediaplayerbackend

Change-Id: I73156f18f79afbdb26ba31462162dde9c1d0094b
Task-number: QTBUG-46368
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>

Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
.qmake.conf

Change-Id: Ib38fe1e0a4c937068741a9556748a18e35ba59af

Blacklist part of tst_qaudiodeviceinfo

Task-number: QTBUG-46409
Change-Id: Iebfc6595b7be3fc29f1fca61fa71a706dbe64ebb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>

Bump version

Change-Id: I0dbadc590809bed7a24a8721a3b4a42a207bcc7b

Merge remote-tracking branch 'origin/5.5.0' into 5.5

Change-Id: I5a5b387b93a4b9dbaa9710e78fd7bf1ca09aa3b3

winrt: Implement QImageEncoderControl for camera

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>

QCameraViewFinderSettings: add missing include

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>

QAbstractVideoFilter: make ctor explicit

Change-Id: If091d751c7e164c0480b48301358833705cd4870
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

QCameraViewFinderSettings: make op== transitive

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>

QCameraViewFinderSettings: declare shared

Requires implementing member-swap.

Also implemented move assignment operator.

Change-Id: I077ee85346a8c542cd344720e45a0795a6947e4c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

QCameraViewFinderSettings: make op== non-member

...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>

QCameraViewFinderSettings: use correct include

Change-Id: I71f24922872f64d86d55f420b0e27028a6368097
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Added 5.5.0 change file.

Task-number: QTBUG-45455
Change-Id: I832dcd02215e6ae004b6f1e6cf3905b95a838e4a
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

Define QCamera::FrameRateRange as a struct.

Instead of an alias for QPair<qreal, qreal>.

Task-number: QTBUG-46563
Change-Id: I7e1ac68242810f7e5f7e161571a11f5de7850e29
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

AVFoundation: don't use shared OpenGL contexts unless needed.

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>

Support BGR format for OpenGL textures in QPainterVideoSurface.

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>

WinRT: fix namespaced build

Change-Id: I06b18e2a1318bda826befde52ee1fd874e25dd47
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>

Add an env var to disable OpenGL texture-based video frames.

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>

Media asset writer - use the right macro

QT_PREPEND_NAMESPACE, not QT_MANGLE_NAMESPACE.

Change-Id: I9eb4130b203a5fb8f9f7964a0a642686814d5990
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I7ac7db69c37cc9e5c5241a25b9a874986a23a886

winrt: fix camera preview on Lumia 530

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>

GStreamer: remove unnecessary qWarning().

Change-Id: Ibbf5d5b7e3675fe6fee30e7486e3bc7b59fa231d
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>

AVFoundation: fix a problem when changing the camera viewfinder size.

We need to restart the video surface when the frame size changes.

Change-Id: I81af3cb40fb40f7d157174ac96d42213880fbacd
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>

AVFoundation: fix wrong Q_ASSERT.

The assert was always triggered, at least on OSX.

Change-Id: I9aabb6103b7f5540cff42facc448ffcf6a6de511
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>

pulseaudio: Remove unused static member variable

Change-Id: I79f8ce318d4fb72ddbd9d4e5c030df01c36084fa
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

Use QSet::intersects() instead of QSet::intersect()

It's much faster.

Change-Id: Iee42359147ebb76b5848f3ac2e17eb92214c8ab6
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

Video asset writer for iOS

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>

AVFoundation: fix default camera viewfinder pixel format.

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>