1 files changed, 62 insertions, 0 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
index 9a9256868..c36fca67d 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
@@ -262,6 +262,12 @@ bool QDeclarativeVideoOutput::createBackend(QMediaService *service)
         m_backend->updateGeometry();
     }
 
+    if (m_backend) {
+        m_backend->clearFilters();
+        for (int i = 0; i < m_filters.count(); ++i)
+            m_backend->appendFilter(m_filters[i]);
+    }
+
     return backendAvailable;
 }
 
@@ -795,6 +801,12 @@ void QDeclarativeVideoOutput::itemChange(QQuickItem::ItemChange change,
         m_backend->itemChange(change, changeData);
 }
 
+void QDeclarativeVideoOutput::releaseResources()
+{
+    if (m_backend)
+        m_backend->releaseResources();
+}
+
 void QDeclarativeVideoOutput::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
 {
     Q_UNUSED(newGeometry);
@@ -809,4 +821,54 @@ void QDeclarativeVideoOutput::geometryChanged(const QRectF &newGeometry, const Q
     _q_updateGeometry();
 }
 
+/*!
+    \qmlproperty list<object> QtMultimedia::VideoOutput::filters
+
+    This property holds the list of video filters that are run on the video
+    frames. The order of the filters in the list matches the order in which
+    they will be invoked on the video frames. The objects in the list must be
+    instances of a subclass of QAbstractVideoFilter.
+
+    \sa QAbstractVideoFilter
+*/
+
+QQmlListProperty<QAbstractVideoFilter> QDeclarativeVideoOutput::filters()
+{
+    return QQmlListProperty<QAbstractVideoFilter>(this, 0, filter_append, filter_count, filter_at, filter_clear);
+}
+
+void QDeclarativeVideoOutput::filter_append(QQmlListProperty<QAbstractVideoFilter> *property, QAbstractVideoFilter *value)
+{
+    QDeclarativeVideoOutput *self = static_cast<QDeclarativeVideoOutput *>(property->object);
+    self->m_filters.append(value);
+    if (self->m_backend)
+        self->m_backend->appendFilter(value);
+}
+
+int QDeclarativeVideoOutput::filter_count(QQmlListProperty<QAbstractVideoFilter> *property)
+{
+    QDeclarativeVideoOutput *self = static_cast<QDeclarativeVideoOutput *>(property->object);
+    return self->m_filters.count();
+}
+
+QAbstractVideoFilter *QDeclarativeVideoOutput::filter_at(QQmlListProperty<QAbstractVideoFilter> *property, int index)
+{
+    QDeclarativeVideoOutput *self = static_cast<QDeclarativeVideoOutput *>(property->object);
+    return self->m_filters.at(index);
+}
+
+void QDeclarativeVideoOutput::filter_clear(QQmlListProperty<QAbstractVideoFilter> *property)
+{
+    QDeclarativeVideoOutput *self = static_cast<QDeclarativeVideoOutput *>(property->object);
+    self->m_filters.clear();
+    if (self->m_backend)
+        self->m_backend->clearFilters();
+}
+
+void QDeclarativeVideoOutput::_q_invalidateSceneGraph()
+{
+    if (m_backend)
+        m_backend->invalidateSceneGraph();
+}
+
 QT_END_NAMESPACE