Attachment 339731 Details for Bug 185382 – Patch

[patch] Patch

bug-185382-20180507195644.patch (text/plain), 2.01 KB, created by Yacine Bandou on 2018-05-07 10:56:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yacine Bandou

Created: 2018-05-07 10:56:43 PDT

Size: 2.01 KB

patch

obsolete

>Subversion Revision: 231044
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index a25e5960b120c721c2cabdf388e562a3e094640e..51c0d1c16fd62ec9a7caa3a3a00ad41618703e89 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-07  Yacine Bandou  <yacine.bandou_ext@softathome.com>
>+
>+        [EME][GStreamer] Fix wrong subsample parsing on r227067
>+        https://bugs.webkit.org/show_bug.cgi?id=185382
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-04  Yacine Bandou  <yacine.bandou_ext@softathome.com>
> 
>         [EME][GStreamer] Add a handler for GStreamer protection event
>diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp
>index bd8fc24bb30c20fdf6c472ecf4af5fe6bb37639f..638c4c1958d442c698268323ac8cc9261dc92a5d 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitClearKeyDecryptorGStreamer.cpp
>@@ -250,6 +250,7 @@ static gboolean webKitMediaClearKeyDecryptorDecrypt(WebKitMediaCommonEncryptionD
>     bool returnValue = true;
>     GstByteReader* reader;
>     unsigned position = 0;
>+    unsigned sampleIndex = 0;
>     GstMapInfo subSamplesMap;
> 
>     if (!subSampleCount) {
>@@ -287,7 +288,6 @@ static gboolean webKitMediaClearKeyDecryptorDecrypt(WebKitMediaCommonEncryptionD
>     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)

Actions: View | Formatted Diff | Diff

Attachments on bug 185382: 339731