Title: [213053] releases/WebKitGTK/webkit-2.16/Source/WebCore
- Revision
- 213053
- Author
- [email protected]
- Date
- 2017-02-27 05:59:12 -0800 (Mon, 27 Feb 2017)
Log Message
Merge r212830 - [GStreamer][EME] Fix issue with allowed systems extraction
https://bugs.webkit.org/show_bug.cgi?id=168717
Reviewed by Carlos Garcia Campos.
The allowed systems were not being extracted from the need-context
message because the loop was not stopping on the right condition.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::extractEventsAndSystemsFromMessage): Fix wrong
condition.
(WebCore::MediaPlayerPrivateGStreamerBase::handleProtectionEvent):
Add better debug category.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213052 => 213053)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-27 13:58:10 UTC (rev 213052)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-27 13:59:12 UTC (rev 213053)
@@ -1,3 +1,19 @@
+2017-02-22 Xabier Rodriguez Calvar <[email protected]>
+
+ [GStreamer][EME] Fix issue with allowed systems extraction
+ https://bugs.webkit.org/show_bug.cgi?id=168717
+
+ Reviewed by Carlos Garcia Campos.
+
+ The allowed systems were not being extracted from the need-context
+ message because the loop was not stopping on the right condition.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::extractEventsAndSystemsFromMessage): Fix wrong
+ condition.
+ (WebCore::MediaPlayerPrivateGStreamerBase::handleProtectionEvent):
+ Add better debug category.
+
2017-02-22 Antti Koivisto <[email protected]>
REGRESSION(r207669): Crash after mutating selector text
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (213052 => 213053)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2017-02-27 13:58:10 UTC (rev 213052)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2017-02-27 13:59:12 UTC (rev 213053)
@@ -268,7 +268,7 @@
ASSERT(streamEncryptionAllowedSystems);
Vector<String> streamEncryptionAllowedSystemsVector;
unsigned i;
- for (i = 0; !streamEncryptionAllowedSystems[i]; ++i)
+ for (i = 0; streamEncryptionAllowedSystems[i]; ++i)
streamEncryptionAllowedSystemsVector.append(streamEncryptionAllowedSystems[i]);
const GValue* streamEncryptionEventsList = gst_structure_get_value(structure, "stream-encryption-events");
@@ -1239,7 +1239,7 @@
void MediaPlayerPrivateGStreamerBase::handleProtectionEvent(GstEvent* event)
{
if (m_handledProtectionEvents.contains(GST_EVENT_SEQNUM(event))) {
- GST_TRACE("event %u already handled", GST_EVENT_SEQNUM(event));
+ GST_DEBUG("event %u already handled", GST_EVENT_SEQNUM(event));
m_handledProtectionEvents.remove(GST_EVENT_SEQNUM(event));
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
