qml: VideoOutput/VideoOutput2.source can be an AVPlayer object wang-b…

…in#935 use c player and qml renderer
DebugOfTheRoad · Aug 6, 2017 · 2110aa6 · 2110aa6
1 parent 206d89f
commit 2110aa6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/qml/QQuickItemRenderer.cpp b/qml/QQuickItemRenderer.cpp
@@ -156,7  156,16 @@ void QQuickItemRenderer::setSource(QObject *source)
     Q_EMIT sourceChanged();
     if (!source)
         return;
-    ((QmlAVPlayer*)source)->player()->addVideoRenderer(this);
     AVPlayer* p = qobject_cast<AVPlayer*>(source);
     if (!p) {
         QmlAVPlayer* qp = qobject_cast<QmlAVPlayer*>(source);
         if (!qp) {
             qWarning("source MUST be of type AVPlayer or QmlAVPlayer");
             return;
         }
         p = qp->player();
     }
     p->addVideoRenderer(this);
 }
 
 QQuickItemRenderer::FillMode QQuickItemRenderer::fillMode() const

diff --git a/qml/QmlAV/QQuickItemRenderer.h b/qml/QmlAV/QQuickItemRenderer.h
@@ -1,6  1,6 @@
 /******************************************************************************
     QtAV:  Multimedia framework based on Qt and FFmpeg
-    Copyright (C) 2012-2016 Wang Bin <[email protected]>
     Copyright (C) 2012-2017 Wang Bin <[email protected]>
     theoribeiro <[email protected]>
 
 *   This file is part of QtAV (from 2013)
@@ -60,6  60,10 @@ class QQuickItemRenderer : public QQuickItem, public VideoRenderer
     bool isSupported(VideoFormat::PixelFormat pixfmt) const Q_DECL_OVERRIDE;
 
     QObject *source() const;
     /*!
      * \brief setSource
      * \param source nullptr, an object of type AVPlayer or QmlAVPlayer
      */
     void setSource(QObject *source);
 
     FillMode fillMode() const;

diff --git a/qml/QmlAV/QuickFBORenderer.h b/qml/QmlAV/QuickFBORenderer.h
@@ -1,6  1,6 @@
 /******************************************************************************
     QtAV:  Multimedia framework based on Qt and FFmpeg
-    Copyright (C) 2012-2016 Wang Bin <[email protected]>
     Copyright (C) 2012-2017 Wang Bin <[email protected]>
 
 *   This file is part of QtAV (from 2015)
 
@@ -66,6  66,10 @@ class QuickFBORenderer : public QQuickFramebufferObject, public VideoRenderer
     OpenGLVideo* opengl() const Q_DECL_OVERRIDE;
 
     QObject *source() const;
     /*!
      * \brief setSource
      * \param source nullptr, an object of type AVPlayer or QmlAVPlayer
      */
     void setSource(QObject *source);
 
     FillMode fillMode() const;

diff --git a/qml/QuickFBORenderer.cpp b/qml/QuickFBORenderer.cpp
@@ -155,7  155,16 @@ void QuickFBORenderer::setSource(QObject *source)
     Q_EMIT sourceChanged();
     if (!source)
         return;
-    ((QmlAVPlayer*)source)->player()->addVideoRenderer(this);
     AVPlayer* p = qobject_cast<AVPlayer*>(source);
     if (!p) {
         QmlAVPlayer* qp = qobject_cast<QmlAVPlayer*>(source);
         if (!qp) {
             qWarning("source MUST be of type AVPlayer or QmlAVPlayer");
             return;
         }
         p = qp->player();
     }
     p->addVideoRenderer(this);
 }
 
 QuickFBORenderer::FillMode QuickFBORenderer::fillMode() const