Get rid of the AVFVideoOutput interface

We don't need it anymore.

Change-Id: I5d7cdf8bf0840f38da0c5a9e97fe061f21d00cf1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

7 files changed, 7 insertions, 124 deletions

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index ab994c15c..02fc77b91 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -354,7 +354,6 @@ qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS
         platform/darwin/audio/qcoreaudioutils.mm platform/darwin/audio/qcoreaudioutils_p.h
         platform/darwin/mediaplayer/avfmediaplayer.mm platform/darwin/mediaplayer/avfmediaplayer_p.h
         platform/darwin/mediaplayer/avfmetadata.mm platform/darwin/mediaplayer/avfmetadata_p.h
-        platform/darwin/mediaplayer/avfvideooutput.mm platform/darwin/mediaplayer/avfvideooutput_p.h
         platform/darwin/avfvideosink.mm platform/darwin/avfvideosink_p.h
         platform/darwin/qdarwindevicemanager.mm platform/darwin/qdarwindevicemanager_p.h
         platform/darwin/qdarwinformatsinfo.mm platform/darwin/qdarwinformatsinfo_p.h
diff --git a/src/multimedia/platform/darwin/avfvideosink_p.h b/src/multimedia/platform/darwin/avfvideosink_p.h
index e763bd2c9..159c519d7 100644
--- a/src/multimedia/platform/darwin/avfvideosink_p.h
+++ b/src/multimedia/platform/darwin/avfvideosink_p.h
@@ -53,6 +53,7 @@
 
 #include "private/qplatformvideosink_p.h"
 
+Q_FORWARD_DECLARE_OBJC_CLASS(CALayer);
 Q_FORWARD_DECLARE_OBJC_CLASS(AVPlayerLayer);
 Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureVideoPreviewLayer);
 #if defined(Q_OS_OSX)
@@ -63,12 +64,9 @@ Q_FORWARD_DECLARE_OBJC_CLASS(UIView);
 typedef UIView NativeView;
 #endif
 
-
-#include <private/avfvideooutput_p.h>
-
 QT_BEGIN_NAMESPACE
 
-class AVFVideoSink : public QPlatformVideoSink, public AVFVideoOutput
+class AVFVideoSink : public QPlatformVideoSink
 {
     Q_OBJECT
 
@@ -105,8 +103,7 @@ public:
     int saturation() const override;
     void setSaturation(int saturation) override;
 
-    // AVFVideoOutput interface
-    void setLayer(CALayer *playerLayer) override;
+    void setLayer(CALayer *playerLayer);
 
 private:
     void updateAspectRatio();
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm
index e36b4a4db..b00a970f0 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm
@@ -41,7 +41,6 @@
 #include "avfmediaplayer_p.h"
 #include "avfvideorenderercontrol_p.h"
 #include <private/avfvideosink_p.h>
-#include "avfvideooutput_p.h"
 #include "avfmetadata_p.h"
 
 #include <qpointer.h>
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
index b1a46c766..c2cc928a3 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
@@ -67,7 +67,6 @@ Q_FORWARD_DECLARE_OBJC_CLASS(AVFMediaPlayerObserver);
 QT_BEGIN_NAMESPACE
 
 class AVFMediaPlayer;
-class AVFVideoOutput;
 class AVFVideoRendererControl;
 class AVFVideoSink;
 
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfvideooutput.mm b/src/multimedia/platform/darwin/mediaplayer/avfvideooutput.mm
deleted file mode 100644
index ef12f07c1..000000000
--- a/src/multimedia/platform/darwin/mediaplayer/avfvideooutput.mm
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd and/or its subsidiary(-ies).
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $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 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 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.
-**
-** 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$
-**
-****************************************************************************/
-
-#include "avfvideooutput_p.h"
-
-QT_USE_NAMESPACE
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfvideooutput_p.h b/src/multimedia/platform/darwin/mediaplayer/avfvideooutput_p.h
deleted file mode 100644
index ad536b2f1..000000000
--- a/src/multimedia/platform/darwin/mediaplayer/avfvideooutput_p.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Toolkit.
-**
-** $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 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 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.
-**
-** 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$
-**
-****************************************************************************/
-
-#ifndef AVFVIDEOOUTPUT_H
-#define AVFVIDEOOUTPUT_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qobject.h>
-
-Q_FORWARD_DECLARE_OBJC_CLASS(CALayer);
-
-QT_BEGIN_NAMESPACE
-
-class AVFVideoOutput
-{
-public:
-    virtual ~AVFVideoOutput() {}
-    virtual void setLayer(CALayer *playerLayer) = 0;
-};
-
-QT_END_NAMESPACE
-
-#endif // AVFVIDEOOUTPUT_H
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol_p.h b/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol_p.h
index a188e4db1..3343fd8cd 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfvideorenderercontrol_p.h
@@ -55,9 +55,9 @@
 #include <QtCore/QMutex>
 #include <QtCore/QSize>
 
-#include "avfvideooutput_p.h"
+#include <CoreVideo/CVBase.h>
 
-#import <CoreVideo/CVBase.h>
+Q_FORWARD_DECLARE_OBJC_CLASS(CALayer);
 
 QT_BEGIN_NAMESPACE
 
@@ -65,7 +65,7 @@ class AVFDisplayLink;
 class AVFVideoFrameRenderer;
 class QAbstractVideoSurface;
 
-class AVFVideoRendererControl : public QObject, public AVFVideoOutput
+class AVFVideoRendererControl : public QObject
 {
     Q_OBJECT
 public:
@@ -75,7 +75,7 @@ public:
     QAbstractVideoSurface *surface() const;
     void setSurface(QAbstractVideoSurface *surface);
 
-    void setLayer(CALayer *playerLayer) override;
+    void setLayer(CALayer *playerLayer);
 
 private Q_SLOTS:
     void updateVideoFrame(const CVTimeStamp &ts);