[webkit-changes] [288883] trunk/Source/WebCore

Tue, 01 Feb 2022 09:17:56 -0800

Title: [288883] trunk/Source/WebCore
Revision
288883
Author
[email protected]
Date
2022-02-01 09:17:04 -0800 (Tue, 01 Feb 2022)

Log Message

[GStreamer] Support for vpx in webrtc encoder
https://bugs.webkit.org/show_bug.cgi?id=235870

Patch by Philippe Normand <[email protected]> on 2022-02-01
Reviewed by Xabier Rodriguez-Calvar.

Add support for encoding to VP8 and VP9. The encoder is now available outside of the WebRTC
backend, so that it can potentially be auto-plugged (which will be useful for the
MediaRecorder support). In order to allow this metadata and pad templates were also added to
the element.

* platform/graphics/gstreamer/GStreamerCommon.cpp:
(WebCore::registerWebKitGStreamerElements):
* platform/mediastream/gstreamer/GStreamerVideoEncoder.cpp:
(webkit_webrtc_video_encoder_class_init):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (288882 => 288883)


--- trunk/Source/WebCore/ChangeLog	2022-02-01 16:53:24 UTC (rev 288882)
+++ trunk/Source/WebCore/ChangeLog	2022-02-01 17:17:04 UTC (rev 288883)
@@ -1,3 +1,20 @@
+2022-02-01  Philippe Normand  <[email protected]>
+
+        [GStreamer] Support for vpx in webrtc encoder
+        https://bugs.webkit.org/show_bug.cgi?id=235870
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Add support for encoding to VP8 and VP9. The encoder is now available outside of the WebRTC
+        backend, so that it can potentially be auto-plugged (which will be useful for the
+        MediaRecorder support). In order to allow this metadata and pad templates were also added to
+        the element.
+
+        * platform/graphics/gstreamer/GStreamerCommon.cpp:
+        (WebCore::registerWebKitGStreamerElements):
+        * platform/mediastream/gstreamer/GStreamerVideoEncoder.cpp:
+        (webkit_webrtc_video_encoder_class_init):
+
 2022-02-01  Antoine Quint  <[email protected]>
 
         Redefining @keyframes does not work

Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp (288882 => 288883)


--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp	2022-02-01 16:53:24 UTC (rev 288882)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp	2022-02-01 17:17:04 UTC (rev 288883)
@@ -56,6 +56,7 @@
 
 #if ENABLE(MEDIA_STREAM)
 #include "GStreamerMediaStreamSource.h"
+#include "GStreamerVideoEncoder.h"
 #endif
 
 #if ENABLE(ENCRYPTED_MEDIA)
@@ -317,6 +318,7 @@
 
 #if ENABLE(MEDIA_STREAM)
         gst_element_register(nullptr, "mediastreamsrc", GST_RANK_PRIMARY, WEBKIT_TYPE_MEDIA_STREAM_SRC);
+        gst_element_register(nullptr, "webrtcvideoencoder", GST_RANK_PRIMARY + 100, WEBKIT_TYPE_WEBRTC_VIDEO_ENCODER);
 #endif
 
 #if ENABLE(MEDIA_SOURCE)

Modified: trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoEncoder.cpp (288882 => 288883)


--- trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoEncoder.cpp	2022-02-01 16:53:24 UTC (rev 288882)
+++ trunk/Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoEncoder.cpp	2022-02-01 17:17:04 UTC (rev 288883)
@@ -35,7 +35,7 @@
 #define KBIT_TO_BIT 1024
 
 static GstStaticPadTemplate sinkTemplate = GST_STATIC_PAD_TEMPLATE("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS("video/x-raw(ANY)"));
-static GstStaticPadTemplate srcTemplate = GST_STATIC_PAD_TEMPLATE("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS("video/x-h264"));
+static GstStaticPadTemplate srcTemplate = GST_STATIC_PAD_TEMPLATE("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS("video/x-h264;video/x-vp8;video/x-vp9"));
 
 using SetBitrateFunc = Function<void(GObject* encoder, const char* propertyName, int bitrate)>;
 using SetupFunc = Function<void(WebKitWebrtcVideoEncoder*)>;
@@ -51,7 +51,14 @@
     const char* keyframeIntervalPropertyName;
 };
 
-enum EncoderId { None, X264, OpenH264, OmxH264 };
+enum EncoderId {
+    None,
+    X264,
+    OpenH264,
+    OmxH264,
+    Vp8,
+    Vp9
+};
 
 class Encoders {
 public:
@@ -97,7 +104,7 @@
 
 #define webkit_webrtc_video_encoder_parent_class parent_class
 WEBKIT_DEFINE_TYPE_WITH_CODE(WebKitWebrtcVideoEncoder, webkit_webrtc_video_encoder, GST_TYPE_BIN,
-    GST_DEBUG_CATEGORY_INIT(webrtc_venc_debug, "webrtcencoder", 0, "Video encoder for WebRTC"))
+    GST_DEBUG_CATEGORY_INIT(webrtc_venc_debug, "webkitwebrtcencoder", 0, "Video encoder for WebRTC"))
 
 enum {
     PROP_FORMAT = 1,
@@ -258,6 +265,11 @@
     objectClass->get_property = webrtcVideoEncoderGetProperty;
     objectClass->set_property = webrtcVideoEncoderSetProperty;
 
+    GstElementClass* elementClass = GST_ELEMENT_CLASS(klass);
+    gst_element_class_set_static_metadata(elementClass, "WebKit WebRTC video encoder", "Codec/Encoder/Video", "Encodes video for streaming", "Igalia");
+    gst_element_class_add_pad_template(elementClass, gst_static_pad_template_get(&sinkTemplate));
+    gst_element_class_add_pad_template(elementClass, gst_static_pad_template_get(&srcTemplate));
+
     g_object_class_install_property(objectClass, PROP_FORMAT, g_param_spec_boxed("format", "Format as caps", "Set the caps of the format to be used.", GST_TYPE_CAPS, WEBKIT_PARAM_READWRITE));
 
     g_object_class_install_property(objectClass, PROP_ENCODER, g_param_spec_object("encoder", "The actual encoder element", "The encoder element", GST_TYPE_ELEMENT, WEBKIT_PARAM_READABLE));
@@ -285,6 +297,14 @@
         [](WebKitWebrtcVideoEncoder* self) {
             g_object_set(self->priv->parser.get(), "config-interval", 1, nullptr);
         }, "bitrate", setBitrateBitPerSec, "gop-size");
+    Encoders::registerEncoder(Vp8, "vp8enc", nullptr, "video/x-vp8", nullptr,
+        [](WebKitWebrtcVideoEncoder* self) {
+            gst_preset_load_preset(GST_PRESET(self->priv->encoder.get()), "Profile Realtime");
+        }, "target-bitrate", setBitrateBitPerSec, "keyframe-max-dist");
+    Encoders::registerEncoder(Vp9, "vp9enc", nullptr, "video/x-vp9", nullptr,
+        [](WebKitWebrtcVideoEncoder* self) {
+            g_object_set(self->priv->encoder.get(), "threads", 4, "cpu-used", 4, "tile-rows", 2, "row-mt", true, nullptr);
+        }, "target-bitrate", setBitrateBitPerSec, "keyframe-max-dist");
 }
 
 #endif // ENABLE(VIDEO) && ENABLE(MEDIA_STREAM) && USE(GSTREAMER)

Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoEncoderFactory.cpp (288882 => 288883)


--- trunk/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoEncoderFactory.cpp	2022-02-01 16:53:24 UTC (rev 288882)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/gstreamer/GStreamerVideoEncoderFactory.cpp	2022-02-01 17:17:04 UTC (rev 288883)
@@ -24,7 +24,6 @@
 #include "GStreamerVideoEncoderFactory.h"
 
 #include "GStreamerVideoCommon.h"
-#include "GStreamerVideoEncoder.h"
 #include "GStreamerVideoFrameLibWebRTC.h"
 #include "LibWebRTCWebKitMacros.h"
 #include "webrtc/api/video_codecs/vp9_profile.h"
@@ -423,9 +422,6 @@
     static std::once_flag debugRegisteredFlag;
     std::call_once(debugRegisteredFlag, [] {
         GST_DEBUG_CATEGORY_INIT(webkit_webrtcenc_debug, "webkitlibwebrtcvideoencoder", 0, "WebKit WebRTC video encoder");
-        auto factory = adoptGRef(gst_element_factory_find("webrtcvideoencoder"));
-        if (!factory)
-            gst_element_register(nullptr, "webrtcvideoencoder", GST_RANK_NONE, WEBKIT_TYPE_WEBRTC_VIDEO_ENCODER);
     });
 }
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to