From 07ee3c40c9320203fd851fd1a9ee412cca645f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20de=20la=20Rocha?= Date: Wed, 6 Oct 2021 02:45:14 +0200 Subject: Fix function declarations Adding missing QT_WIN_CALLBACK / QT_FASTCALL Change-Id: I5ba5a6341a988f162b9562c9fd328b9d90c6e1ab Reviewed-by: Lars Knoll (cherry picked from commit 3c7434025c5e14c2b3027a13ce90aab49712156c) Reviewed-by: Qt Cherry-pick Bot --- src/multimedia/platform/windows/qwindowsmediadevices.cpp | 2 +- src/multimedia/platform/windows/qwindowsmediadevices_p.h | 4 ++-- src/multimedia/video/qvideoframeconversionhelper_avx2.cpp | 6 +++--- src/multimedia/video/qvideoframeconversionhelper_sse2.cpp | 8 ++++---- src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/multimedia/platform/windows/qwindowsmediadevices.cpp b/src/multimedia/platform/windows/qwindowsmediadevices.cpp index 067c2bb2e..a5255692a 100644 --- a/src/multimedia/platform/windows/qwindowsmediadevices.cpp +++ b/src/multimedia/platform/windows/qwindowsmediadevices.cpp @@ -190,7 +190,7 @@ public: } }; -LRESULT deviceNotificationWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { if (message == WM_DEVICECHANGE) { auto b = (PDEV_BROADCAST_HDR)lParam; diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h index 29e214d79..0dc06a4ec 100644 --- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h +++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE class QWindowsEngine; class CMMNotificationClient; -LRESULT deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); +LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); class QWindowsMediaDevices : public QPlatformMediaDevices { @@ -88,7 +88,7 @@ private: HDEVNOTIFY m_videoDeviceNotification; friend CMMNotificationClient; - friend LRESULT deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); + friend LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); }; QT_END_NAMESPACE diff --git a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp index c17f8a6a4..cada96551 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp @@ -114,17 +114,17 @@ void QT_FASTCALL qt_convert_ARGB8888_to_ARGB32_avx2(const QVideoFrame &frame, uc convert_to_ARGB32_avx2<0, 1, 2, 3>(frame, output); } -void qt_convert_ABGR8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_avx2<0, 3, 2, 1>(frame, output); } -void qt_convert_RGBA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_avx2<3, 0, 1, 2>(frame, output); } -void qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_avx2<3, 2, 1, 0>(frame, output); } diff --git a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp index 8c0092eb1..68abf040f 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp @@ -96,22 +96,22 @@ void convert_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) } -void qt_convert_ARGB8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_ARGB8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_sse2<0, 1, 2, 3>(frame, output); } -void qt_convert_ABGR8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_sse2<0, 3, 2, 1>(frame, output); } -void qt_convert_RGBA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_sse2<3, 0, 1, 2>(frame, output); } -void qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_sse2<3, 2, 1, 0>(frame, output); } diff --git a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp index c1acb9b08..a5dfddaad 100644 --- a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp +++ b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp @@ -105,17 +105,17 @@ void QT_FASTCALL qt_convert_ARGB8888_to_ARGB32_ssse3(const QVideoFrame &frame, u convert_to_ARGB32_ssse3<0, 1, 2, 3>(frame, output); } -void qt_convert_ABGR8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_ssse3<0, 3, 2, 1>(frame, output); } -void qt_convert_RGBA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_ssse3<3, 0, 1, 2>(frame, output); } -void qt_convert_BGRA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) +void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) { convert_to_ARGB32_ssse3<3, 2, 1, 0>(frame, output); } -- cgit v1.2.1