mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-02-17 05:15:14 +00:00
Code Issues Projects Releases Wiki Activity

threadshare: make live sources return NoPreroll from PlayingToPaused

Browse source 
Not returning NoPreroll in that transition causes downstream sinks
to wait for preroll forever.

Reproduce with:

gst-launch-1.0 audiotestsrc ! udpsink host=127.0.0.1 port=50000
gst-launch-1.0 ts-udpsrc address=127.0.0.1 port=50000 ! fakesink

ctrl + C in the receiver pipeline -> hangs forever
This commit is contained in:
Mathieu Duponchelle 2020-01-23 15:56:11 +01:00
parent 92941d7f92
commit decc1e2029
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-plugin-threadshare/src/appsrc.rs
View file

@ -718,6 +718,9 @@ impl ElementImpl for AppSrc {
runtime::executor::block_on(self.start(element)) runtime::executor::block_on(self.start(element))
.map_err(|_| gst::StateChangeError)?; .map_err(|_| gst::StateChangeError)?;
} }
gst::StateChange::PlayingToPaused => {
success = gst::StateChangeSuccess::NoPreroll;
}
gst::StateChange::PausedToReady => { gst::StateChange::PausedToReady => {
self.src_pad_handler self.src_pad_handler
.0 .0

14
gst-plugin-threadshare/src/jitterbuffer/jitterbuffer.rs
View file

@ -1373,13 +1373,19 @@ impl ElementImpl for JitterBuffer {
_ => (), _ => (),
} }
let mut ret = self.parent_change_state(element, transition)?; let mut success = self.parent_change_state(element, transition)?;
if transition == gst::StateChange::ReadyToPaused { match transition {
ret = gst::StateChangeSuccess::NoPreroll; gst::StateChange::ReadyToPaused => {
success = gst::StateChangeSuccess::NoPreroll;
}
gst::StateChange::PlayingToPaused => {
success = gst::StateChangeSuccess::NoPreroll;
}
_ => (),
} }
Ok(ret) Ok(success)
} }
} }

3
gst-plugin-threadshare/src/proxy.rs
View file

@ -1492,6 +1492,9 @@ impl ElementImpl for ProxySrc {
runtime::executor::block_on(self.start(element)) runtime::executor::block_on(self.start(element))
.map_err(|_| gst::StateChangeError)?; .map_err(|_| gst::StateChangeError)?;
} }
gst::StateChange::PlayingToPaused => {
success = gst::StateChangeSuccess::NoPreroll;
}
_ => (), _ => (),
} }

3
gst-plugin-threadshare/src/udpsrc.rs
View file

@ -1157,6 +1157,9 @@ impl ElementImpl for UdpSrc {
runtime::executor::block_on(self.start(element)) runtime::executor::block_on(self.start(element))
.map_err(|_| gst::StateChangeError)?; .map_err(|_| gst::StateChangeError)?;
} }
gst::StateChange::PlayingToPaused => {
success = gst::StateChangeSuccess::NoPreroll;
}
gst::StateChange::PausedToReady => { gst::StateChange::PausedToReady => {
self.src_pad_handler self.src_pad_handler
.0 .0