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-06-02 13:29:50 +00:00
Code Issues Projects Releases Wiki Activity

Update for Seqnum/GroupId API changes

Browse source
This commit is contained in:
Sebastian Dröge 2020-01-25 01:20:37 +02:00
parent e2add3f2c8
commit 1e778e9827
6 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst-plugin-closedcaption/src/mcc_parse.rs
View file

@ -88,7 +88,7 @@ struct State {
// seeking
seeking: bool,
discont: bool,
seek_seqnum: gst::Seqnum,
seek_seqnum: Option<gst::Seqnum>,
last_raw_line: Vec<u8>,
replay_last_line: bool,
need_flush_stop: bool,
@ -112,7 +112,7 @@ impl Default for State {
pull: None,
seeking: false,
discont: false,
seek_seqnum: gst::event::SEQNUM_INVALID,
seek_seqnum: None,
last_raw_line: Vec::new(),
replay_last_line: false,
need_flush_stop: false,
@ -292,8 +292,8 @@ impl State {
if self.need_flush_stop {
let mut b = gst::Event::new_flush_stop(true);
if self.seek_seqnum != gst::event::SEQNUM_INVALID {
b = b.seqnum(self.seek_seqnum);
if let Some(seek_seqnum) = self.seek_seqnum {
b = b.seqnum(seek_seqnum);
}
events.push(b.build());
@ -330,8 +330,8 @@ impl State {
if self.need_segment {
let mut b = gst::Event::new_segment(&self.segment);
if self.seek_seqnum != gst::event::SEQNUM_INVALID {
b = b.seqnum(self.seek_seqnum);
if let Some(seek_seqnum) = self.seek_seqnum {
b = b.seqnum(seek_seqnum);
}
events.push(b.build());
@ -814,8 +814,8 @@ impl MccParse {
let mut events = state.create_events(element, None, framerate);
let mut eos_event = gst::Event::new_eos();
if state.seek_seqnum != gst::event::SEQNUM_INVALID {
eos_event = eos_event.seqnum(state.seek_seqnum);
if let Some(seek_seqnum) = state.seek_seqnum {
eos_event = eos_event.seqnum(seek_seqnum);
}
events.push(eos_event.build());
@ -1057,18 +1057,15 @@ impl MccParse {
}
state.seeking = true;
state.seek_seqnum = event.get_seqnum();
let seek_seqnum = event.get_seqnum();
state.seek_seqnum = Some(seek_seqnum);
let event = gst::Event::new_flush_start()
.seqnum(state.seek_seqnum)
.build();
let event = gst::Event::new_flush_start().seqnum(seek_seqnum).build();
gst_debug!(CAT, obj: element, "Sending event {:?} upstream", event);
self.sinkpad.push_event(event);
let event = gst::Event::new_flush_start()
.seqnum(state.seek_seqnum)
.build();
let event = gst::Event::new_flush_start().seqnum(seek_seqnum).build();
gst_debug!(CAT, obj: element, "Pushing event {:?}", event);
self.srcpad.push_event(event);
@ -1077,9 +1074,7 @@ impl MccParse {
state = self.flush(state);
let event = gst::Event::new_flush_stop(true)
.seqnum(state.seek_seqnum)
.build();
let event = gst::Event::new_flush_stop(true).seqnum(seek_seqnum).build();
/* Drop our state while we push a serialized event upstream */
drop(state);

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

@ -217,7 +217,7 @@ impl AppSrcPadHandler {
format!("{:08x}{:08x}", rand::random::<u32>(), rand::random::<u32>());
events.push(
gst::Event::new_stream_start(&stream_id)
.group_id(gst::util_group_id_next())
.group_id(gst::GroupId::next())
.build(),
);

2
gst-plugin-threadshare/src/tcpclientsrc.rs
View file

@ -277,7 +277,7 @@ impl TcpClientSrcPadHandler {
format!("{:08x}{:08x}", rand::random::<u32>(), rand::random::<u32>());
events.push(
gst::Event::new_stream_start(&stream_id)
.group_id(gst::util_group_id_next())
.group_id(gst::GroupId::next())
.build(),
);

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

@ -447,7 +447,7 @@ impl UdpSrcPadHandler {
format!("{:08x}{:08x}", rand::random::<u32>(), rand::random::<u32>());
events.push(
gst::Event::new_stream_start(&stream_id)
.group_id(gst::util_group_id_next())
.group_id(gst::GroupId::next())
.build(),
);

4
gst-plugin-threadshare/tests/pad.rs
View file

@ -866,7 +866,7 @@ fn nominal_scenario(
block_on(
elem_src_test.try_push(Item::Event(
gst::Event::new_stream_start(scenario_name)
.group_id(gst::util_group_id_next())
.group_id(gst::GroupId::next())
.build(),
)),
)
@ -973,7 +973,7 @@ fn nominal_scenario(
block_on(
elem_src_test.try_push(Item::Event(
gst::Event::new_stream_start(&format!("{}_past_stop", scenario_name))
.group_id(gst::util_group_id_next())
.group_id(gst::GroupId::next())
.build(),
)),
)

2
gst-plugin-togglerecord/src/togglerecord.rs
View file

@ -111,7 +111,7 @@ impl Default for StreamState {
Self {
in_segment: gst::FormattedSegment::new(),
out_segment: gst::FormattedSegment::new(),
segment_seqnum: gst::util_seqnum_next(),
segment_seqnum: gst::Seqnum::next(),
current_running_time: gst::CLOCK_TIME_NONE,
eos: false,
flushing: false,