delta/qt5/qtmultimedia.git/src/plugins/directshow/player/directshowplayerservice.cpp, branch 5.9.0

DirectShow: Enable audio and video probes in DirectShow

2017-05-03T13:29:24+00:00

This change enables the video and audio probe functionality, so it can
be used with the media player.

[ChangeLog][DirectShow] Added support for audio and video probes in
the mediaplayer.

Task-number: QTBUG-56415
Change-Id: If6f36a693b1d22372eab130df07d435c9df5a796
Reviewed-by: Yoann Lopes

DirectShow: Fix namespaced build with MinGW

2017-04-26T10:32:06+00:00

Remove QT_USE_NAMESPACE from headers and enclose headers/sources in
QT_BEGIN/END_NAMESPACE. Fixes MinGW build error:

qtbase/src/corelib/global/qtypeinfo.h:246:7: error: specialization of 'template class tn::QTypeInfo' in different namespace [-fpermissive]
 class QTypeInfo \
       ^
qtbase/src/corelib/global/qtypeinfo.h:265:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO_BODY'
 Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS)
 ^
helpers\directshowmediatype.h:92:1: note: in expansion of macro 'Q_DECLARE_TYPEINFO'
 Q_DECLARE_TYPEINFO(DirectShowMediaType, Q_MOVABLE_TYPE);
 ^
qtbase/src/corelib/global/qtypeinfo.h:57:7: error:   from definition of 'template class tn::QTypeInfo' [-fpermissive]
 class QTypeInfo
       ^

Task-number: QTBUG-60118
Change-Id: Idfe7a49b50a0046a5cb17630a3ec99615ec6150a
Reviewed-by: Christian Stromme

Merge remote-tracking branch 'origin/5.8' into 5.9

2017-03-10T09:51:09+00:00

Conflicts:
	src/plugins/gstreamer/camerabin/camerabincontainer.h

Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051

DirectShow: Port to new configure system (evr, wmsdk)

2017-02-03T12:46:38+00:00

Replace old legacy defines by QT_CONFIG. Fixes warnings when using MinGW:
qtmultimedia/src/multimedia/qtmultimedia-config.h:4:0: warning: "QT_NO_WMSDK" redefined

Change-Id: Ifbfc2cea3bf5bfd06d94fd70e6ea4afb6d6fbb4b
Reviewed-by: Lars Knoll

DirectShow: Sanitize DirectShowMediaType

2017-01-27T13:27:15+00:00

The DirectShowMediaType is now a thin data wrapper around AM_MEDIA_TYPE
and will for the most look and work the same way, with the exception
that it cleans up after itself. All utility functions are now static,
except clear() which, for convenience, is also provided as a non-static
member function.

In addition to the changes mentioned above, duplicated methods were
removed, conversion for ARGB32 was added, and an attempt to make
the usage of AM_MEDIA_TYPE and DirectShowMediaType was made more
consistent.

Change-Id: Iad32fb8eeabd9d4183e9bd10426cac3963e5d99a
Reviewed-by: Yoann Lopes

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

2016-08-02T08:23:28+00:00

Conflicts:
	.qmake.conf
	tests/auto/integration/qsoundeffect/BLACKLIST

Change-Id: Icd2edd4410a4ee914d489634d26b262c0c146bf4

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

2016-08-01T09:52:05+00:00

Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8

DirectShow: fix deadlock in VideoSurfaceFilter

2016-07-05T13:57:19+00:00

When the DirectShow graph is done being built, there's no need to wake
up any blocking calls on the main thread since setting a source is done
asynchronously anyway.
This could cause synchronous operations (like stopping or changing the
video output) to end prematurely if called while a source was still
being loaded, in turn causing the deadlock.

Task-number: QTBUG-54504
Change-Id: I4f534e637bfca6d3020a3bc28725c8c7042941d5
Reviewed-by: Andreas Holzammer

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

2016-05-13T09:02:04+00:00

Change-Id: I773db005bbdc511169917ee35eb5b517e898926b

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

2016-05-10T17:26:21+00:00

Conflicts:
	src/plugins/winrt/qwinrtcameracontrol.cpp

Change-Id: I45d3042adf19577a72794610fa1c310cb22e26c4