diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:45:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:45:03 +0200 |
| commit | 1c6c85cd7c619cc15c099ae63a5d22bcf661847c (patch) | |
| tree | 5a803feb71e725853317ee1df50a19afe3c87e7a /src/plugins/gstreamer/camerabin/camerabinsession.cpp | |
| parent | 4d3dae3fa63d64cc97226969c4bf7d6d91b63b57 (diff) | |
| parent | 20e65d4dbd43d133d663b4733ffb09629935e731 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I7291f7a3bd5851eafe2bf0a4bd5c5f8e705a90bc
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index 8947af8f1..1e075f58d 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -674,6 +674,8 @@ QCameraViewfinderSettings CameraBinSession::viewfinderSettings() const void CameraBinSession::ViewfinderProbe::probeCaps(GstCaps *caps) { + QGstreamerVideoProbeControl::probeCaps(caps); + // Update actual viewfinder settings on viewfinder caps change const GstStructure *s = gst_caps_get_structure(caps, 0); const QPair<qreal, qreal> frameRate = QGstUtils::structureFrameRateRange(s); @@ -1074,6 +1076,11 @@ bool CameraBinSession::processBusMessage(const QGstreamerMessage &message) return false; } +QGstreamerVideoProbeControl *CameraBinSession::videoProbe() +{ + return &m_viewfinderProbe; +} + QString CameraBinSession::currentContainerFormat() const { if (!m_muxer) |