From 3df89f0e7d218577e66dbb7cc489ee4b0eb8c72b Mon Sep 17 00:00:00 2001 From: Doris Verria Date: Fri, 14 May 2021 14:32:44 +0200 Subject: Fix test failures for tst_qmediaplayerbackend on macOS Change-Id: Icbd402e06941316c240e09bc409cafd68e14b459 Reviewed-by: Lars Knoll --- src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/multimedia') diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm index f701bdf50..9aa3354f5 100644 --- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm +++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm @@ -827,7 +827,7 @@ void AVFMediaPlayer::play() if (m_state == QMediaPlayer::PlayingState) return; - if (m_videoOutput) + if (m_videoOutput && m_videoSink) m_videoOutput->setLayer([static_cast(m_observer) playerLayer]); // Reset media status if the current status is EndOfMedia @@ -859,7 +859,7 @@ void AVFMediaPlayer::pause() m_state = QMediaPlayer::PausedState; - if (m_videoOutput) + if (m_videoOutput && m_videoSink) m_videoOutput->setLayer([static_cast(m_observer) playerLayer]); [[static_cast(m_observer) player] pause]; @@ -1170,6 +1170,8 @@ void AVFMediaPlayer::resetStream(QIODevice *stream) void AVFMediaPlayer::nativeSizeChanged(QSize size) { + if (!m_videoSink) + return; qDebug() << "presentation size" << size; m_videoSink->setNativeSize(size); } -- cgit v1.2.3