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-01-10 19:25:26 +00:00
Code Issues Projects Releases Wiki Activity

textwrap: switch accumulate-time property to uint64

Browse source 
and use 0 instead of -1 to disable accumulation. In practice 0
already had the same effect, and this lets us get rid of unsafe
code that actually breaks inspection of the element.
This commit is contained in:
Mathieu Duponchelle 2021-06-23 16:30:39 +02:00
parent 3a2d16f00c
commit 77c59f4f13
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
text/wrap/src/gsttextwrap/imp.rs
View file

@ -15,7 +15,6 @@
// Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
// Boston, MA 02110-1335, USA. // Boston, MA 02110-1335, USA.
use glib::translate::{from_glib, IntoGlib};
use gst::glib; use gst::glib;
use gst::prelude::*; use gst::prelude::*;
use gst::subclass::prelude::*; use gst::subclass::prelude::*;
@ -42,14 +41,14 @@ static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
const DEFAULT_DICTIONARY: Option<String> = None; const DEFAULT_DICTIONARY: Option<String> = None;
const DEFAULT_COLUMNS: u32 = 32; /* CEA 608 max columns */ const DEFAULT_COLUMNS: u32 = 32; /* CEA 608 max columns */
const DEFAULT_LINES: u32 = 0; const DEFAULT_LINES: u32 = 0;
const DEFAULT_ACCUMULATE: i64 = -1; const DEFAULT_ACCUMULATE: gst::ClockTime = gst::ClockTime::ZERO;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
struct Settings { struct Settings {
dictionary: Option<String>, dictionary: Option<String>,
columns: u32, columns: u32,
lines: u32, lines: u32,
accumulate_time: Option<gst::ClockTime>, accumulate_time: gst::ClockTime,
} }
impl Default for Settings { impl Default for Settings {
@ -58,7 +57,7 @@ impl Default for Settings {
dictionary: DEFAULT_DICTIONARY, dictionary: DEFAULT_DICTIONARY,
columns: DEFAULT_COLUMNS, /* CEA 608 max columns */ columns: DEFAULT_COLUMNS, /* CEA 608 max columns */
lines: DEFAULT_LINES, lines: DEFAULT_LINES,
accumulate_time: None, accumulate_time: DEFAULT_ACCUMULATE,
} }
} }
} }
@ -170,13 +169,13 @@ impl TextWrap {
let accumulate_time = self.settings.lock().unwrap().accumulate_time; let accumulate_time = self.settings.lock().unwrap().accumulate_time;
let mut state = self.state.lock().unwrap(); let mut state = self.state.lock().unwrap();
if accumulate_time.is_some() { if !accumulate_time.is_zero() {
let mut bufferlist = gst::BufferList::new(); let mut bufferlist = gst::BufferList::new();
let n_lines = std::cmp::max(self.settings.lock().unwrap().lines, 1); let n_lines = std::cmp::max(self.settings.lock().unwrap().lines, 1);
if state if state
.start_ts .start_ts
.zip(accumulate_time) .zip(Some(accumulate_time))
.map_or(false, |(start_ts, accumulate_time)| { .map_or(false, |(start_ts, accumulate_time)| {
start_ts + accumulate_time < pts start_ts + accumulate_time < pts
}) })
@ -410,12 +409,7 @@ impl TextWrap {
if ret { if ret {
let (live, min, _) = peer_query.result(); let (live, min, _) = peer_query.result();
let our_latency: gst::ClockTime = self let our_latency: gst::ClockTime = self.settings.lock().unwrap().accumulate_time;
.settings
.lock()
.unwrap()
.accumulate_time
.unwrap_or(gst::ClockTime::ZERO);
gst_info!( gst_info!(
CAT, CAT,
obj: element, obj: element,
@ -512,13 +506,13 @@ impl ObjectImpl for TextWrap {
DEFAULT_LINES, DEFAULT_LINES,
glib::ParamFlags::READWRITE | gst::PARAM_FLAG_MUTABLE_PLAYING, glib::ParamFlags::READWRITE | gst::PARAM_FLAG_MUTABLE_PLAYING,
), ),
glib::ParamSpec::new_int64( glib::ParamSpec::new_uint64(
"accumulate-time", "accumulate-time",
"accumulate-time", "accumulate-time",
"Cut-off time for input text accumulation (-1=do not accumulate)", "Cut-off time for input text accumulation (0=do not accumulate)",
-1, 0,
std::i64::MAX, u64::MAX - 1,
DEFAULT_ACCUMULATE, DEFAULT_ACCUMULATE.nseconds(),
glib::ParamFlags::READWRITE | gst::PARAM_FLAG_MUTABLE_PLAYING, glib::ParamFlags::READWRITE | gst::PARAM_FLAG_MUTABLE_PLAYING,
), ),
] ]
@ -562,7 +556,7 @@ impl ObjectImpl for TextWrap {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let old_accumulate_time = settings.accumulate_time; let old_accumulate_time = settings.accumulate_time;
settings.accumulate_time = settings.accumulate_time =
unsafe { from_glib(value.get::<i64>().expect("type checked upstream")) }; gst::ClockTime::from_nseconds(value.get().expect("type checked upstream"));
if settings.accumulate_time != old_accumulate_time { if settings.accumulate_time != old_accumulate_time {
gst_debug!( gst_debug!(
CAT, CAT,
@ -594,7 +588,7 @@ impl ObjectImpl for TextWrap {
} }
"accumulate-time" => { "accumulate-time" => {
let settings = self.settings.lock().unwrap(); let settings = self.settings.lock().unwrap();
settings.accumulate_time.into_glib().to_value() settings.accumulate_time.nseconds().to_value()
} }
_ => unimplemented!(), _ => unimplemented!(),
} }