Changeset 147567 in webkit

Timestamp:

Apr 3, 2013 11:12:40 AM (11 years ago)

Author:

Christophe Dumez

Message:

[Gstreamer] Use gst_buffer_extract() in copyGstreamerBuffersToAudioChannel()
​https://bugs.webkit.org/show_bug.cgi?id=113880

Reviewed by Philippe Normand.

copyGstreamerBuffersToAudioChannel() was mapping the GstBuffer content to memcpy
it to the AudioChannel buffer. This patch leverages gst_buffer_extract() to
simplify the code as it does exactly what we need: gst_buffer_map, memcpy,
gst_buffer_unmap and error handling.

Also replace GstBuffer NULL check by an assertion as we already make sure they
are not NULL before adding them to the list. Additionally, we now call
audioChannel->mutableData() only once instead of once per iteration. It is
a bit better as the getter does some work internally.

No new tests, no behavior change.

• platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:

(WebCore::copyGstreamerBuffersToAudioChannel):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-03  Christophe Dumez  <ch.dumez@sisa.samsung.com>
+
+        [Gstreamer] Use gst_buffer_extract() in copyGstreamerBuffersToAudioChannel()
+        https://bugs.webkit.org/show_bug.cgi?id=113880
+
+        Reviewed by Philippe Normand.
+
+        copyGstreamerBuffersToAudioChannel() was mapping the GstBuffer content to memcpy
+        it to the AudioChannel buffer. This patch leverages gst_buffer_extract() to
+        simplify the code as it does exactly what we need: gst_buffer_map, memcpy,
+        gst_buffer_unmap and error handling.
+
+        Also replace GstBuffer NULL check by an assertion as we already make sure they
+        are not NULL before adding them to the list. Additionally, we now call
+        audioChannel->mutableData() only once instead of once per iteration. It is
+        a bit better as the getter does some work internally.
+
+        No new tests, no behavior change.
+
+        * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+        (WebCore::copyGstreamerBuffersToAudioChannel):
+
 2013-04-03  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp

@@ -101 +101 @@
 {
 #ifdef GST_API_VERSION_1
-    gsize offset = 0;
-    for (unsigned i = 0; i < gst_buffer_list_length(buffers); i++) {
+    float* destination = audioChannel->mutableData();
+    unsigned bufferCount = gst_buffer_list_length(buffers);
+    for (unsigned i = 0; i < bufferCount; ++i) {
         GstBuffer* buffer = gst_buffer_list_get(buffers, i);
-        if (!buffer)
-            continue;
-        GstMapInfo info;
-        gst_buffer_map(buffer, &info, GST_MAP_READ);
-        memcpy(audioChannel->mutableData() + offset, reinterpret_cast<float*>(info.data), info.size);
-        offset += info.size / sizeof(float);
-        gst_buffer_unmap(buffer, &info);
+        ASSERT(buffer);
+        gsize bufferSize = gst_buffer_get_size(buffer);
+        gst_buffer_extract(buffer, 0, destination, bufferSize);
+        destination += bufferSize / sizeof(float);
     }
 #else