Remove the fieldType property of QVideoFrame

It's never set to anything else than ProgressiveFrame
anyway (aka it's unused/unsupported).

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

1 files changed, 0 insertions, 47 deletions

diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp
index 56efe1208..6adbbdeb1 100644
--- a/src/multimedia/video/qvideoframe.cpp
+++ b/src/multimedia/video/qvideoframe.cpp
@@ -56,7 +56,6 @@ QT_BEGIN_NAMESPACE
 static void qRegisterVideoFrameMetaTypes()
 {
     qRegisterMetaType<QVideoFrame>();
-    qRegisterMetaType<QVideoFrame::FieldType>();
     qRegisterMetaType<QVideoFrame::PixelFormat>();
 }
 
@@ -94,7 +93,6 @@ public:
     int mappedBytes = 0;
     int planeCount = 0;
     QVideoFrame::PixelFormat pixelFormat = QVideoFrame::Format_Invalid;
-    QVideoFrame::FieldType fieldType = QVideoFrame::ProgressiveFrame;
     QAbstractVideoBuffer *buffer = nullptr;
     int mappedCount = 0;
     QMutex mapMutex;
@@ -280,17 +278,6 @@ private:
 */
 
 /*!
-    \enum QVideoFrame::FieldType
-
-    Specifies the field an interlaced video frame belongs to.
-
-    \value ProgressiveFrame The frame is not interlaced.
-    \value TopField The frame contains a top field.
-    \value BottomField The frame contains a bottom field.
-    \value InterlacedFrame The frame contains a merged top and bottom field.
-*/
-
-/*!
     Constructs a null video frame.
 */
 QVideoFrame::QVideoFrame()
@@ -454,24 +441,6 @@ int QVideoFrame::height() const
 }
 
 /*!
-    Returns the field an interlaced video frame belongs to.
-
-    If the video is not interlaced this will return WholeFrame.
-*/
-QVideoFrame::FieldType QVideoFrame::fieldType() const
-{
-    return d->fieldType;
-}
-
-/*!
-    Sets the \a field an interlaced video frame belongs to.
-*/
-void QVideoFrame::setFieldType(QVideoFrame::FieldType field)
-{
-    d->fieldType = field;
-}
-
-/*!
     Identifies if a video frame's contents are currently mapped to system memory.
 
     This is a convenience function which checks that the \l {QAbstractVideoBuffer::MapMode}{MapMode}
@@ -1220,22 +1189,6 @@ QDebug operator<<(QDebug dbg, QVideoFrame::PixelFormat pf)
     }
 }
 
-QDebug operator<<(QDebug dbg, QVideoFrame::FieldType f)
-{
-    QDebugStateSaver saver(dbg);
-    dbg.nospace();
-    switch (f) {
-        case QVideoFrame::TopField:
-            return dbg << "TopField";
-        case QVideoFrame::BottomField:
-            return dbg << "BottomField";
-        case QVideoFrame::InterlacedFrame:
-            return dbg << "InterlacedFrame";
-        default:
-            return dbg << "ProgressiveFrame";
-    }
-}
-
 static QString qFormatTimeStamps(qint64 start, qint64 end)
 {
     // Early out for invalid.