Changeset 242881 in webkit

Timestamp:

Mar 13, 2019, 8:28:08 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer][WebRTC]: Use codec setting video height/width as fallback
​https://bugs.webkit.org/show_bug.cgi?id=195675

Patch by Thibault Saunier <​tsaunier@igalia.com> on 2019-03-13
Reviewed by Philippe Normand.

In some cases the frame height and width is not set (not sure why/ in
what conditions but it happens) so make sure to get the information from
the VideoCodec when configuring the encoder.

• platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp:

(WebCore::GStreamerVideoDecoder::GStreamerVideoDecoder):
(WebCore::GStreamerVideoDecoder::GetCapsForFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-13  Thibault Saunier  <tsaunier@igalia.com>
+
+        [GStreamer][WebRTC]: Use codec setting video height/width as fallback
+        https://bugs.webkit.org/show_bug.cgi?id=195675
+
+        Reviewed by Philippe Normand.
+
+        In some cases the frame height and width is not set (not sure why/ in
+        what conditions but it happens) so make sure to get the information from
+        the VideoCodec when configuring the encoder.
+
+        * platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp:
+        (WebCore::GStreamerVideoDecoder::GStreamerVideoDecoder):
+        (WebCore::GStreamerVideoDecoder::GetCapsForFrame):
+
 2019-03-13  Miguel Gomez  <magomez@igalia.com>
 

trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp

@@ -55 +55 @@
     GStreamerVideoDecoder()
         : m_pictureId(0)
+        , m_width(0)
+        , m_height(0)
         , m_firstBufferPts(GST_CLOCK_TIME_NONE)
         , m_firstBufferDts(GST_CLOCK_TIME_NONE)
@@ -81 +83 @@
     }
 
-    int32_t InitDecode(const webrtc::VideoCodec*, int32_t) override
+    int32_t InitDecode(const webrtc::VideoCodec* codecSettings, int32_t) override
     {
         m_src = makeElement("appsrc");
@@ -87 +89 @@
         auto capsfilter = CreateFilter();
         auto decoder = makeElement("decodebin");
+
+        if (codecSettings) {
+            m_width = codecSettings->width;
+            m_height = codecSettings->height;
+        }
 
         // Make the decoder output "parsed" frames only and let the main decodebin
@@ -194 +201 @@
         if (!m_caps) {
             m_caps = adoptGRef(gst_caps_new_simple(Caps(),
-                "width", G_TYPE_INT, image._encodedWidth,
-                "height", G_TYPE_INT, image._encodedHeight,
+                "width", G_TYPE_INT, image._encodedWidth ? image._encodedWidth : m_width,
+                "height", G_TYPE_INT, image._encodedHeight ? image._encodedHeight : m_height,
                 nullptr));
         }
@@ -270 +277 @@
     GRefPtr<GstCaps> m_caps;
     gint m_pictureId;
+    gint m_width;
+    gint m_height;
 
 private:
@@ -328 +337 @@
         if (!m_caps) {
             m_caps = adoptGRef(gst_caps_new_simple(Caps(),
-                "width", G_TYPE_INT, image._encodedWidth,
-                "height", G_TYPE_INT, image._encodedHeight,
-                "profile", G_TYPE_STRING, m_profile ? m_profile : "baseline",
-                "stream-format", G_TYPE_STRING, "byte-stream",
+                "width", G_TYPE_INT, image._encodedWidth ? image._encodedWidth : m_width,
+                "height", G_TYPE_INT, image._encodedHeight ? image._encodedHeight : m_height,
                 "alignment", G_TYPE_STRING, "au",
                 nullptr));