Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I8e0f222f110cc23b426f2d68416f5cc3982e30f2

src/multimedia/gsttools_headers/qgstutils_p.h

@@ -152,6 +152,7 @@ GstCaps *qt_gst_caps_normalize(GstCaps *caps);
 const gchar *qt_gst_element_get_factory_name(GstElement *element);
 gboolean qt_gst_caps_can_intersect(const GstCaps * caps1, const GstCaps * caps2);
 GList *qt_gst_video_sinks();
+void qt_gst_util_double_to_fraction(gdouble src, gint *dest_n, gint *dest_d);
 
 QDebug operator <<(QDebug debug, GstCaps *caps);
 

src/multimedia/multimedia.pro

@@ -26,7 +26,8 @@ PRIVATE_HEADERS += \
     qmediaresourcepolicy_p.h \
     qmediaresourceset_p.h \
     qmediastoragelocation_p.h \
-    qmediaopenglhelper_p.h
+    qmediaopenglhelper_p.h \
+    qmultimediautils_p.h
 
 PUBLIC_HEADERS += \
     qmediabindableinterface.h \
@@ -53,7 +54,8 @@ SOURCES += \
     qmediaresourcepolicy_p.cpp \
     qmediaresourceset_p.cpp \
     qmediastoragelocation.cpp \
-    qmultimedia.cpp
+    qmultimedia.cpp \
+    qmultimediautils.cpp
 
 CONFIG += simd optimize_full
 

src/multimedia/qmultimediautils.cpp

@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmultimediautils_p.h"
+
+QT_BEGIN_NAMESPACE
+
+void qt_real_to_fraction(qreal value, int *numerator, int *denominator)
+{
+    if (!numerator || !denominator)
+        return;
+
+    const int dMax = 1000;
+    int n1 = 0, d1 = 1, n2 = 1, d2 = 1;
+    qreal mid = 0.;
+    while (d1 <= dMax && d2 <= dMax) {
+        mid = qreal(n1 + n2) / (d1 + d2);
+
+        if (qAbs(value - mid) < 0.000001) {
+            if (d1 + d2 <= dMax) {
+                *numerator = n1 + n2;
+                *denominator = d1 + d2;
+                return;
+            } else if (d2 > d1) {
+                *numerator = n2;
+                *denominator = d2;
+                return;
+            } else {
+                *numerator = n1;
+                *denominator = d1;
+                return;
+            }
+        } else if (value > mid) {
+            n1 = n1 + n2;
+            d1 = d1 + d2;
+        } else {
+            n2 = n1 + n2;
+            d2 = d1 + d2;
+        }
+    }
+
+    if (d1 > dMax) {
+        *numerator = n2;
+        *denominator = d2;
+    } else {
+        *numerator = n1;
+        *denominator = d1;
+    }
+}
+
+QT_END_NAMESPACE

src/multimedia/qmultimediautils_p.h

@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMULTIMEDIAUTILS_P_H
+#define QMULTIMEDIAUTILS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtMultimedia/qmultimedia.h>
+
+QT_BEGIN_NAMESPACE
+
+Q_MULTIMEDIA_EXPORT void qt_real_to_fraction(qreal value, int *numerator, int *denominator);
+
+QT_END_NAMESPACE
+
+#endif // QMULTIMEDIAUTILS_P_H
+