Title: [231448] trunk/Source/WebCore
- Revision
- 231448
- Author
- commit-qu...@webkit.org
- Date
- 2018-05-07 11:27:25 -0700 (Mon, 07 May 2018)
Log Message
[EME][GStreamer] Fix wrong subsample parsing on r227067
https://bugs.webkit.org/show_bug.cgi?id=185382
Patch by Yacine Bandou <yacine.bandou_...@softathome.com> on 2018-05-07
Reviewed by Philippe Normand.
The initialization of sampleIndex should be moved outside of the loop.
Without this patch we will have a bad log and the check of the subsample
count will be useless.
* platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:
(webKitMediaClearKeyDecryptorDecrypt):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (231447 => 231448)
--- trunk/Source/WebCore/ChangeLog 2018-05-07 18:16:15 UTC (rev 231447)
+++ trunk/Source/WebCore/ChangeLog 2018-05-07 18:27:25 UTC (rev 231448)
@@ -1,3 +1,17 @@
+2018-05-07 Yacine Bandou <yacine.bandou_...@softathome.com>
+
+ [EME][GStreamer] Fix wrong subsample parsing on r227067
+ https://bugs.webkit.org/show_bug.cgi?id=185382
+
+ Reviewed by Philippe Normand.
+
+ The initialization of sampleIndex should be moved outside of the loop.
+ Without this patch we will have a bad log and the check of the subsample
+ count will be useless.
+
+ * platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp:
+ (webKitMediaClearKeyDecryptorDecrypt):
+
2018-05-07 Daniel Bates <daba...@apple.com>
CSP should be passed the referrer
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp (231447 => 231448)
--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp 2018-05-07 18:16:15 UTC (rev 231447)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp 2018-05-07 18:27:25 UTC (rev 231448)
@@ -250,6 +250,7 @@
bool returnValue = true;
GstByteReader* reader;
unsigned position = 0;
+ unsigned sampleIndex = 0;
GstMapInfo subSamplesMap;
if (!subSampleCount) {
@@ -287,7 +288,6 @@
while (position < map.size) {
guint16 nBytesClear = 0;
guint32 nBytesEncrypted = 0;
- unsigned sampleIndex = 0;
if (sampleIndex < subSampleCount) {
if (!gst_byte_reader_get_uint16_be(reader, &nBytesClear)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
