diff options
| author | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-10-03 14:49:19 +0200 |
|---|---|---|
| committer | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-10-06 09:43:49 +0200 |
| commit | 9dd61fb5f5912444374450278d44e5b320e880c4 (patch) | |
| tree | 33e9a3abec561efc8bb247ed29a35867ab9745d6 | |
| parent | d1e9954322d69616a7f5e12f62f0ea4a2e2f305a (diff) | |
| download | qtmultimedia-9dd61fb5f5912444374450278d44e5b320e880c4.tar.gz | |
Add missing errorString function from dev
Change-Id: I3c6793afa64ad3fe5f9ed16e410b5b907492a85c
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
| -rw-r--r-- | src/multimedia/windows/qwindowsmultimediautils.cpp | 8 | ||||
| -rw-r--r-- | src/multimedia/windows/qwindowsmultimediautils_p.h | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/multimedia/windows/qwindowsmultimediautils.cpp b/src/multimedia/windows/qwindowsmultimediautils.cpp index 205e6d4b1..50e0cf917 100644 --- a/src/multimedia/windows/qwindowsmultimediautils.cpp +++ b/src/multimedia/windows/qwindowsmultimediautils.cpp @@ -13,6 +13,7 @@ #include <mfapi.h> #include <mfidl.h> #include <qwindowsmfdefs_p.h> +#include <system_error> QT_BEGIN_NAMESPACE @@ -201,4 +202,11 @@ GUID QWindowsMultimediaUtils::containerForAudioFileFormat(QMediaFormat::FileForm } } +QString QWindowsMultimediaUtils::errorString(HRESULT hr) +{ + return QStringLiteral("%1 %2") + .arg(quint32(hr), 8, 16) + .arg(QString::fromStdString(std::system_category().message(hr))); +} + QT_END_NAMESPACE diff --git a/src/multimedia/windows/qwindowsmultimediautils_p.h b/src/multimedia/windows/qwindowsmultimediautils_p.h index eba614075..58ecd425f 100644 --- a/src/multimedia/windows/qwindowsmultimediautils_p.h +++ b/src/multimedia/windows/qwindowsmultimediautils_p.h @@ -19,6 +19,7 @@ #include <private/qplatformmediaformatinfo_p.h> #include <qvideoframeformat.h> #include <guiddef.h> +#include <qstring.h> QT_BEGIN_NAMESPACE @@ -37,6 +38,8 @@ namespace QWindowsMultimediaUtils { Q_MULTIMEDIA_EXPORT GUID containerForVideoFileFormat(QMediaFormat::FileFormat format); Q_MULTIMEDIA_EXPORT GUID containerForAudioFileFormat(QMediaFormat::FileFormat format); + + Q_MULTIMEDIA_EXPORT QString errorString(HRESULT hr); } QT_END_NAMESPACE |