From 677c6d3e58064e9d10472e5ca75380b31631d12a Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 3 Jan 2023 13:00:51 +0100 Subject: [PATCH] qtmultimedia fixes --- cmake/FindWMF.cmake | 10 +++++----- src/multimedia/configure.cmake | 3 +-- src/multimedia/windows/qwindowsmediadevices.cpp | 2 +- src/multimedia/windows/qwindowsresampler.cpp | 2 +- src/plugins/multimedia/darwin/qdarwinintegration.mm | 3 +-- src/plugins/multimedia/windows/common/mfmetadata_p.h | 2 +- .../windows/decoder/mfaudiodecodercontrol.cpp | 2 +- .../windows/mediacapture/qwindowsmediadevicereader_p.h | 4 ++-- .../windows/mediacapture/qwindowsmediaencoder.cpp | 2 +- .../multimedia/windows/player/mfplayercontrol_p.h | 2 +- .../multimedia/windows/player/mfplayersession.cpp | 2 +- src/plugins/multimedia/windows/player/mftvideo.cpp | 2 +- .../multimedia/windows/qwindowsvideodevices.cpp | 4 ++-- 13 files changed, 19 insertions(+), 21 deletions(-) diff --git a/cmake/FindWMF.cmake b/cmake/FindWMF.cmake index 2f4633c34..35a276cb4 100644 --- a/cmake/FindWMF.cmake +++ b/cmake/FindWMF.cmake @@ -25,11 +25,11 @@ find_library(WMF_UUID_LIBRARY uuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) find_library(WMF_MSDMO_LIBRARY msdmo HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) find_library(WMF_OLE32_LIBRARY ole32 HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) find_library(WMF_OLEAUT32_LIBRARY oleaut32 HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -find_library(WMF_MF_LIBRARY Mf HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -find_library(WMF_MFUUID_LIBRARY Mfuuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -find_library(WMF_MFPLAT_LIBRARY Mfplat HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -find_library(WMF_MFCORE_LIBRARY Mfcore HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -find_library(WMF_PROPSYS_LIBRARY Propsys HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_MF_LIBRARY mf HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_MFUUID_LIBRARY mfuuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_MFPLAT_LIBRARY mfplat HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_MFCORE_LIBRARY mfcore HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_PROPSYS_LIBRARY propsys HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) set(WMF_LIBRARIES ${WMF_STRMIIDS_LIBRARY} ${WMF_AMSTRMID_LIBRARY} ${WMF_DMOGUIDS_LIBRARY} ${WMF_UUID_LIBRARY} diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake index 609806507..40b1b9b36 100644 --- a/src/multimedia/configure.cmake +++ b/src/multimedia/configure.cmake @@ -24,7 +24,6 @@ qt_find_package(WrapPulseAudio PROVIDED_TARGETS WrapPulseAudio::WrapPulseAudio M qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB wmf) qt_find_package(EGL) -qt_find_package(FFmpeg OPTIONAL_COMPONENTS AVCODEC AVFORMAT AVUTIL AVDEVICE SWRESAMPLE SWSCALE PROVIDED_TARGETS FFmpeg::avcodec FFmpeg::avformat FFmpeg::avutil FFmpeg::avdevice FFmpeg::swresample FFmpeg::swscale MODULE_NAME multimedia QMAKE_LIB ffmpeg) qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VAAPI MODULE_NAME multimedia QMAKE_LIB vaapi) #### Tests @@ -76,7 +75,7 @@ qt_feature("ffmpeg" PRIVATE LABEL "FFmpeg" ENABLE INPUT_ffmpeg STREQUAL 'yes' DISABLE INPUT_ffmpeg STREQUAL 'no' - CONDITION FFmpeg_FOUND AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_pulseaudio) + CONDITION UNIX OR WIN32 ) qt_feature("alsa" PUBLIC PRIVATE LABEL "ALSA (experimental)" diff --git a/src/multimedia/windows/qwindowsmediadevices.cpp b/src/multimedia/windows/qwindowsmediadevices.cpp index fcad8bab7..110d84c82 100644 --- a/src/multimedia/windows/qwindowsmediadevices.cpp +++ b/src/multimedia/windows/qwindowsmediadevices.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/multimedia/windows/qwindowsresampler.cpp b/src/multimedia/windows/qwindowsresampler.cpp index 9e76c9159..f78628c91 100644 --- a/src/multimedia/windows/qwindowsresampler.cpp +++ b/src/multimedia/windows/qwindowsresampler.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/multimedia/darwin/qdarwinintegration.mm b/src/plugins/multimedia/darwin/qdarwinintegration.mm index 5e26fe5c4..3e82655b0 100644 --- a/src/plugins/multimedia/darwin/qdarwinintegration.mm +++ b/src/plugins/multimedia/darwin/qdarwinintegration.mm @@ -39,8 +39,7 @@ public: QDarwinIntegration::QDarwinIntegration() { #if defined(Q_OS_MACOS) && QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_11_0) - if (__builtin_available(macOS 11.0, *)) - VTRegisterSupplementalVideoDecoderIfAvailable(kCMVideoCodecType_VP9); + VTRegisterSupplementalVideoDecoderIfAvailable(kCMVideoCodecType_VP9); #endif m_videoDevices = new QAVFVideoDevices(this); } diff --git a/src/plugins/multimedia/windows/common/mfmetadata_p.h b/src/plugins/multimedia/windows/common/mfmetadata_p.h index 81a03b126..9ff196240 100644 --- a/src/plugins/multimedia/windows/common/mfmetadata_p.h +++ b/src/plugins/multimedia/windows/common/mfmetadata_p.h @@ -16,7 +16,7 @@ // #include -#include "Mfidl.h" +#include "mfidl.h" QT_USE_NAMESPACE diff --git a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp index a82b5ef30..49aa64b25 100644 --- a/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp +++ b/src/plugins/multimedia/windows/decoder/mfaudiodecodercontrol.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "Wmcodecdsp.h" +#include "wmcodecdsp.h" #include "mfaudiodecodercontrol_p.h" #include diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h index 0205eafe2..4699a463a 100644 --- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h +++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediadevicereader_p.h @@ -17,8 +17,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp index 4a031043d..1d901c036 100644 --- a/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp +++ b/src/plugins/multimedia/windows/mediacapture/qwindowsmediaencoder.cpp @@ -8,7 +8,7 @@ #include "mfmetadata_p.h" #include #include -#include +#include #include #include #include diff --git a/src/plugins/multimedia/windows/player/mfplayercontrol_p.h b/src/plugins/multimedia/windows/player/mfplayercontrol_p.h index ac60e8c29..78ff71439 100644 --- a/src/plugins/multimedia/windows/player/mfplayercontrol_p.h +++ b/src/plugins/multimedia/windows/player/mfplayercontrol_p.h @@ -15,7 +15,7 @@ // We mean it. // -#include "QUrl.h" +#include "qurl.h" #include "private/qplatformmediaplayer_p.h" #include diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp index 2084a168a..1aa25317f 100644 --- a/src/plugins/multimedia/windows/player/mfplayersession.cpp +++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include //#define DEBUG_MEDIAFOUNDATION diff --git a/src/plugins/multimedia/windows/player/mftvideo.cpp b/src/plugins/multimedia/windows/player/mftvideo.cpp index a2ef1db0b..4cb5d2c9d 100644 --- a/src/plugins/multimedia/windows/player/mftvideo.cpp +++ b/src/plugins/multimedia/windows/player/mftvideo.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/plugins/multimedia/windows/qwindowsvideodevices.cpp b/src/plugins/multimedia/windows/qwindowsvideodevices.cpp index 878c4730b..41ccb4733 100644 --- a/src/plugins/multimedia/windows/qwindowsvideodevices.cpp +++ b/src/plugins/multimedia/windows/qwindowsvideodevices.cpp @@ -8,11 +8,11 @@ #include #include -#include +#include #include #include -#include +#include QT_BEGIN_NAMESPACE -- 2.39.0