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-25 13:01:07 +00:00
Code Issues Projects Releases Wiki Activity

aws/s3hlssink: Do not call abort before finishing uploads

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1657>
This commit is contained in:
Sanchayan Maity 2024-07-05 11:35:12 +05:30 committed by Backport Bot
parent 5998e1dd9d
commit 4dfce290f2
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
net/aws/src/s3hlssink/imp.rs
View file

@ -413,7 +413,11 @@ impl S3HlsSink {
}; };
let mut state = self.state.lock().unwrap(); let mut state = self.state.lock().unwrap();
*state = State::Stopped *state = State::Stopped;
let mut canceller = self.canceller.lock().unwrap();
canceller.abort();
*canceller = s3utils::Canceller::None;
} }
fn create_stats(&self) -> gst::Structure { fn create_stats(&self) -> gst::Structure {
@ -802,19 +806,10 @@ impl ElementImpl for S3HlsSink {
PAD_TEMPLATES.as_ref() PAD_TEMPLATES.as_ref()
} }
#[allow(clippy::single_match)]
fn change_state( fn change_state(
&self, &self,
transition: gst::StateChange, transition: gst::StateChange,
) -> Result<gst::StateChangeSuccess, gst::StateChangeError> { ) -> Result<gst::StateChangeSuccess, gst::StateChangeError> {
match transition {
gst::StateChange::PausedToReady => {
let mut canceller = self.canceller.lock().unwrap();
canceller.abort();
}
_ => (),
}
let ret = self.parent_change_state(transition)?; let ret = self.parent_change_state(transition)?;
/* /*
* The settings lock must not be taken before the parent state change. * The settings lock must not be taken before the parent state change.
@ -823,6 +818,13 @@ impl ElementImpl for S3HlsSink {
*/ */
let settings = self.settings.lock().unwrap(); let settings = self.settings.lock().unwrap();
/*
* We do not call abort on the canceller in change_state here as
* that results in the final playlist and media segment uploads
* being aborted leaving the media segments and playlist in an
* unplayable state. All finalisation is carried out in `stop`
* which is called for ReadyToNull transition.
*/
match transition { match transition {
gst::StateChange::ReadyToPaused => { gst::StateChange::ReadyToPaused => {
let mut state = self.state.lock().unwrap(); let mut state = self.state.lock().unwrap();
@ -858,11 +860,6 @@ impl ElementImpl for S3HlsSink {
} }
} }
gst::StateChange::PausedToReady => {
let mut canceller = self.canceller.lock().unwrap();
*canceller = s3utils::Canceller::None;
}
gst::StateChange::ReadyToNull => { gst::StateChange::ReadyToNull => {
drop(settings); drop(settings);
/* /*