Title: [105626] trunk/Source/WebCore
- Revision
- 105626
- Author
- [email protected]
- Date
- 2012-01-23 08:24:21 -0800 (Mon, 23 Jan 2012)
Log Message
[GStreamer] fix WebAudio build after r105431
https://bugs.webkit.org/show_bug.cgi?id=76819
Reviewed by Martin Robinson.
* platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
(WebCore::copyGstreamerBuffersToAudioChannel): Use mutableData()
when copying.
* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
(webKitWebAudioSrcLoop): Drop constness when setting the buffer
data pointer.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105625 => 105626)
--- trunk/Source/WebCore/ChangeLog 2012-01-23 16:20:40 UTC (rev 105625)
+++ trunk/Source/WebCore/ChangeLog 2012-01-23 16:24:21 UTC (rev 105626)
@@ -1,3 +1,17 @@
+2012-01-23 Philippe Normand <[email protected]>
+
+ [GStreamer] fix WebAudio build after r105431
+ https://bugs.webkit.org/show_bug.cgi?id=76819
+
+ Reviewed by Martin Robinson.
+
+ * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+ (WebCore::copyGstreamerBuffersToAudioChannel): Use mutableData()
+ when copying.
+ * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+ (webKitWebAudioSrcLoop): Drop constness when setting the buffer
+ data pointer.
+
2012-01-23 Pavel Feldman <[email protected]>
Web Inspector: add touch events to the event listeners list.
Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (105625 => 105626)
--- trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2012-01-23 16:20:40 UTC (rev 105625)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2012-01-23 16:24:21 UTC (rev 105626)
@@ -80,7 +80,7 @@
gst_buffer_list_iterator_next_group(iter);
GstBuffer* buffer = gst_buffer_list_iterator_merge_group(iter);
if (buffer) {
- memcpy(audioChannel->data(), reinterpret_cast<float*>(GST_BUFFER_DATA(buffer)), GST_BUFFER_SIZE(buffer));
+ memcpy(audioChannel->mutableData(), reinterpret_cast<float*>(GST_BUFFER_DATA(buffer)), GST_BUFFER_SIZE(buffer));
gst_buffer_unref(buffer);
}
Modified: trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (105625 => 105626)
--- trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2012-01-23 16:20:40 UTC (rev 105625)
+++ trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2012-01-23 16:24:21 UTC (rev 105626)
@@ -333,7 +333,7 @@
ASSERT(buffer);
ASSERT(!GST_BUFFER_MALLOCDATA(buffer));
- GST_BUFFER_DATA(buffer) = reinterpret_cast<guint8*>(priv->bus->channel(index)->data());
+ GST_BUFFER_DATA(buffer) = reinterpret_cast<guint8*>(const_cast<float*>(priv->bus->channel(index)->data()));
GST_BUFFER_SIZE(buffer) = bufferSize;
GST_BUFFER_OFFSET(buffer) = priv->currentBufferOffset;
GST_BUFFER_OFFSET_END(buffer) = priv->currentBufferOffset + priv->framesToPull;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
