Title: [201282] releases/WebKitGTK/webkit-2.12/Source/WebCore
Revision
201282
Author
[email protected]
Date
2016-05-23 06:34:20 -0700 (Mon, 23 May 2016)

Log Message

Merge r201078 - [GStreamer] webaudio crash on ARM platforms
https://bugs.webkit.org/show_bug.cgi?id=157838

Reviewed by Michael Catanzaro.

* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
(webKitWebAudioSrcConstructed): Explicitely cast the integer value
of the max-bytes property to guint64 which is the expected type of
this property. The compiler can't guess this on its own.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (201281 => 201282)


--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog	2016-05-23 13:34:07 UTC (rev 201281)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog	2016-05-23 13:34:20 UTC (rev 201282)
@@ -1,5 +1,17 @@
 2016-05-18  Philippe Normand  <[email protected]>
 
+        [GStreamer] webaudio crash on ARM platforms
+        https://bugs.webkit.org/show_bug.cgi?id=157838
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+        (webKitWebAudioSrcConstructed): Explicitely cast the integer value
+        of the max-bytes property to guint64 which is the expected type of
+        this property. The compiler can't guess this on its own.
+
+2016-05-18  Philippe Normand  <[email protected]>
+
         [GStreamer] webaudio playback improvements
         https://bugs.webkit.org/show_bug.cgi?id=155228
 

Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (201281 => 201282)


--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp	2016-05-23 13:34:07 UTC (rev 201281)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp	2016-05-23 13:34:20 UTC (rev 201282)
@@ -229,7 +229,7 @@
         GRefPtr<GstCaps> caps = adoptGRef(gst_audio_info_to_caps(&info));
 
         // Configure the appsrc for minimal latency.
-        g_object_set(appsrc, "max-bytes", 2 * priv->bufferSize, "block", TRUE,
+        g_object_set(appsrc, "max-bytes", static_cast<guint64>(2 * priv->bufferSize), "block", TRUE,
             "blocksize", priv->bufferSize,
             "format", GST_FORMAT_TIME, "caps", caps.get(), nullptr);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to