Merge dev into 5.5

Change-Id: I715a549b4cc10220a6e3b48799fdc38865a9345e

8 files changed, 22 insertions, 20 deletions

diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index ea1f7808b..ea3a54981 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -488,11 +488,8 @@ void QCameraImageCapture::setCaptureDestination(QCameraImageCapture::CaptureDest
   \property QCameraImageCapture::readyForCapture
   \brief whether the service is ready to capture a an image immediately.
 
-   It's permissible to call capture() while the camera status is QCamera::ActiveStatus
-   regardless of isReadyForCapture property value.
-   If camera is not ready to capture image immediately,
-   the capture request is queued with all the related camera settings
-   to be executed as soon as possible.
+  Calling capture() while \e readyForCapture is \c false is not permitted and
+  results in an error.
 */
 
 bool QCameraImageCapture::isReadyForCapture() const
@@ -523,11 +520,13 @@ bool QCameraImageCapture::isReadyForCapture() const
     the default directory, with a full path reported with imageCaptured() and imageSaved() signals.
 
     QCamera saves all the capture parameters like exposure settings or
-    image processing parameters, so changes to camera paramaters after
+    image processing parameters, so changes to camera parameters after
     capture() is called do not affect previous capture requests.
 
     QCameraImageCapture::capture returns the capture Id parameter, used with
     imageExposed(), imageCaptured() and imageSaved() signals.
+
+    \sa isReadyForCapture()
 */
 int QCameraImageCapture::capture(const QString &file)
 {
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp
index ee6189bcc..5d5bc6e8a 100644
--- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp
@@ -111,7 +111,7 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl()
 
     The Camera service should save all the capture parameters
     like exposure settings or image processing parameters,
-    so changes to camera paramaters after capture() is called
+    so changes to camera parameters after capture() is called
     do not affect previous capture requests.
 
     Returns the capture request id number, which is used later
diff --git a/src/multimedia/doc/src/blackberry.qdoc b/src/multimedia/doc/src/blackberry.qdoc
index ab795f974..28c176deb 100644
--- a/src/multimedia/doc/src/blackberry.qdoc
+++ b/src/multimedia/doc/src/blackberry.qdoc
@@ -31,7 +31,7 @@
 \brief Platform notes for the BlackBerry Platform
 
 Qt Multimedia supports BlackBerry devices that run the BB10 operating system.
-This page covers the availibility of different features on BB10.
+This page covers the availability of different features on BB10.
 
 \section1 Implementation
 
diff --git a/src/multimedia/gsttools_headers/qgstutils_p.h b/src/multimedia/gsttools_headers/qgstutils_p.h
index 2ebf42b14..d7e26ad82 100644
--- a/src/multimedia/gsttools_headers/qgstutils_p.h
+++ b/src/multimedia/gsttools_headers/qgstutils_p.h
@@ -115,7 +115,7 @@ namespace QGstUtils {
     QImage bufferToImage(GstBuffer *buffer, const GstVideoInfo &info);
     QVideoSurfaceFormat formatForCaps(
             GstCaps *caps,
-            GstVideoInfo *info,
+            GstVideoInfo *info = 0,
             QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle);
 #else
     QImage bufferToImage(GstBuffer *buffer);
@@ -133,13 +133,20 @@ namespace QGstUtils {
 
     GstCaps *videoFilterCaps();
 
+    QSize structureResolution(const GstStructure *s);
+    QVideoFrame::PixelFormat structurePixelFormat(const GstStructure *s, int *bpp = 0);
+    QSize structurePixelAspectRatio(const GstStructure *s);
+    QPair<qreal, qreal> structureFrameRateRange(const GstStructure *s);
+
 }
 
 void qt_gst_object_ref_sink(gpointer object);
 GstCaps *qt_gst_pad_get_current_caps(GstPad *pad);
+GstCaps *qt_gst_pad_get_caps(GstPad *pad);
 GstStructure *qt_gst_structure_new_empty(const char *name);
 gboolean qt_gst_element_query_position(GstElement *element, GstFormat format, gint64 *cur);
 gboolean qt_gst_element_query_duration(GstElement *element, GstFormat format, gint64 *cur);
+GstCaps *qt_gst_caps_normalize(GstCaps *caps);
 
 QDebug operator <<(QDebug debug, GstCaps *caps);
 
diff --git a/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h b/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h
index 0c5636c2e..48b14108d 100644
--- a/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h
+++ b/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h
@@ -98,14 +98,10 @@ public:
     void stop();
     bool proposeAllocation(GstQuery *query);
 
-    void flush();
-
-    GstFlowReturn render(GstBuffer *buffer, bool show);
+    GstFlowReturn render(GstBuffer *buffer);
 
     bool event(QEvent *event);
 
-    static void handleShowPrerollChange(GObject *o, GParamSpec *p, gpointer d);
-
 private slots:
     bool handleEvent(QMutexLocker *locker);
     void updateSupportedFormats();
@@ -126,11 +122,10 @@ private:
 
     GstCaps *m_surfaceCaps;
     GstCaps *m_startCaps;
-    GstBuffer *m_lastBuffer;
+    GstBuffer *m_renderBuffer;
 
     bool m_notified;
     bool m_stop;
-    bool m_render;
     bool m_flush;
 };
 
@@ -156,7 +151,8 @@ private:
 
     static gboolean propose_allocation(GstBaseSink *sink, GstQuery *query);
 
-    static GstFlowReturn preroll(GstBaseSink *sink, GstBuffer *buffer);
+    static gboolean stop(GstBaseSink *sink);
+
     static GstFlowReturn render(GstBaseSink *sink, GstBuffer *buffer);
 
 private:
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index e094e006e..aae4c7efa 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -335,7 +335,7 @@ void QMediaPlayerPrivate::setPlaylistMedia()
             return;
         } else if (control != 0) {
             // If we've just switched to a new playlist,
-            // then last emited currentMediaChanged was a playlist.
+            // then last emitted currentMediaChanged was a playlist.
             // Make sure we emit currentMediaChanged if new playlist has
             // the same media as the previous one:
             // sample.m3u
diff --git a/src/multimedia/video/qvideoprobe.cpp b/src/multimedia/video/qvideoprobe.cpp
index 59b1a5433..87fabd026 100644
--- a/src/multimedia/video/qvideoprobe.cpp
+++ b/src/multimedia/video/qvideoprobe.cpp
@@ -51,7 +51,7 @@
 
         player->setVideoOutput(myVideoSurface);
         player->setMedia(QUrl::fromLocalFile("observation.mp4"));
-        player->play(); // Start receving frames as they get presented to myVideoSurface
+        player->play(); // Start receiving frames as they get presented to myVideoSurface
     \endcode
 
     This same approach works with the QCamera object as well, to receive viewfinder or video
diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h
index bc175428f..5de594f06 100644
--- a/src/multimedia/video/qvideoprobe.h
+++ b/src/multimedia/video/qvideoprobe.h
@@ -34,7 +34,7 @@
 #ifndef QVIDEOPROBE_H
 #define QVIDEOPROBE_H
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtMultimedia/qvideoframe.h>
 
 QT_BEGIN_NAMESPACE