summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/player/directshowplayerservice.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/directshow/player/directshowplayerservice.cpp')
-rw-r--r--src/plugins/directshow/player/directshowplayerservice.cpp73
1 files changed, 46 insertions, 27 deletions
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index f7510316a..ccc25d30b 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -1,31 +1,37 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
@@ -67,8 +73,22 @@
#include <QtCore/qthread.h>
#include <QtCore/qvarlengtharray.h>
+#ifndef Q_CC_MINGW
+# include <comdef.h>
+#endif
+
Q_GLOBAL_STATIC(DirectShowEventLoop, qt_directShowEventLoop)
+static QString comError(HRESULT hr)
+{
+#ifndef Q_CC_MINGW // MinGW 5.3 no longer has swprintf_s().
+ _com_error error(hr);
+ return QString::fromWCharArray(error.ErrorMessage());
+#else
+ Q_UNUSED(hr)
+ return QString();
+#endif
+}
// QMediaPlayer uses millisecond time units, direct show uses 100 nanosecond units.
static const int qt_directShowTimeScale = 10000;
@@ -365,17 +385,11 @@ void DirectShowPlayerService::doSetUrlSource(QMutexLocker *locker)
m_error = QMediaPlayer::FormatError;
m_errorString = QString();
break;
- case E_FAIL:
- case E_OUTOFMEMORY:
- case VFW_E_CANNOT_LOAD_SOURCE_FILTER:
- case VFW_E_NOT_FOUND:
- m_error = QMediaPlayer::ResourceError;
- m_errorString = QString();
- break;
default:
m_error = QMediaPlayer::ResourceError;
m_errorString = QString();
- qWarning("DirectShowPlayerService::doSetUrlSource: Unresolved error code %x", uint(hr));
+ qWarning("DirectShowPlayerService::doSetUrlSource: Unresolved error code 0x%x (%s)",
+ uint(hr), qPrintable(comError(hr)));
break;
}
@@ -389,7 +403,8 @@ void DirectShowPlayerService::doSetStreamSource(QMutexLocker *locker)
DirectShowIOSource *source = new DirectShowIOSource(m_loop);
source->setDevice(m_stream);
- if (SUCCEEDED(m_graph->AddFilter(source, L"Source"))) {
+ const HRESULT hr = m_graph->AddFilter(source, L"Source");
+ if (SUCCEEDED(hr)) {
m_executedTasks = SetSource;
m_pendingTasks |= Render;
@@ -410,6 +425,8 @@ void DirectShowPlayerService::doSetStreamSource(QMutexLocker *locker)
m_error = QMediaPlayer::ResourceError;
m_errorString = QString();
+ qWarning("DirectShowPlayerService::doPlay: Unresolved error code 0x%x (%s)",
+ uint(hr), qPrintable(comError(hr)));
QCoreApplication::postEvent(this, new QEvent(QEvent::Type(Error)));
}
@@ -525,8 +542,8 @@ void DirectShowPlayerService::doRender(QMutexLocker *locker)
default:
m_error = QMediaPlayer::ResourceError;
m_errorString = QString();
- qWarning("DirectShowPlayerService::doRender: Unresolved error code %x",
- uint(renderHr));
+ qWarning("DirectShowPlayerService::doRender: Unresolved error code 0x%x (%s)",
+ uint(renderHr), qPrintable(comError(renderHr)));
}
}
@@ -735,7 +752,8 @@ void DirectShowPlayerService::doPlay(QMutexLocker *locker)
} else {
m_error = QMediaPlayer::ResourceError;
m_errorString = QString();
- qWarning("DirectShowPlayerService::doPlay: Unresolved error code %x", uint(hr));
+ qWarning("DirectShowPlayerService::doPlay: Unresolved error code 0x%x (%s)",
+ uint(hr), qPrintable(comError(hr)));
QCoreApplication::postEvent(this, new QEvent(QEvent::Type(Error)));
}
@@ -794,7 +812,8 @@ void DirectShowPlayerService::doPause(QMutexLocker *locker)
} else {
m_error = QMediaPlayer::ResourceError;
m_errorString = QString();
- qWarning("DirectShowPlayerService::doPause: Unresolved error code %x", uint(hr));
+ qWarning("DirectShowPlayerService::doPause: Unresolved error code 0x%x (%s)",
+ uint(hr), qPrintable(comError(hr)));
QCoreApplication::postEvent(this, new QEvent(QEvent::Type(Error)));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 18:52:00 +0000