mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-11-29 23:11:01 +00:00
Code Issues Projects Releases Wiki Activity

webrtcsink: don't use framerate halving as mitigation when 0/1

Browse source 
Fixes #65
This commit is contained in:
Mathieu Duponchelle 2022-06-08 01:33:32 +02:00
parent d40b804952
commit ec46b706e9
1 changed files with 66 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
plugins/src/webrtcsink/imp.rs
View file

@ -347,27 +347,71 @@ impl Default for State {
fn make_converter_for_video_caps(caps: &gst::Caps) -> Result<gst::Element, Error> { fn make_converter_for_video_caps(caps: &gst::Caps) -> Result<gst::Element, Error> {
assert!(caps.is_fixed()); assert!(caps.is_fixed());
if let Some(feature) = caps.features(0) { let video_info = gst_video::VideoInfo::from_caps(&caps)?;
if feature.contains(CUDA_MEMORY_FEATURE) {
return Ok(gst::parse_bin_from_description( let ret = gst::Bin::new(None);
"cudaupload ! cudaconvert ! cudascale ! videorate drop-only=true skip-to-first=true",
true, let (head, mut tail) = {
)? if let Some(feature) = caps.features(0) {
.upcast()); if feature.contains(CUDA_MEMORY_FEATURE) {
} else if feature.contains(GL_MEMORY_FEATURE) { let cudaupload = make_element("cudaupload", None)?;
return Ok(gst::parse_bin_from_description( let cudaconvert = make_element("cudaconvert", None)?;
"glupload ! glcolorconvert ! glcolorscale ! videorate drop-only=true skip-to-first=true", let cudascale = make_element("cudascale", None)?;
true,
)? ret.add_many(&[&cudaupload, &cudaconvert, &cudascale])?;
.upcast()); gst::Element::link_many(&[&cudaupload, &cudaconvert, &cudascale])?;
(cudaupload, cudascale)
} else if feature.contains(GL_MEMORY_FEATURE) {
let glupload = make_element("glupload", None)?;
let glconvert = make_element("glcolorconvert", None)?;
let glscale = make_element("glcolorscale", None)?;
ret.add_many(&[&glupload, &glconvert, &glscale])?;
gst::Element::link_many(&[&glupload, &glconvert, &glscale])?;
(glupload, glscale)
} else {
let convert = make_element("videoconvert", None)?;
let scale = make_element("videoscale", None)?;
ret.add_many(&[&convert, &scale])?;
gst::Element::link_many(&[&convert, &scale])?;
(convert, scale)
}
} else {
let convert = make_element("videoconvert", None)?;
let scale = make_element("videoscale", None)?;
ret.add_many(&[&convert, &scale])?;
gst::Element::link_many(&[&convert, &scale])?;
(convert, scale)
} }
};
ret.add_pad(
&gst::GhostPad::with_target(Some("sink"), &head.static_pad("sink").unwrap()).unwrap(),
)
.unwrap();
if video_info.fps().numer() != 0 {
let vrate = make_element("videorate", None)?;
vrate.set_property("drop-only", true);
vrate.set_property("skip-to-first", true);
ret.add(&vrate)?;
tail.link(&vrate)?;
tail = vrate;
} }
Ok(gst::parse_bin_from_description( ret.add_pad(
"videoconvert ! videoscale ! videorate drop-only=true skip-to-first=true", &gst::GhostPad::with_target(Some("src"), &tail.static_pad("src").unwrap()).unwrap(),
true, )
)? .unwrap();
.upcast())
Ok(ret.upcast())
} }
/// Default configuration for known encoders, can be disabled /// Default configuration for known encoders, can be disabled
@ -617,7 +661,10 @@ impl VideoEncoder {
s.set("height", height); s.set("height", height);
s.set("width", width); s.set("width", width);
s.set("framerate", self.halved_framerate);
if self.halved_framerate.numer() != 0 {
s.set("framerate", self.halved_framerate);
}
self.mitigation_mode = self.mitigation_mode =
WebRTCSinkMitigationMode::DOWNSAMPLED | WebRTCSinkMitigationMode::DOWNSCALED; WebRTCSinkMitigationMode::DOWNSAMPLED | WebRTCSinkMitigationMode::DOWNSCALED;