summaryrefslogtreecommitdiff
path: root/src/multimedia
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-12-13 14:11:09 +0300
committerYoann Lopes <yoann.lopes@qt.io>2016-12-13 13:40:52 +0000
commitc6811366271a47c0de3e4bb92739773856388b3e (patch)
tree5426652c0db7cb78500cf09c6bf56b420734d013 /src/multimedia
parent0bae6b50dd1b654a218fe687ba6498f12e049337 (diff)
downloadqtmultimedia-c6811366271a47c0de3e4bb92739773856388b3e.tar.gz
GStreamer: Add missing override and remove redundant virtual
Change-Id: I61997676d7f002e769de499b19cbea3d96876480 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h10
-rw-r--r--src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h10
-rw-r--r--src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h4
-rw-r--r--src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h12
-rw-r--r--src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h6
-rw-r--r--src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h4
-rw-r--r--src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h10
-rw-r--r--src/multimedia/gsttools_headers/qgstreamervideowidget_p.h36
-rw-r--r--src/multimedia/gsttools_headers/qgstreamervideowindow_p.h44
-rw-r--r--src/multimedia/gsttools_headers/qgstvideobuffer_p.h10
-rw-r--r--src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h2
-rw-r--r--src/multimedia/gsttools_headers/qgstvideorenderersink_p.h14
12 files changed, 81 insertions, 81 deletions
diff --git a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h
index 768f9c30d..e03da1ab5 100644
--- a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h
+++ b/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h
@@ -96,11 +96,11 @@ public:
explicit QGstBufferPoolPlugin(QObject *parent = 0);
virtual ~QGstBufferPoolPlugin() {}
- virtual bool isFormatSupported(const QVideoSurfaceFormat &format) const = 0;
- virtual GstBuffer *takeBuffer(const QVideoSurfaceFormat &format, GstCaps *caps) = 0;
- virtual void clear() = 0;
+ bool isFormatSupported(const QVideoSurfaceFormat &format) const override = 0;
+ GstBuffer *takeBuffer(const QVideoSurfaceFormat &format, GstCaps *caps) override = 0;
+ void clear() override = 0;
- virtual QAbstractVideoBuffer::HandleType handleType() const = 0;
+ QAbstractVideoBuffer::HandleType handleType() const override = 0;
/*!
Build an QAbstractVideoBuffer instance from compatible GstBuffer.
@@ -108,7 +108,7 @@ public:
This method is called from gstreamer video sink thread.
*/
- virtual QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine) = 0;
+ QAbstractVideoBuffer *prepareVideoBuffer(GstBuffer *buffer, int bytesPerLine) override = 0;
};
QT_END_NAMESPACE
diff --git a/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h b/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h
index 9c5ce3052..1a961c6d9 100644
--- a/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h
+++ b/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h
@@ -63,13 +63,13 @@ public:
QGstreamerAudioInputSelector(QObject *parent);
~QGstreamerAudioInputSelector();
- QList<QString> availableInputs() const;
- QString inputDescription(const QString& name) const;
- QString defaultInput() const;
- QString activeInput() const;
+ QList<QString> availableInputs() const override;
+ QString inputDescription(const QString &name) const override;
+ QString defaultInput() const override;
+ QString activeInput() const override;
public Q_SLOTS:
- void setActiveInput(const QString& name);
+ void setActiveInput(const QString &name) override;
private:
void update();
diff --git a/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h b/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h
index d3062c5ad..bacf8c71d 100644
--- a/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h
+++ b/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h
@@ -72,8 +72,8 @@ public:
virtual ~QGstreamerAudioProbeControl();
protected:
- void probeCaps(GstCaps *caps);
- bool probeBuffer(GstBuffer *buffer);
+ void probeCaps(GstCaps *caps) override;
+ bool probeBuffer(GstBuffer *buffer) override;
private slots:
void bufferProbed();
diff --git a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h b/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h
index bc3d6703e..e1ac453c7 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h
+++ b/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h
@@ -67,19 +67,19 @@ public:
QGstreamerVideoInputDeviceControl(GstElementFactory *factory, QObject *parent);
~QGstreamerVideoInputDeviceControl();
- int deviceCount() const;
+ int deviceCount() const override;
- QString deviceName(int index) const;
- QString deviceDescription(int index) const;
+ QString deviceName(int index) const override;
+ QString deviceDescription(int index) const override;
- int defaultDevice() const;
- int selectedDevice() const;
+ int defaultDevice() const override;
+ int selectedDevice() const override;
static QString primaryCamera() { return tr("Main camera"); }
static QString secondaryCamera() { return tr("Front camera"); }
public Q_SLOTS:
- void setSelectedDevice(int index);
+ void setSelectedDevice(int index) override;
private:
GstElementFactory *m_factory;
diff --git a/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h b/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h
index bed411475..f3066fad8 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h
+++ b/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h
@@ -94,8 +94,8 @@ public:
int saturation() const;
void setSaturation(int saturation);
- bool processSyncMessage(const QGstreamerMessage &message);
- bool processBusMessage(const QGstreamerMessage &message);
+ bool processSyncMessage(const QGstreamerMessage &message) override;
+ bool processBusMessage(const QGstreamerMessage &message) override;
Q_SIGNALS:
void nativeVideoSizeChanged();
@@ -109,7 +109,7 @@ private:
GstElement *findBestVideoSink() const;
void setWindowHandle_helper(WId id);
void updateIsActive();
- void probeCaps(GstCaps *caps);
+ void probeCaps(GstCaps *caps) override;
static void showPrerollFrameChanged(GObject *, GParamSpec *, QGstreamerVideoOverlay *);
GstElement *m_videoSink;
diff --git a/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h b/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h
index 7520b7424..b599b0e78 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h
+++ b/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h
@@ -72,8 +72,8 @@ public:
explicit QGstreamerVideoProbeControl(QObject *parent);
virtual ~QGstreamerVideoProbeControl();
- void probeCaps(GstCaps *caps);
- bool probeBuffer(GstBuffer *buffer);
+ void probeCaps(GstCaps *caps) override;
+ bool probeBuffer(GstBuffer *buffer) override;
void startFlushing();
void stopFlushing();
diff --git a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h
index 6dba54fe4..1d22e1125 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h
+++ b/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h
@@ -67,13 +67,13 @@ public:
QGstreamerVideoRenderer(QObject *parent = 0);
virtual ~QGstreamerVideoRenderer();
- QAbstractVideoSurface *surface() const;
- void setSurface(QAbstractVideoSurface *surface);
+ QAbstractVideoSurface *surface() const override;
+ void setSurface(QAbstractVideoSurface *surface) override;
- GstElement *videoSink();
+ GstElement *videoSink() override;
- void stopRenderer();
- bool isReady() const { return m_surface != 0; }
+ void stopRenderer() override;
+ bool isReady() const override { return m_surface != 0; }
signals:
void sinkChanged();
diff --git a/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h b/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h
index f0a76c152..b2dfece60 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h
+++ b/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h
@@ -73,31 +73,31 @@ public:
explicit QGstreamerVideoWidgetControl(QObject *parent = 0, const QByteArray &elementName = QByteArray());
virtual ~QGstreamerVideoWidgetControl();
- GstElement *videoSink();
+ GstElement *videoSink() override;
- QWidget *videoWidget();
+ QWidget *videoWidget() override;
- void stopRenderer();
+ void stopRenderer() override;
- Qt::AspectRatioMode aspectRatioMode() const;
- void setAspectRatioMode(Qt::AspectRatioMode mode);
+ Qt::AspectRatioMode aspectRatioMode() const override;
+ void setAspectRatioMode(Qt::AspectRatioMode mode) override;
- bool isFullScreen() const;
- void setFullScreen(bool fullScreen);
+ bool isFullScreen() const override;
+ void setFullScreen(bool fullScreen) override;
- int brightness() const;
- void setBrightness(int brightness);
+ int brightness() const override;
+ void setBrightness(int brightness) override;
- int contrast() const;
- void setContrast(int contrast);
+ int contrast() const override;
+ void setContrast(int contrast) override;
- int hue() const;
- void setHue(int hue);
+ int hue() const override;
+ void setHue(int hue) override;
- int saturation() const;
- void setSaturation(int saturation);
+ int saturation() const override;
+ void setSaturation(int saturation) override;
- bool eventFilter(QObject *object, QEvent *event);
+ bool eventFilter(QObject *object, QEvent *event) override;
signals:
void sinkChanged();
@@ -111,8 +111,8 @@ private:
void createVideoWidget();
void updateWidgetAttributes();
- bool processSyncMessage(const QGstreamerMessage &message);
- bool processBusMessage(const QGstreamerMessage &message);
+ bool processSyncMessage(const QGstreamerMessage &message) override;
+ bool processBusMessage(const QGstreamerMessage &message) override;
QGstreamerVideoOverlay m_videoOverlay;
QGstreamerVideoWidget *m_widget;
diff --git a/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h b/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h
index 949a18773..b489650f9 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h
+++ b/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h
@@ -73,41 +73,41 @@ public:
explicit QGstreamerVideoWindow(QObject *parent = 0, const QByteArray &elementName = QByteArray());
~QGstreamerVideoWindow();
- WId winId() const;
- void setWinId(WId id);
+ WId winId() const override;
+ void setWinId(WId id) override;
- QRect displayRect() const;
- void setDisplayRect(const QRect &rect);
+ QRect displayRect() const override;
+ void setDisplayRect(const QRect &rect) override;
- bool isFullScreen() const;
- void setFullScreen(bool fullScreen);
+ bool isFullScreen() const override;
+ void setFullScreen(bool fullScreen) override;
- QSize nativeSize() const;
+ QSize nativeSize() const override;
- Qt::AspectRatioMode aspectRatioMode() const;
- void setAspectRatioMode(Qt::AspectRatioMode mode);
+ Qt::AspectRatioMode aspectRatioMode() const override;
+ void setAspectRatioMode(Qt::AspectRatioMode mode) override;
- void repaint();
+ void repaint() override;
- int brightness() const;
- void setBrightness(int brightness);
+ int brightness() const override;
+ void setBrightness(int brightness) override;
- int contrast() const;
- void setContrast(int contrast);
+ int contrast() const override;
+ void setContrast(int contrast) override;
- int hue() const;
- void setHue(int hue);
+ int hue() const override;
+ void setHue(int hue) override;
- int saturation() const;
- void setSaturation(int saturation);
+ int saturation() const override;
+ void setSaturation(int saturation) override;
QAbstractVideoSurface *surface() const;
- GstElement *videoSink();
+ GstElement *videoSink() override;
- bool processSyncMessage(const QGstreamerMessage &message);
- bool processBusMessage(const QGstreamerMessage &message);
- bool isReady() const { return m_windowId != 0; }
+ bool processSyncMessage(const QGstreamerMessage &message) override;
+ bool processBusMessage(const QGstreamerMessage &message) override;
+ bool isReady() const override { return m_windowId != 0; }
signals:
void sinkChanged();
diff --git a/src/multimedia/gsttools_headers/qgstvideobuffer_p.h b/src/multimedia/gsttools_headers/qgstvideobuffer_p.h
index 92128b92e..d2802d9a2 100644
--- a/src/multimedia/gsttools_headers/qgstvideobuffer_p.h
+++ b/src/multimedia/gsttools_headers/qgstvideobuffer_p.h
@@ -77,17 +77,17 @@ public:
~QGstVideoBuffer();
- MapMode mapMode() const;
+ MapMode mapMode() const override;
#if GST_CHECK_VERSION(1,0,0)
- int map(MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]);
+ int map(MapMode mode, int *numBytes, int bytesPerLine[4], uchar *data[4]) override;
#else
- uchar *map(MapMode mode, int *numBytes, int *bytesPerLine);
+ uchar *map(MapMode mode, int *numBytes, int *bytesPerLine) override;
#endif
- void unmap();
+ void unmap() override;
- QVariant handle() const { return m_handle; }
+ QVariant handle() const override { return m_handle; }
private:
#if GST_CHECK_VERSION(1,0,0)
GstVideoInfo m_videoInfo;
diff --git a/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h b/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h
index 433cdf8e5..6a0c4c6bd 100644
--- a/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h
+++ b/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h
@@ -100,7 +100,7 @@ public:
explicit QGstVideoRendererPlugin(QObject *parent = 0);
virtual ~QGstVideoRendererPlugin() {}
- virtual QGstVideoRenderer *createRenderer() = 0;
+ QGstVideoRenderer *createRenderer() override = 0;
};
diff --git a/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h b/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h
index ff59810bc..3971c959d 100644
--- a/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h
+++ b/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h
@@ -76,14 +76,14 @@ public:
QGstDefaultVideoRenderer();
~QGstDefaultVideoRenderer();
- GstCaps *getCaps(QAbstractVideoSurface *surface);
- bool start(QAbstractVideoSurface *surface, GstCaps *caps);
- void stop(QAbstractVideoSurface *surface);
+ GstCaps *getCaps(QAbstractVideoSurface *surface) override;
+ bool start(QAbstractVideoSurface *surface, GstCaps *caps) override;
+ void stop(QAbstractVideoSurface *surface) override;
- bool proposeAllocation(GstQuery *query);
+ bool proposeAllocation(GstQuery *query) override;
- bool present(QAbstractVideoSurface *surface, GstBuffer *buffer);
- void flush(QAbstractVideoSurface *surface);
+ bool present(QAbstractVideoSurface *surface, GstBuffer *buffer) override;
+ void flush(QAbstractVideoSurface *surface) override;
private:
QVideoSurfaceFormat m_format;
@@ -109,7 +109,7 @@ public:
GstFlowReturn render(GstBuffer *buffer);
- bool event(QEvent *event);
+ bool event(QEvent *event) override;
private slots:
bool handleEvent(QMutexLocker *locker);