Changeset 268908 in webkit

Timestamp:

Oct 23, 2020, 1:25:22 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r268392 - [GStreamer] Crash in WebCore::GStreamerRegistryScanner::isAVC1CodecSupported
​https://bugs.webkit.org/show_bug.cgi?id=217647

Reviewed by Xabier Rodriguez-Calvar.

Source/WebCore:

The registry scanner was assuming the avc1 codec field is always of the form
avc1.codecprofile, which is wrong.

Covered by test: media/media-can-play-mpeg4-video.html

• platform/graphics/gstreamer/GStreamerRegistryScanner.cpp:

(WebCore::GStreamerRegistryScanner::isAVC1CodecSupported const): Check for '.' presence and
fallback to unconstrained check if no profile or level information was extracted.

LayoutTests:

• media/media-can-play-mpeg4-video-expected.txt:
• media/media-can-play-mpeg4-video.html: Add test for "avc1" codec.

Location:

releases/WebKitGTK/webkit-2.30

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-can-play-mpeg4-video-expected.txt (modified) (1 diff)
• LayoutTests/media/media-can-play-mpeg4-video.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.30/LayoutTests/ChangeLog

@@ +1 @@
+2020-10-13  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Crash in WebCore::GStreamerRegistryScanner::isAVC1CodecSupported
+        https://bugs.webkit.org/show_bug.cgi?id=217647
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        * media/media-can-play-mpeg4-video-expected.txt:
+        * media/media-can-play-mpeg4-video.html: Add test for "avc1" codec.
+
 2020-08-28  Adrian Perez de Castro  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.30/LayoutTests/media/media-can-play-mpeg4-video-expected.txt

@@ -6 +6 @@
 EXPECTED (video.canPlayType('video/x-m4v') == 'maybe') OK
 EXPECTED (video.canPlayType('video/mp4') == 'maybe') OK
+EXPECTED (video.canPlayType('video/mp4; Codecs="avc1"') == 'probably') OK
 EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"') == 'probably') OK
 EXPECTED (video.canPlayType(' Video/MP4 ; CODECS="mp4v.20.8, mp4a.40.2"') == 'probably') OK

releases/WebKitGTK/webkit-2.30/LayoutTests/media/media-can-play-mpeg4-video.html

@@ -10 +10 @@
                 testExpected("video.canPlayType('video/x-m4v')", "maybe");
                 testExpected("video.canPlayType('video/mp4')", "maybe");
+                testExpected("video.canPlayType('video/mp4; Codecs=\"avc1\"')", "probably");
                 testExpected("video.canPlayType('video/mp4; Codecs=\"avc1.4D400C\"')", "probably");
                 testExpected("video.canPlayType('        Video/MP4 ; CODECS=\"mp4v.20.8, mp4a.40.2\"')", "probably");

releases/WebKitGTK/webkit-2.30/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-13  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Crash in WebCore::GStreamerRegistryScanner::isAVC1CodecSupported
+        https://bugs.webkit.org/show_bug.cgi?id=217647
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        The registry scanner was assuming the avc1 codec field is always of the form
+        avc1.codecprofile, which is wrong.
+
+        Covered by test: media/media-can-play-mpeg4-video.html
+
+        * platform/graphics/gstreamer/GStreamerRegistryScanner.cpp:
+        (WebCore::GStreamerRegistryScanner::isAVC1CodecSupported const): Check for '.' presence and
+        fallback to unconstrained check if no profile or level information was extracted.
+
 2020-10-13  Adrian Perez de Castro  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.30/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp

@@ -363 +363 @@
 bool GStreamerRegistryScanner::isAVC1CodecSupported(const String& codec, bool shouldCheckForHardwareUse) const
 {
-    auto components = codec.split('.');
-    long int spsAsInteger = strtol(components[1].utf8().data(), nullptr, 16);
-    uint8_t sps[3];
-    sps[0] = spsAsInteger >> 16;
-    sps[1] = spsAsInteger >> 8;
-    sps[2] = spsAsInteger;
-
-    const char* profile = gst_codec_utils_h264_get_profile(sps, 3);
-    const char* level = gst_codec_utils_h264_get_level(sps, 3);
-
-    // To avoid going through a class hierarchy for such a simple
-    // string conversion, we use a little trick here: See
-    // https://bugs.webkit.org/show_bug.cgi?id=201870.
-    char levelAsStringFallback[2] = { '\0', '\0' };
-    if (!level && sps[2] > 0 && sps[2] <= 5) {
-        levelAsStringFallback[0] = static_cast<char>('0' + sps[2]);
-        level = levelAsStringFallback;
-    }
-
-    if (!profile || !level) {
-        GST_ERROR("H.264 profile / level was not recognised in codec %s", codec.utf8().data());
-        return false;
-    }
-
-    GST_DEBUG("Codec %s translates to H.264 profile %s and level %s", codec.utf8().data(), profile, level);
-
     auto checkH264Caps = [&](const char* capsString) {
         bool supported = false;
@@ -398 +372 @@
         return supported;
     };
+
+    if (codec.find('.') == notFound) {
+        GST_DEBUG("Codec has no profile/level, falling back to unconstrained caps");
+        return checkH264Caps("video/x-h264");
+    }
+
+    auto components = codec.split('.');
+    long int spsAsInteger = strtol(components[1].utf8().data(), nullptr, 16);
+    uint8_t sps[3];
+    sps[0] = spsAsInteger >> 16;
+    sps[1] = spsAsInteger >> 8;
+    sps[2] = spsAsInteger;
+
+    const char* profile = gst_codec_utils_h264_get_profile(sps, 3);
+    const char* level = gst_codec_utils_h264_get_level(sps, 3);
+
+    // To avoid going through a class hierarchy for such a simple
+    // string conversion, we use a little trick here: See
+    // https://bugs.webkit.org/show_bug.cgi?id=201870.
+    char levelAsStringFallback[2] = { '\0', '\0' };
+    if (!level && sps[2] > 0 && sps[2] <= 5) {
+        levelAsStringFallback[0] = static_cast<char>('0' + sps[2]);
+        level = levelAsStringFallback;
+    }
+
+    if (!profile || !level) {
+        GST_ERROR("H.264 profile / level was not recognised in codec %s", codec.utf8().data());
+        return false;
+    }
+
+    GST_DEBUG("Codec %s translates to H.264 profile %s and level %s", codec.utf8().data(), profile, level);
 
     if (const char* maxVideoResolution = g_getenv("WEBKIT_GST_MAX_AVC1_RESOLUTION")) {