WebKit Bugzilla
Attachment 358691 Details for
Bug 192977
: [GStreamer] Add sharedBuffer utility to GstMappedBuffer, and a testsuite
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-192977-20190109115216.patch (text/plain), 32.96 KB, created by
Charlie Turner
on 2019-01-09 03:52:17 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Charlie Turner
Created:
2019-01-09 03:52:17 PST
Size:
32.96 KB
patch
obsolete
>Subversion Revision: 239670 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 9bfdaa6e8c84d17b31a5a52c924bd70d8e8ef2ca..ad65c60d609d767cc2d1276abf97d6ea9f5e443f 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,48 @@ >+2019-01-09 Charlie Turner <cturner@igalia.com> >+ >+ [GStreamer] Add sharedBuffer utility to GstMappedBuffer, and a testsuite >+ https://bugs.webkit.org/show_bug.cgi?id=192977 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Add a utility method on GstMappedBuffer to return a SharedBuffer >+ view over the mapped data with no copies. >+ >+ This patch also introduces a new gstreamer port API test >+ directory, and includes some tests for GstMappedBuffer. >+ >+ New tests in the API section. >+ >+ * platform/SharedBuffer.cpp: Add a new overload for >+ GstMappedBuffer that allows sharing the mapped GStreamer buffers >+ with zero copies. >+ (WebCore::SharedBuffer::SharedBuffer): >+ (WebCore::SharedBuffer::DataSegment::data const): >+ (WebCore::SharedBuffer::DataSegment::size const): >+ * platform/SharedBuffer.h: >+ * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp: >+ (webKitWebAudioSrcAllocateBuffersAndRenderAudio): Update to use >+ new Ref<GstMappedBuffer> >+ * platform/graphics/gstreamer/GStreamerCommon.cpp: >+ (WebCore::GstMappedBuffer::~GstMappedBuffer): Moved to >+ implementation file. >+ (WebCore::GstMappedBuffer::sharedBuffer): Ditto. >+ * platform/graphics/gstreamer/GStreamerCommon.h: >+ (WebCore::GstMappedBuffer::create): Make GstMappedBuffer ref counted >+ (WebCore::GstMappedBuffer::data): >+ (WebCore::GstMappedBuffer::data const): >+ (WebCore::GstMappedBuffer::size const): >+ (WebCore::GstMappedBuffer::operator bool const): >+ (WebCore::GstMappedBuffer::~GstMappedBuffer): Deleted. >+ * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp: >+ (WebCore::InbandTextTrackPrivateGStreamer::notifyTrackOfSample): >+ Update to use Ref<GstMappedBuffer> >+ * platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h: >+ (WebCore::InitData::InitData): Ditoo. >+ * platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp: >+ (webKitMediaClearKeyDecryptorFindAndSetKey): Ditto. >+ (webKitMediaClearKeyDecryptorDecrypt): Ditto. >+ > 2019-01-07 Zan Dobersek <zdobersek@igalia.com> > > [WPE] Use Widget bounds for PlatformScreen rectangle information >diff --git a/Source/WebCore/platform/SharedBuffer.cpp b/Source/WebCore/platform/SharedBuffer.cpp >index 46fc811cc35335e9d3afa6dbb33ef919c2d60ae2..75cbaa0bd899496a7f8d923e526428d02700ff90 100644 >--- a/Source/WebCore/platform/SharedBuffer.cpp >+++ b/Source/WebCore/platform/SharedBuffer.cpp >@@ -54,6 +54,19 @@ SharedBuffer::SharedBuffer(Vector<char>&& data) > append(WTFMove(data)); > } > >+#if USE(GSTREAMER) >+Ref<SharedBuffer> SharedBuffer::create(RefPtr<GstMappedBuffer> buffer) >+{ >+ return adoptRef(*new SharedBuffer(buffer)); >+} >+ >+SharedBuffer::SharedBuffer(RefPtr<GstMappedBuffer>& mappedBuffer) >+ : m_size(mappedBuffer->size()) >+{ >+ m_segments.append({0, DataSegment::create(WTFMove(mappedBuffer))}); >+} >+#endif >+ > RefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& filePath) > { > bool mappingSuccess; >@@ -210,6 +223,9 @@ const char* SharedBuffer::DataSegment::data() const > #endif > #if USE(GLIB) > [](const GRefPtr<GBytes>& data) { return reinterpret_cast<const char*>(g_bytes_get_data(data.get(), nullptr)); }, >+#endif >+#if USE(GLIB) >+ [](const RefPtr<GstMappedBuffer>& data) { return reinterpret_cast<const char*>(data->data()); }, > #endif > [](const FileSystem::MappedFileData& data) { return reinterpret_cast<const char*>(data.data()); } > ); >@@ -283,6 +299,9 @@ size_t SharedBuffer::DataSegment::size() const > #endif > #if USE(GLIB) > [](const GRefPtr<GBytes>& data) { return g_bytes_get_size(data.get()); }, >+#endif >+#if USE(GSTREAMER) >+ [](const RefPtr<GstMappedBuffer>& data) { return data->size(); }, > #endif > [](const FileSystem::MappedFileData& data) { return data.size(); } > ); >diff --git a/Source/WebCore/platform/SharedBuffer.h b/Source/WebCore/platform/SharedBuffer.h >index e2aae2f30457355f489eec4ab4ecf1ce7d3e452f..2e2db232ffd136482096969dc7ab00b5f3315fe8 100644 >--- a/Source/WebCore/platform/SharedBuffer.h >+++ b/Source/WebCore/platform/SharedBuffer.h >@@ -48,6 +48,10 @@ > typedef struct _GBytes GBytes; > #endif > >+#if USE(GSTREAMER) >+#include "GStreamerCommon.h" >+#endif >+ > #if USE(FOUNDATION) > OBJC_CLASS NSArray; > OBJC_CLASS NSData; >@@ -88,6 +92,9 @@ public: > static Ref<SharedBuffer> create(GBytes*); > #endif > >+#if USE(GSTREAMER) >+ static Ref<SharedBuffer> create(RefPtr<GstMappedBuffer>); >+#endif > // Calling data() causes all the data segments to be copied into one segment if they are not already. > // Iterate the segments using begin() and end() instead. > // FIXME: Audit the call sites of this function and replace them with iteration if possible. >@@ -125,6 +132,9 @@ public: > #endif > #if USE(GLIB) > static Ref<DataSegment> create(GRefPtr<GBytes>&& data) { return adoptRef(*new DataSegment(WTFMove(data))); } >+#endif >+#if USE(GSTREAMER) >+ static Ref<DataSegment> create(RefPtr<GstMappedBuffer>&& data) { return adoptRef(*new DataSegment(WTFMove(data))); } > #endif > static Ref<DataSegment> create(FileSystem::MappedFileData&& data) { return adoptRef(*new DataSegment(WTFMove(data))); } > >@@ -142,6 +152,10 @@ public: > #if USE(GLIB) > DataSegment(GRefPtr<GBytes>&& data) > : m_immutableData(WTFMove(data)) { } >+#endif >+#if USE(GLIB) >+ DataSegment(RefPtr<GstMappedBuffer>&& data) >+ : m_immutableData(WTFMove(data)) { } > #endif > DataSegment(FileSystem::MappedFileData&& data) > : m_immutableData(WTFMove(data)) { } >@@ -155,6 +169,9 @@ public: > #endif > #if USE(GLIB) > GRefPtr<GBytes>, >+#endif >+#if USE(GSTREAMER) >+ RefPtr<GstMappedBuffer>, > #endif > FileSystem::MappedFileData> m_immutableData; > friend class SharedBuffer; >@@ -191,6 +208,9 @@ private: > #if USE(GLIB) > explicit SharedBuffer(GBytes*); > #endif >+#if USE(GSTREAMER) >+ explicit SharedBuffer(RefPtr<GstMappedBuffer>&); >+#endif > > void combineIntoOneSegment() const; > >diff --git a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp >index 0210352b0d10c286e9c14105d9ef3d0dda27b3eb..b101a382ecba5b17ed30efb2deeeabe6b1d7b7bd 100644 >--- a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp >+++ b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp >@@ -327,7 +327,7 @@ static Optional<Vector<GRefPtr<GstBuffer>>> webKitWebAudioSrcAllocateBuffersAndR > > Vector<GRefPtr<GstBuffer>> channelBufferList; > channelBufferList.reserveInitialCapacity(priv->sources.size()); >- Vector<GstMappedBuffer> mappedBuffers; >+ Vector<Ref<GstMappedBuffer>> mappedBuffers; > mappedBuffers.reserveInitialCapacity(priv->sources.size()); > for (unsigned i = 0; i < priv->sources.size(); ++i) { > GRefPtr<GstBuffer> buffer; >@@ -342,10 +342,8 @@ static Optional<Vector<GRefPtr<GstBuffer>>> webKitWebAudioSrcAllocateBuffersAndR > ASSERT(buffer); > GST_BUFFER_TIMESTAMP(buffer.get()) = timestamp; > GST_BUFFER_DURATION(buffer.get()) = duration; >- GstMappedBuffer mappedBuffer(buffer.get(), GST_MAP_READWRITE); >- ASSERT(mappedBuffer); >- mappedBuffers.uncheckedAppend(WTFMove(mappedBuffer)); >- priv->bus->setChannelMemory(i, reinterpret_cast<float*>(mappedBuffers[i].data()), priv->framesToPull); >+ mappedBuffers.uncheckedAppend(GstMappedBuffer::create(buffer.get(), GST_MAP_READWRITE)); >+ priv->bus->setChannelMemory(i, reinterpret_cast<float*>(mappedBuffers[i]->data()), priv->framesToPull); > channelBufferList.uncheckedAppend(WTFMove(buffer)); > } > >diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp >index 0ba4739a1de5d42168feed7a05b8682d6057a8b1..dc86554a7da026eea921ac095d1cdbbcb1e0f4d0 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp >@@ -25,6 +25,7 @@ > > #include "GstAllocatorFastMalloc.h" > #include "IntSize.h" >+#include "SharedBuffer.h" > #include <gst/audio/audio-info.h> > #include <gst/gst.h> > #include <mutex> >@@ -357,6 +358,25 @@ void connectSimpleBusMessageCallback(GstElement* pipeline) > g_signal_connect(bus.get(), "message", G_CALLBACK(simpleBusMessageCallback), pipeline); > } > >+GstMappedBuffer::~GstMappedBuffer() >+{ >+ if (m_isValid) >+ gst_buffer_unmap(m_buffer, &m_info); >+ >+ m_isValid = false; >+} >+ >+RefPtr<SharedBuffer> GstMappedBuffer::sharedBuffer() >+{ >+ // SharedBuffer provides a read-only view on what it expects are >+ // immutable data. Do not create one if the buffer has not been >+ // mapped or if the buffer is writable and hence mutable. >+ if (!m_isValid || m_info.flags & GST_MAP_WRITE) >+ return nullptr; >+ >+ return SharedBuffer::create(this); >+} >+ > } > > #endif // USE(GSTREAMER) >diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h >index 2ef15502a005631ee4d07f7fa32b54f4698cfbc8..d2d31f19f108594e90180aa00dbe853f8cfae0b1 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h >+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h >@@ -27,10 +27,12 @@ > #include <gst/video/video-format.h> > #include <gst/video/video-info.h> > #include <wtf/MediaTime.h> >+#include <wtf/ThreadSafeRefCounted.h> > > namespace WebCore { > > class IntSize; >+class SharedBuffer; > > inline bool webkitGstCheckVersion(guint major, guint minor, guint micro) > { >@@ -77,18 +79,28 @@ inline GstClockTime toGstClockTime(const MediaTime &mediaTime) > return static_cast<GstClockTime>(toGstUnsigned64Time(mediaTime)); > } > >-class GstMappedBuffer { >+class GstMappedBuffer : public ThreadSafeRefCounted<GstMappedBuffer> { > WTF_MAKE_NONCOPYABLE(GstMappedBuffer); > public: >+ static Ref<GstMappedBuffer> create(GstBuffer* buffer, GstMapFlags flags) >+ { >+ return adoptRef(*new GstMappedBuffer(buffer, flags)); >+ } > >- GstMappedBuffer(GstMappedBuffer&& other) >- : m_buffer(other.m_buffer) >- , m_info(other.m_info) >- , m_isValid(other.m_isValid) >+ static Ref<GstMappedBuffer> create(GstBuffer* buffer, int flags) > { >- other.m_isValid = false; >+ return adoptRef(*new GstMappedBuffer(buffer, flags)); > } > >+ ~GstMappedBuffer(); >+ >+ uint8_t* data() { ASSERT(m_isValid); return static_cast<uint8_t*>(m_info.data); } >+ const uint8_t* data() const { ASSERT(m_isValid); return static_cast<uint8_t*>(m_info.data); } >+ size_t size() const { ASSERT(m_isValid); return static_cast<size_t>(m_info.size); } >+ RefPtr<SharedBuffer> sharedBuffer(); >+ explicit operator bool() const { return m_isValid; } >+ >+private: > GstMappedBuffer(GstBuffer* buffer, GstMapFlags flags) > : m_buffer(buffer) > { >@@ -100,21 +112,6 @@ public: > GstMappedBuffer(GstBuffer* buffer, int flags) > : GstMappedBuffer(buffer, static_cast<GstMapFlags>(flags)) { } > >- ~GstMappedBuffer() >- { >- if (m_isValid) >- gst_buffer_unmap(m_buffer, &m_info); >- m_isValid = false; >- } >- >- uint8_t* data() { ASSERT(m_isValid); return static_cast<uint8_t*>(m_info.data); } >- const uint8_t* data() const { ASSERT(m_isValid); return static_cast<uint8_t*>(m_info.data); } >- >- size_t size() const { ASSERT(m_isValid); return static_cast<size_t>(m_info.size); } >- >- explicit operator bool() const { return m_isValid; } >- >-private: > friend bool operator==(const GstMappedBuffer&, const GstMappedBuffer&); > friend bool operator==(const GstMappedBuffer&, const GstBuffer*); > friend bool operator==(const GstBuffer* a, const GstMappedBuffer& b) { return operator==(b, a); } >diff --git a/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp >index c2dd12320c1d89c19562a61e826d90fc0e76ba49..cd2565fd317b16dd0a043f41146d5ae315661538 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.cpp >@@ -112,16 +112,16 @@ void InbandTextTrackPrivateGStreamer::notifyTrackOfSample() > GST_WARNING("Track %d got sample with no buffer.", m_index); > continue; > } >- GstMappedBuffer mappedBuffer(buffer, GST_MAP_READ); >- ASSERT(mappedBuffer); >- if (!mappedBuffer) { >+ auto mappedBuffer = GstMappedBuffer::create(buffer, GST_MAP_READ); >+ ASSERT(mappedBuffer.get()); >+ if (!mappedBuffer.get()) { > GST_WARNING("Track %d unable to map buffer.", m_index); > continue; > } > >- GST_INFO("Track %d parsing sample: %.*s", m_index, static_cast<int>(mappedBuffer.size()), >- reinterpret_cast<char*>(mappedBuffer.data())); >- client()->parseWebVTTCueData(reinterpret_cast<char*>(mappedBuffer.data()), mappedBuffer.size()); >+ GST_INFO("Track %d parsing sample: %.*s", m_index, static_cast<int>(mappedBuffer->size()), >+ reinterpret_cast<char*>(mappedBuffer->data())); >+ client()->parseWebVTTCueData(reinterpret_cast<char*>(mappedBuffer->data()), mappedBuffer->size()); > } > } > >diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h b/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h >index beff76a5a6a8e55826d479bd60c38beb8bb308a2..a0883d9a3546a552849e6a2bc89c82083ab19bb5 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h >+++ b/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h >@@ -40,12 +40,12 @@ public: > InitData(const String& systemId, GstBuffer* initData) > : m_systemId(systemId) > { >- GstMappedBuffer mappedInitData(initData, GST_MAP_READ); >- if (!mappedInitData) { >+ auto mappedInitData = GstMappedBuffer::create(initData, GST_MAP_READ); >+ if (!mappedInitData.get()) { > GST_ERROR("cannot map %s protection data", systemId.utf8().data()); > ASSERT_NOT_REACHED(); > } >- m_payload = SharedBuffer::create(mappedInitData.data(), mappedInitData.size()); >+ m_payload = mappedInitData->sharedBuffer(); > } > > void append(InitData&& initData) >diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp >index f941e528f47cbd069579bc5e633581e6b610c723..41633c65b1ca7d3ea73094caeafae22a986b5765 100644 >--- a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp >+++ b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp >@@ -165,14 +165,14 @@ static gboolean webKitMediaClearKeyDecryptorFindAndSetKey(WebKitMediaClearKeyDec > return false; > } > >- WebCore::GstMappedBuffer mappedKeyValueBuffer(keyBuffer.get(), GST_MAP_READ); >- if (!mappedKeyValueBuffer) { >+ auto mappedKeyValueBuffer = WebCore::GstMappedBuffer::create(keyBuffer.get(), GST_MAP_READ); >+ if (!mappedKeyValueBuffer.get()) { > GST_ERROR_OBJECT(priv, "Failed to map decryption key"); > return false; > } > >- ASSERT(mappedKeyValueBuffer.size() == CLEARKEY_SIZE); >- if (gcry_error_t error = gcry_cipher_setkey(priv->handle, mappedKeyValueBuffer.data(), mappedKeyValueBuffer.size())) { >+ ASSERT(mappedKeyValueBuffer->size() == CLEARKEY_SIZE); >+ if (gcry_error_t error = gcry_cipher_setkey(priv->handle, mappedKeyValueBuffer->data(), mappedKeyValueBuffer->size())) { > GST_ERROR_OBJECT(priv, "gcry_cipher_setkey failed: %s", gpg_strerror(error)); > return false; > } >@@ -188,19 +188,19 @@ static gboolean webKitMediaClearKeyDecryptorDecrypt(WebKitMediaCommonEncryptionD > return false; > } > >- WebCore::GstMappedBuffer mappedIVBuffer(ivBuffer, GST_MAP_READ); >- if (!mappedIVBuffer) { >+ auto mappedIVBuffer = WebCore::GstMappedBuffer::create(ivBuffer, GST_MAP_READ); >+ if (!mappedIVBuffer.get()) { > GST_ERROR_OBJECT(self, "Failed to map IV"); > return false; > } > > uint8_t ctr[CLEARKEY_SIZE]; >- if (mappedIVBuffer.size() == 8) { >+ if (mappedIVBuffer->size() == 8) { > memset(ctr + 8, 0, 8); >- memcpy(ctr, mappedIVBuffer.data(), 8); >+ memcpy(ctr, mappedIVBuffer->data(), 8); > } else { > ASSERT(mappedIVBuffer.size() == CLEARKEY_SIZE); >- memcpy(ctr, mappedIVBuffer.data(), CLEARKEY_SIZE); >+ memcpy(ctr, mappedIVBuffer->data(), CLEARKEY_SIZE); > } > > WebKitMediaClearKeyDecryptPrivate* priv = WEBKIT_MEDIA_CK_DECRYPT_GET_PRIVATE(WEBKIT_MEDIA_CK_DECRYPT(self)); >@@ -216,14 +216,14 @@ static gboolean webKitMediaClearKeyDecryptorDecrypt(WebKitMediaCommonEncryptionD > return false; > } > >- WebCore::GstMappedBuffer mappedKeyIdBuffer(keyIDBuffer, GST_MAP_READ); >- if (!mappedKeyIdBuffer) { >+ auto mappedKeyIdBuffer = WebCore::GstMappedBuffer::create(keyIDBuffer, GST_MAP_READ); >+ if (!mappedKeyIdBuffer.get()) { > GST_ERROR_OBJECT(self, "Failed to map key id buffer"); > return false; > } > >- WebCore::GstMappedBuffer mappedBuffer(buffer, GST_MAP_READWRITE); >- if (!mappedBuffer) { >+ auto mappedBuffer = WebCore::GstMappedBuffer::create(buffer, GST_MAP_READWRITE); >+ if (!mappedBuffer.get()) { > GST_ERROR_OBJECT(self, "Failed to map buffer"); > return false; > } >@@ -235,11 +235,11 @@ static gboolean webKitMediaClearKeyDecryptorDecrypt(WebKitMediaCommonEncryptionD > > if (!subSampleCount) { > // Full sample encryption. >- GST_TRACE_OBJECT(self, "full sample encryption: %zu encrypted bytes", mappedBuffer.size()); >+ GST_TRACE_OBJECT(self, "full sample encryption: %zu encrypted bytes", mappedBuffer->size()); > > // Check if the buffer is empty. >- if (mappedBuffer.size()) { >- cipherError = gcry_cipher_decrypt(priv->handle, mappedBuffer.data(), mappedBuffer.size(), 0, 0); >+ if (mappedBuffer->size()) { >+ cipherError = gcry_cipher_decrypt(priv->handle, mappedBuffer->data(), mappedBuffer->size(), 0, 0); > if (cipherError) { > GST_ERROR_OBJECT(self, "full sample decryption failed: %s", gpg_strerror(cipherError)); > return false; >@@ -255,16 +255,16 @@ static gboolean webKitMediaClearKeyDecryptorDecrypt(WebKitMediaCommonEncryptionD > } > > // Subsample encryption. >- WebCore::GstMappedBuffer mappedSubSamplesBuffer(subSamplesBuffer, GST_MAP_READ); >- if (!mappedSubSamplesBuffer) { >+ auto mappedSubSamplesBuffer = WebCore::GstMappedBuffer::create(subSamplesBuffer, GST_MAP_READ); >+ if (!mappedSubSamplesBuffer.get()) { > GST_ERROR_OBJECT(self, "Failed to map subsample buffer"); > return false; > } > >- GUniquePtr<GstByteReader> reader(gst_byte_reader_new(mappedSubSamplesBuffer.data(), mappedSubSamplesBuffer.size())); >- GST_DEBUG_OBJECT(self, "position: %d, size: %zu", position, mappedBuffer.size()); >+ GUniquePtr<GstByteReader> reader(gst_byte_reader_new(mappedSubSamplesBuffer->data(), mappedSubSamplesBuffer->size())); >+ GST_DEBUG_OBJECT(self, "position: %d, size: %zu", position, mappedBuffer->size()); > >- while (position < mappedBuffer.size()) { >+ while (position < mappedBuffer->size()) { > guint16 nBytesClear = 0; > guint32 nBytesEncrypted = 0; > >@@ -277,14 +277,14 @@ static gboolean webKitMediaClearKeyDecryptorDecrypt(WebKitMediaCommonEncryptionD > sampleIndex++; > } else { > nBytesClear = 0; >- nBytesEncrypted = mappedBuffer.size() - position; >+ nBytesEncrypted = mappedBuffer->size() - position; > } > >- GST_TRACE_OBJECT(self, "subsample index %u - %hu bytes clear (todo=%zu)", sampleIndex, nBytesClear, mappedBuffer.size() - position); >+ GST_TRACE_OBJECT(self, "subsample index %u - %hu bytes clear (todo=%zu)", sampleIndex, nBytesClear, mappedBuffer->size() - position); > position += nBytesClear; > if (nBytesEncrypted) { >- GST_TRACE_OBJECT(self, "subsample index %u - %u bytes encrypted (todo=%zu)", sampleIndex, nBytesEncrypted, mappedBuffer.size() - position); >- cipherError = gcry_cipher_decrypt(priv->handle, mappedBuffer.data() + position, nBytesEncrypted, 0, 0); >+ GST_TRACE_OBJECT(self, "subsample index %u - %u bytes encrypted (todo=%zu)", sampleIndex, nBytesEncrypted, mappedBuffer->size() - position); >+ cipherError = gcry_cipher_decrypt(priv->handle, mappedBuffer->data() + position, nBytesEncrypted, 0, 0); > if (cipherError) { > GST_ERROR_OBJECT(self, "sub sample index %u decryption failed: %s", sampleIndex, gpg_strerror(cipherError)); > return false; >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 3e68f076c1e3ffc6d8e97632187f9ba97e3a8df2..050db1707b18d3a46a4e1a977a6fe11404e9a838 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,19 @@ >+2019-01-09 Charlie Turner <cturner@igalia.com> >+ >+ [GStreamer] Add sharedBuffer utility to GstMappedBuffer, and a testsuite >+ https://bugs.webkit.org/show_bug.cgi?id=192977 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * TestWebKitAPI/PlatformGTK.cmake: Build the new GStreamer test harness >+ * TestWebKitAPI/PlatformWPE.cmake: Ditto. >+ * TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.cpp: Added. >+ (TestWebKitAPI::GStreamerTest::SetUp): >+ (TestWebKitAPI::GStreamerTest::TearDown): >+ * TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.h: Added. >+ * TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp: Added. >+ (TestWebKitAPI::TEST_F): >+ > 2019-01-06 Fujii Hironori <Hironori.Fujii@sony.com> > > [Win][Clang] Fix compilation warnings of MiniBrowser >diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake >index 84499de398b25d25ac0c93602aaad1d690d3de8a..c34fae07cf3c6b0a39c399fee32cd25c3a0aa7f4 100644 >--- a/Tools/TestWebKitAPI/PlatformGTK.cmake >+++ b/Tools/TestWebKitAPI/PlatformGTK.cmake >@@ -25,6 +25,7 @@ include_directories( > include_directories(SYSTEM > ${GDK3_INCLUDE_DIRS} > ${GLIB_INCLUDE_DIRS} >+ ${GSTREAMER_INCLUDE_DIRS} > ${GTK3_INCLUDE_DIRS} > ${LIBSOUP_INCLUDE_DIRS} > ) >@@ -93,6 +94,8 @@ add_executable(TestWebCore > ${TESTWEBKITAPI_DIR}/Tests/WebCore/DNS.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/FileMonitor.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/FileSystem.cpp >+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/gstreamer/GstMappedBuffer.cpp >+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/gstreamer/GStreamerTest.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/GridPosition.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/HTMLParserIdioms.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp >diff --git a/Tools/TestWebKitAPI/PlatformWPE.cmake b/Tools/TestWebKitAPI/PlatformWPE.cmake >index fb1b6b52a3563880a52f685588c2e1fbbeabd9e1..b6877598d877de6c8da86b4eb57cc86ff0a2f7ef 100644 >--- a/Tools/TestWebKitAPI/PlatformWPE.cmake >+++ b/Tools/TestWebKitAPI/PlatformWPE.cmake >@@ -23,6 +23,7 @@ include_directories( > include_directories(SYSTEM > ${CAIRO_INCLUDE_DIRS} > ${GLIB_INCLUDE_DIRS} >+ ${GSTREAMER_INCLUDE_DIRS} > ${LIBSOUP_INCLUDE_DIRS} > ${WPE_INCLUDE_DIRS} > ${WPEBACKEND_FDO_INCLUDE_DIRS} >@@ -60,6 +61,8 @@ add_executable(TestWebCore > ${TESTWEBKITAPI_DIR}/TestsController.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/FileMonitor.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/FileSystem.cpp >+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/gstreamer/GstMappedBuffer.cpp >+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/gstreamer/GStreamerTest.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/HTMLParserIdioms.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/LayoutUnit.cpp > ${TESTWEBKITAPI_DIR}/Tests/WebCore/MIMETypeRegistry.cpp >diff --git a/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.cpp b/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.cpp >new file mode 100644 >index 0000000000000000000000000000000000000000..3d7f94de8e7fda4efdccbb932eba3908687ab8f5 >--- /dev/null >+++ b/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.cpp >@@ -0,0 +1,55 @@ >+/* >+ * Copyright (C) 2018 Igalia, S.L. >+ * Copyright (C) 2018 Metrological Group B.V. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+ * THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#include "config.h" >+ >+#if USE(GSTREAMER) >+#include "GStreamerTest.h" >+ >+#include <WebCore/GStreamerCommon.h> >+#include <gst/gst.h> >+ >+using namespace WebCore; >+ >+namespace TestWebKitAPI { >+ >+void GStreamerTest::SetUp() >+{ >+ if (!gst_is_initialized()) >+ gst_init(nullptr, nullptr); >+} >+ >+void GStreamerTest::TearDown() >+{ >+ // It might be tempting to call gst_deinit() here. However, that >+ // will tear down the whole process from the GStreamer POV, and the >+ // seemingly symmetrical call to gst_init() will fail to >+ // initialize GStreamer correctly. >+} >+ >+} // namespace TestWebKitAPI >+ >+#endif // USE(GSTREAMER) >diff --git a/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.h b/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.h >new file mode 100644 >index 0000000000000000000000000000000000000000..6b2cbaee6165c65979147086a7d01b2117bf5d9c >--- /dev/null >+++ b/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.h >@@ -0,0 +1,41 @@ >+/* >+ * Copyright (C) 2018 Igalia, S.L. >+ * Copyright (C) 2018 Metrological Group B.V. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+ * THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#pragma once >+ >+#if USE(GSTREAMER) >+ >+namespace TestWebKitAPI { >+ >+class GStreamerTest : public testing::Test { >+public: >+ void SetUp() override; >+ void TearDown() override; >+}; >+ >+} // namespace TestWebKitAPI >+ >+#endif // USE(GSTREAMER) >diff --git a/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp b/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp >new file mode 100644 >index 0000000000000000000000000000000000000000..80b2589981d3c5069a4735e2b82bff2883b4e705 >--- /dev/null >+++ b/Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GstMappedBuffer.cpp >@@ -0,0 +1,113 @@ >+/* >+ * Copyright (C) 2018 Igalia, S.L. >+ * Copyright (C) 2018 Metrological Group B.V. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >+ * THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#include "config.h" >+ >+#if USE(GSTREAMER) >+ >+#include "GStreamerTest.h" >+#include "SharedBuffer.h" >+#include "Test.h" >+#include <WebCore/GStreamerCommon.h> >+ >+using namespace WebCore; >+ >+namespace TestWebKitAPI { >+ >+TEST_F(GStreamerTest, mappedBufferBasics) >+{ >+ GRefPtr<GstBuffer> buf = adoptGRef(gst_buffer_new_allocate(nullptr, 64, nullptr)); >+ auto mappedBuf = GstMappedBuffer::create(buf.get(), GST_MAP_READ); >+ ASSERT_TRUE(mappedBuf.get()); >+ EXPECT_EQ(mappedBuf->size(), 64); >+ >+ auto mappedBuf2 = GstMappedBuffer::create(buf.get(), GST_MAP_READ); >+ ASSERT_TRUE(mappedBuf2.get()); >+ EXPECT_EQ(mappedBuf, mappedBuf2); >+ EXPECT_EQ(buf.get(), mappedBuf); >+ EXPECT_EQ(mappedBuf2, buf.get()); >+} >+ >+TEST_F(GStreamerTest, mappedBufferReadSanity) >+{ >+ gpointer memory = g_malloc(16); >+ memset(memory, 'x', 16); >+ GRefPtr<GstBuffer> buf = adoptGRef(gst_buffer_new_wrapped(memory, 16)); >+ auto mappedBuf = GstMappedBuffer::create(buf.get(), GST_MAP_READ); >+ ASSERT_TRUE(mappedBuf.get()); >+ EXPECT_EQ(mappedBuf->size(), 16); >+ EXPECT_EQ(memcmp(memory, mappedBuf->data(), 16), 0); >+ EXPECT_EQ(memcmp(memory, mappedBuf->sharedBuffer()->data(), 16), 0); >+} >+ >+TEST_F(GStreamerTest, mappedBufferWriteSanity) >+{ >+ gpointer memory = g_malloc(16); >+ memset(memory, 'x', 16); >+ GRefPtr<GstBuffer> buf = adoptGRef(gst_buffer_new_wrapped(memory, 16)); >+ >+ auto mappedBuf = GstMappedBuffer::create(buf.get(), GST_MAP_WRITE); >+ ASSERT_TRUE(mappedBuf.get()); >+ EXPECT_EQ(mappedBuf->size(), 16); >+ memset(mappedBuf->data(), 'y', mappedBuf->size()); >+ >+ EXPECT_EQ(memcmp(memory, mappedBuf->data(), 16), 0); >+ >+ // We should not share a writable buffer. >+ ASSERT_FALSE(mappedBuf->sharedBuffer()); >+} >+ >+TEST_F(GStreamerTest, mappedBufferCachesSharedBuffers) >+{ >+ GRefPtr<GstBuffer> buf = adoptGRef(gst_buffer_new_allocate(nullptr, 64, nullptr)); >+ auto mappedBuf = GstMappedBuffer::create(buf.get(), GST_MAP_READ); >+ ASSERT_TRUE(mappedBuf.get()); >+ RefPtr<SharedBuffer> sharedBuf = mappedBuf->sharedBuffer(); >+ // We expect the same data pointer wrapped by shared buffer, no >+ // copies need to be made. >+ EXPECT_EQ(sharedBuf->data(), mappedBuf->sharedBuffer()->data()); >+} >+ >+TEST_F(GStreamerTest, mappedBufferDoesNotAddExtraRefs) >+{ >+ // It is important not to ref the passed GStreamer buffers, if we >+ // do so, then in the case of writable buffers, they can become >+ // unwritable, even though we are the sole owners. We also don't >+ // want to take ownership of the buffer from the user-code, since >+ // for transformInPlace use-cases, that would break. >+ GRefPtr<GstBuffer> buf = adoptGRef(gst_buffer_new()); >+ >+ ASSERT_EQ(GST_OBJECT_REFCOUNT(buf.get()), 1); >+ >+ auto mappedBuf = GstMappedBuffer::create(buf.get(), GST_MAP_READWRITE); >+ ASSERT_TRUE(mappedBuf.get()); >+ >+ ASSERT_EQ(GST_OBJECT_REFCOUNT(buf.get()), 1); >+} >+ >+} // namespace TestWebKitAPI >+ >+#endif // USE(GSTREAMER)
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=358691">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 192977
:
357935
|
358495
|
358691
|
358770
|
358774
|
358790
|
359026
|
359027