diff options
Diffstat (limited to 'src/plugins/gstreamer')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinsession.cpp | 6 | ||||
-rw-r--r-- | src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index 823cfe408..39f97e989 100644 --- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp @@ -80,6 +80,8 @@ #include <QtGui/qimage.h> #include <QtCore/qdatetime.h> +#include <algorithm> + //#define CAMERABIN_DEBUG 1 //#define CAMERABIN_DEBUG_DUMP_BIN 1 #define ENUM_NAME(c,e,v) (c::staticMetaObject.enumerator(c::staticMetaObject.indexOfEnumerator(e)).valueToKey((v))) @@ -1257,7 +1259,7 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame readValue(rateValue, &res, continuous); } - qSort(res.begin(), res.end(), rateLessThan); + std::sort(res.begin(), res.end(), rateLessThan); #if CAMERABIN_DEBUG qDebug() << "Supported rates:" << caps; @@ -1384,7 +1386,7 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate, } - qSort(res.begin(), res.end(), resolutionLessThan); + std::sort(res.begin(), res.end(), resolutionLessThan); //if the range is continuos, populate is with the common rates if (isContinuous && res.size() >= 2) { diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp index 9139f1fe2..ef0832f7e 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamerv4l2input.cpp @@ -45,6 +45,8 @@ #include <private/qcore_unix_p.h> #include <linux/videodev2.h> +#include <algorithm> + QT_BEGIN_NAMESPACE static inline uint qHash(const QSize& key) { return uint(key.width()*256+key.height()); } @@ -252,10 +254,10 @@ void QGstreamerV4L2Input::updateSupportedResolutions(const QByteArray &device) m_frameRates.append(rate/1000.0); } - qSort(m_frameRates); + std::sort(m_frameRates.begin(), m_frameRates.end()); m_resolutions = allResolutions.toList(); - qSort(m_resolutions); + std::sort(m_resolutions.begin(), m_resolutions.end()); //qDebug() << "frame rates:" << m_frameRates; //qDebug() << "resolutions:" << m_resolutions; |