archive/gst-flexhlssink-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Lock for a shorter time

Browse source
This commit is contained in:
Rafael Caricio 2021-05-19 14:30:43 +02:00
parent 1680d017ca
commit 4248d8a8dd
Signed by: rafaelcaricio
GPG key ID: 3C86DBCE8E93C947
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/imp.rs
View file

@ -1,10 +1,9 @@
use crate::playlist::PlaylistRenderState;
use gio::prelude::*; use gio::prelude::*;
use glib::subclass::prelude::*; use glib::subclass::prelude::*;
use gst::prelude::*; use gst::prelude::*;
use gst::subclass::prelude::*; use gst::subclass::prelude::*;
use gst::{gst_debug, gst_error, gst_info, gst_trace, gst_warning}; use gst::{gst_debug, gst_error, gst_info, gst_trace, gst_warning};
use crate::playlist::PlaylistRenderState;
use m3u8_rs::playlist::{MediaPlaylist, MediaSegment}; use m3u8_rs::playlist::{MediaPlaylist, MediaSegment};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use std::fs; use std::fs;
@ -43,7 +42,6 @@ struct Settings {
target_duration: u32, target_duration: u32,
send_keyframe_requests: bool, send_keyframe_requests: bool,
// TODO: old_locations ? Maybe just use another thread and send msgs with files to delete ?
splitmuxsink: Option<gst::Element>, splitmuxsink: Option<gst::Element>,
giostreamsink: Option<gst::Element>, giostreamsink: Option<gst::Element>,
video_sink: bool, video_sink: bool,
@ -108,8 +106,10 @@ impl FlexHlsSink {
) -> Result<gst::StateChangeSuccess, gst::StateChangeError> { ) -> Result<gst::StateChangeSuccess, gst::StateChangeError> {
gst_info!(CAT, obj: element, "Starting"); gst_info!(CAT, obj: element, "Starting");
let settings = self.settings.lock().unwrap(); let target_duration = {
let target_duration = settings.target_duration as f32; let settings = self.settings.lock().unwrap();
settings.target_duration as f32
};
let mut state = self.state.lock().unwrap(); let mut state = self.state.lock().unwrap();
if let State::Stopped = *state { if let State::Stopped = *state {
@ -131,7 +131,7 @@ impl FlexHlsSink {
playlist_index: 0, playlist_index: 0,
current_segment_location: None, current_segment_location: None,
fragment_opened_at: None, fragment_opened_at: None,
old_segment_locations: Vec::new(), old_segment_locations: vec![],
}; };
} }
@ -235,7 +235,7 @@ impl FlexHlsSink {
let mut state = self.state.lock().unwrap(); let mut state = self.state.lock().unwrap();
match &mut *state { match &mut *state {
State::Stopped => {} State::Stopped => return Err(gst::StateChangeError),
State::Started { State::Started {
fragment_opened_at, fragment_opened_at,
playlist, playlist,
@ -623,9 +623,7 @@ impl ObjectImpl for FlexHlsSink {
} }
} }
// Called right after construction of a new instance
fn constructed(&self, obj: &Self::Type) { fn constructed(&self, obj: &Self::Type) {
// Call the parent class' ::constructed() implementation first
self.parent_constructed(obj); self.parent_constructed(obj);
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();