diff options
| author | André de la Rocha <andre.rocha@qt.io> | 2022-05-19 23:05:12 +0200 |
|---|---|---|
| committer | André de la Rocha <andre.rocha@qt.io> | 2022-05-24 12:05:53 +0200 |
| commit | 196ea281d1843cfe62541001619a8517506af773 (patch) | |
| tree | 9eba854776ee91b3fb593b01cd9b60693221a54e | |
| parent | 8131af7dea6f0e4f55fb6af1457b64dde567c69a (diff) | |
Windows: Fix RTSP stream playback
Avoids changing the player topology for remote streams. Also improves
handling of error conditions related to network streaming.
Pick-to: 6.3 6.2
Task-number: QTBUG-103567
Change-Id: I358389ed22397c3b15e5971a042e43dc369127f4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/multimedia/windows/qwindowsmfdefs_p.h | 1 | ||||
| -rw-r--r-- | src/plugins/multimedia/windows/player/mfplayersession.cpp | 31 |
2 files changed, 29 insertions, 3 deletions
diff --git a/src/multimedia/windows/qwindowsmfdefs_p.h b/src/multimedia/windows/qwindowsmfdefs_p.h index 5bae90d18..ecd8fbb70 100644 --- a/src/multimedia/windows/qwindowsmfdefs_p.h +++ b/src/multimedia/windows/qwindowsmfdefs_p.h @@ -83,6 +83,7 @@ extern "C" HRESULT WINAPI MFCreateDeviceSource(IMFAttributes *pAttributes, IMFMe #define QMM_MFSESSION_GETFULLTOPOLOGY_CURRENT 1 #define QMM_PRESENTATION_CURRENT_POSITION 0x7fffffffffffffff +#define QMM_WININET_E_CANNOT_CONNECT ((HRESULT)0x80072EFDL) #ifndef __IMFVideoProcessor_INTERFACE_DEFINED__ #define __IMFVideoProcessor_INTERFACE_DEFINED__ diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp index be99399ed..2785763fd 100644 --- a/src/plugins/multimedia/windows/player/mfplayersession.cpp +++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp @@ -60,6 +60,7 @@ #include "mfplayersession_p.h" #include <mferror.h> #include <nserror.h> +#include <winerror.h> #include "sourceresolver_p.h" #include "samplegrabber_p.h" #include "mftvideo_p.h" @@ -216,7 +217,8 @@ void MFPlayerSession::load(const QUrl &url, QIODevice *stream) } else if (createSession()) { changeStatus(QMediaPlayer::LoadingMedia); m_sourceResolver->load(url, stream); - m_updateRoutingOnStart = true; + if (url.isLocalFile()) + m_updateRoutingOnStart = true; } positionChanged(position()); } @@ -240,7 +242,13 @@ void MFPlayerSession::handleSourceError(long hr) errorCode = QMediaPlayer::FormatError; errorString = tr("Unsupported media type."); break; + case QMM_WININET_E_CANNOT_CONNECT: + errorCode = QMediaPlayer::NetworkError; + errorString = tr("A connection with the server could not be established."); + break; default: + qWarning() << "handleSourceError:" + << Qt::showbase << Qt::hex << Qt::uppercasedigits << static_cast<quint32>(hr); errorString = tr("Failed to load source."); break; } @@ -1636,8 +1644,25 @@ void MFPlayerSession::handleSessionEvent(IMFMediaEvent *sessionEvent) break; } changeStatus(QMediaPlayer::InvalidMedia); - qWarning() << "handleSessionEvent: serious error = " << hrStatus; - emit error(QMediaPlayer::ResourceError, tr("Media session serious error."), true); + qWarning() << "handleSessionEvent: serious error = " + << Qt::showbase << Qt::hex << Qt::uppercasedigits << static_cast<quint32>(hrStatus); + switch (hrStatus) { + case MF_E_NET_READ: + emit error(QMediaPlayer::NetworkError, tr("Error reading from the network."), true); + break; + case MF_E_NET_WRITE: + emit error(QMediaPlayer::NetworkError, tr("Error writing to the network."), true); + break; + case NS_E_FIREWALL: + emit error(QMediaPlayer::NetworkError, tr("Network packets might be blocked by a firewall."), true); + break; + case MF_E_MEDIAPROC_WRONGSTATE: + emit error(QMediaPlayer::ResourceError, tr("Media session state error."), true); + break; + default: + emit error(QMediaPlayer::ResourceError, tr("Media session serious error."), true); + break; + } break; case MESessionRateChanged: // If the rate change succeeded, we've already got the rate |