From 938d3d73b901859dcece0cf2473aeef896f5555c Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Sat, 9 Sep 2023 21:39:26 +0900 Subject: [PATCH] webrtcsink: Add support for d3d11 memory and qsvh264enc Adding d3d11 memory and qsvh264enc support Part-of: --- docs/plugins/gst_plugins_cache.json | 2 +- net/webrtc/src/webrtcsink/imp.rs | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json index 8acb8bc6..27115f78 100644 --- a/docs/plugins/gst_plugins_cache.json +++ b/docs/plugins/gst_plugins_cache.json @@ -5940,7 +5940,7 @@ "presence": "request" }, "video_%%u": { - "caps": "video/x-raw:\n\nvideo/x-raw(memory:CUDAMemory):\n\nvideo/x-raw(memory:GLMemory):\n\nvideo/x-raw(memory:NVMM):\n", + "caps": "video/x-raw:\n\nvideo/x-raw(memory:CUDAMemory):\n\nvideo/x-raw(memory:GLMemory):\n\nvideo/x-raw(memory:NVMM):\n\nvideo/x-raw(memory:D3D11Memory):\n", "direction": "sink", "presence": "request" } diff --git a/net/webrtc/src/webrtcsink/imp.rs b/net/webrtc/src/webrtcsink/imp.rs index 233a27d6..f65a5ef0 100644 --- a/net/webrtc/src/webrtcsink/imp.rs +++ b/net/webrtc/src/webrtcsink/imp.rs @@ -34,6 +34,7 @@ static CAT: Lazy = Lazy::new(|| { const CUDA_MEMORY_FEATURE: &str = "memory:CUDAMemory"; const GL_MEMORY_FEATURE: &str = "memory:GLMemory"; const NVMM_MEMORY_FEATURE: &str = "memory:NVMM"; +const D3D11_MEMORY_FEATURE: &str = "memory:D3D11Memory"; const RTP_TWCC_URI: &str = "http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01"; @@ -347,6 +348,14 @@ fn make_converter_for_video_caps(caps: &gst::Caps, codec: &Codec) -> Result { + enc.set_property("bitrate", start_bitrate / 1000); + enc.set_property("gop-size", 2560u32); + enc.set_property("low-latency", true); + enc.set_property("disable-hrd-conformance", true); + enc.set_property_from_str("rate-control", "cbr"); + } _ => (), } } @@ -688,7 +704,7 @@ impl VideoEncoder { pub fn bitrate(&self) -> i32 { match self.factory_name.as_str() { "vp8enc" | "vp9enc" => self.element.property::("target-bitrate"), - "x264enc" | "nvh264enc" | "vaapih264enc" | "vaapivp8enc" => { + "x264enc" | "nvh264enc" | "vaapih264enc" | "vaapivp8enc" | "qsvh264enc" => { (self.element.property::("bitrate") * 1000) as i32 } "nvv4l2h264enc" | "nvv4l2vp8enc" | "nvv4l2vp9enc" => { @@ -715,7 +731,7 @@ impl VideoEncoder { pub fn set_bitrate(&mut self, element: &super::WebRTCSink, bitrate: i32) { match self.factory_name.as_str() { "vp8enc" | "vp9enc" => self.element.set_property("target-bitrate", bitrate), - "x264enc" | "nvh264enc" | "vaapih264enc" | "vaapivp8enc" => self + "x264enc" | "nvh264enc" | "vaapih264enc" | "vaapivp8enc" | "qsvh264enc" => self .element .set_property("bitrate", (bitrate / 1000) as u32), "nvv4l2h264enc" | "nvv4l2vp8enc" | "nvv4l2vp9enc" => { @@ -2871,7 +2887,12 @@ impl ElementImpl for WebRTCSink { gst::Structure::builder("video/x-raw").build(), gst::CapsFeatures::new([NVMM_MEMORY_FEATURE]), ) + .structure_with_features( + gst::Structure::builder("video/x-raw").build(), + gst::CapsFeatures::new([D3D11_MEMORY_FEATURE]), + ) .build(); + let video_pad_template = gst::PadTemplate::new( "video_%u", gst::PadDirection::Sink,