Changeset 237800 in webkit

Timestamp:

Nov 5, 2018, 7:05:39 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[GStreamer][WebRTC] properly mark H.264 stream type in the "decoder"
​https://bugs.webkit.org/show_bug.cgi?id=190676

Patch by Thibault Saunier <​tsaunier@igalia.com> on 2018-11-05
Reviewed by Philippe Normand.

Avoiding to have h264parse make assumption (which might be wrong at some
point).

• platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp:

(WebCore::GStreamerVideoDecoder::GetCapsForFrame):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-05  Thibault Saunier  <tsaunier@igalia.com>
+
+        [GStreamer][WebRTC] properly mark H.264 stream type in the "decoder"
+        https://bugs.webkit.org/show_bug.cgi?id=190676
+
+        Reviewed by Philippe Normand.
+
+        Avoiding to have h264parse make assumption (which might be wrong at some
+        point).
+
+        * platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp:
+        (WebCore::GStreamerVideoDecoder::GetCapsForFrame):
+
 2018-11-05  Thibault Saunier  <tsaunier@igalia.com>
 

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

@@ -75 +75 @@
     }
 
-    int32_t InitDecode(const webrtc::VideoCodec*, int32_t)
+    int32_t InitDecode(const webrtc::VideoCodec*, int32_t) override
     {
         m_src = makeElement("appsrc");
@@ -183 +183 @@
     }
 
-    GstCaps* GetCapsForFrame(const webrtc::EncodedImage& image)
+    virtual GstCaps* GetCapsForFrame(const webrtc::EncodedImage& image)
     {
         if (!m_caps) {
@@ -276 +276 @@
 public:
     H264Decoder() { }
+
+    int32_t InitDecode(const webrtc::VideoCodec* codecInfo, int32_t nCores) final
+    {
+        if (codecInfo && codecInfo->codecType != webrtc::kVideoCodecH264)
+            return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
+
+        m_profile = nullptr;
+        if (codecInfo) {
+            auto h264Info = codecInfo->H264();
+
+            switch (h264Info.profile) {
+            case webrtc::H264::kProfileConstrainedBaseline:
+                m_profile = "constrained-baseline";
+                break;
+            case webrtc::H264::kProfileBaseline:
+                m_profile = "baseline";
+                break;
+            case webrtc::H264::kProfileMain:
+                m_profile = "main";
+                break;
+            case webrtc::H264::kProfileConstrainedHigh:
+                m_profile = "constrained-high";
+                break;
+            case webrtc::H264::kProfileHigh:
+                m_profile = "high";
+                break;
+            }
+        }
+
+        return GStreamerVideoDecoder::InitDecode(codecInfo, nCores);
+    }
+
+    GstCaps* GetCapsForFrame(const webrtc::EncodedImage& image) final
+    {
+        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",
+                "alignment", G_TYPE_STRING, "au",
+                nullptr));
+        }
+
+        return m_caps.get();
+    }
     const gchar* Caps() final { return "video/x-h264"; }
     const gchar* Name() final { return cricket::kH264CodecName; }
     webrtc::VideoCodecType CodecType() final { return webrtc::kVideoCodecH264; }
+
+private:
+    const gchar* m_profile;
 };