Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/video
diff options
context:
space:
mode:
Diffstat (limited to 'video')
-rw-r--r--video/cdg/src/cdgparse.rs4
-rw-r--r--video/closedcaption/src/cea608overlay.rs2
-rw-r--r--video/closedcaption/src/cea608tott.rs2
-rw-r--r--video/closedcaption/src/mcc_enc.rs2
-rw-r--r--video/closedcaption/src/mcc_parse.rs26
-rw-r--r--video/closedcaption/src/scc_enc.rs2
-rw-r--r--video/closedcaption/src/scc_parse.rs4
-rw-r--r--video/closedcaption/src/tttocea608.rs6
-rw-r--r--video/closedcaption/tests/mcc_enc.rs2
-rw-r--r--video/closedcaption/tests/mcc_parse.rs21
-rw-r--r--video/closedcaption/tests/scc_enc.rs4
-rw-r--r--video/closedcaption/tests/scc_parse.rs2
-rw-r--r--video/closedcaption/tests/tttocea608.rs8
-rw-r--r--video/flavors/src/flvdemux.rs10
-rw-r--r--video/gif/tests/gifenc.rs2
-rw-r--r--video/rav1e/tests/rav1enc.rs2
-rw-r--r--video/rspng/tests/pngenc.rs2
17 files changed, 52 insertions, 49 deletions
diff --git a/video/cdg/src/cdgparse.rs b/video/cdg/src/cdgparse.rs
index 979cdc1da..bc85663b7 100644
--- a/video/cdg/src/cdgparse.rs
+++ b/video/cdg/src/cdgparse.rs
@@ -114,7 +114,7 @@ impl BaseParseImpl for CdgParse {
element.set_min_frame_size(CDG_PACKET_SIZE as u32);
/* Set duration */
- let mut query = gst::Query::new_duration(gst::Format::Bytes);
+ let mut query = gst::query::Duration::new(gst::Format::Bytes);
let pad = element.get_src_pad();
if pad.query(&mut query) {
let size = query.get_result();
@@ -143,7 +143,7 @@ impl BaseParseImpl for CdgParse {
],
);
- pad.push_event(gst::Event::new_caps(&src_caps).build());
+ pad.push_event(gst::event::Caps::new(&src_caps));
}
// Scan for CDG instruction
diff --git a/video/closedcaption/src/cea608overlay.rs b/video/closedcaption/src/cea608overlay.rs
index f9cd95eff..0ce2c9aa3 100644
--- a/video/closedcaption/src/cea608overlay.rs
+++ b/video/closedcaption/src/cea608overlay.rs
@@ -284,7 +284,7 @@ impl Cea608Overlay {
self.recalculate_layout(element, state)?;
- if !self.srcpad.push_event(gst::Event::new_caps(&caps).build()) {
+ if !self.srcpad.push_event(gst::event::Caps::new(&caps)) {
Err(gst::FlowError::NotNegotiated)
} else {
Ok(gst::FlowSuccess::Ok)
diff --git a/video/closedcaption/src/cea608tott.rs b/video/closedcaption/src/cea608tott.rs
index b235b7e5d..6e49e1c24 100644
--- a/video/closedcaption/src/cea608tott.rs
+++ b/video/closedcaption/src/cea608tott.rs
@@ -318,7 +318,7 @@ impl Cea608ToTt {
unreachable!();
};
- let new_event = gst::Event::new_caps(&new_caps).build();
+ let new_event = gst::event::Caps::new(&new_caps);
return self.srcpad.push_event(new_event);
}
diff --git a/video/closedcaption/src/mcc_enc.rs b/video/closedcaption/src/mcc_enc.rs
index 7a9fdfa16..3e5c2fd66 100644
--- a/video/closedcaption/src/mcc_enc.rs
+++ b/video/closedcaption/src/mcc_enc.rs
@@ -420,7 +420,7 @@ impl MccEnc {
},
)
.build();
- self.srcpad.push_event(gst::Event::new_caps(&caps).build())
+ self.srcpad.push_event(gst::event::Caps::new(&caps))
}
_ => pad.event_default(Some(element), event),
}
diff --git a/video/closedcaption/src/mcc_parse.rs b/video/closedcaption/src/mcc_parse.rs
index 9be176b5b..99411c22e 100644
--- a/video/closedcaption/src/mcc_parse.rs
+++ b/video/closedcaption/src/mcc_parse.rs
@@ -288,7 +288,7 @@ impl State {
let mut events = Vec::new();
if self.need_flush_stop {
- let mut b = gst::Event::new_flush_stop(true);
+ let mut b = gst::event::FlushStop::builder(true);
if let Some(seek_seqnum) = self.seek_seqnum {
b = b.seqnum(seek_seqnum);
@@ -300,7 +300,7 @@ impl State {
if let Some(pull) = &mut self.pull {
if pull.need_stream_start {
- events.push(gst::Event::new_stream_start(&pull.stream_id).build());
+ events.push(gst::event::StreamStart::new(&pull.stream_id));
pull.need_stream_start = false;
}
}
@@ -320,13 +320,13 @@ impl State {
.build(),
};
- events.push(gst::Event::new_caps(&caps).build());
+ events.push(gst::event::Caps::new(&caps));
gst_info!(CAT, obj: element, "Caps changed to {:?}", &caps);
}
}
if self.need_segment {
- let mut b = gst::Event::new_segment(&self.segment);
+ let mut b = gst::event::Segment::builder(&self.segment);
if let Some(seek_seqnum) = self.seek_seqnum {
b = b.seqnum(seek_seqnum);
@@ -590,7 +590,7 @@ impl MccParse {
element: &gst::Element,
) -> Result<(), gst::LoggableError> {
let mode = {
- let mut query = gst::Query::new_scheduling();
+ let mut query = gst::query::Scheduling::new();
let mut state = self.state.lock().unwrap();
state.pull = None;
@@ -664,7 +664,7 @@ impl MccParse {
gst_debug!(CAT, obj: element, "Scanning duration");
/* First let's query the bytes duration upstream */
- let mut q = gst::query::Query::new_duration(gst::Format::Bytes);
+ let mut q = gst::query::Duration::new(gst::Format::Bytes);
if !self.sinkpad.peer_query(&mut q) {
return Err(gst_loggable_error!(
@@ -758,7 +758,7 @@ impl MccParse {
match parse_timecode_rate(state.timecode_rate) {
Ok((framerate, _)) => {
let mut events = state.create_events(element, None, framerate);
- let mut eos_event = gst::Event::new_eos();
+ let mut eos_event = gst::event::Eos::builder();
if let Some(seek_seqnum) = state.seek_seqnum {
eos_event = eos_event.seqnum(seek_seqnum);
@@ -1006,12 +1006,16 @@ impl MccParse {
let seek_seqnum = event.get_seqnum();
state.seek_seqnum = Some(seek_seqnum);
- let event = gst::Event::new_flush_start().seqnum(seek_seqnum).build();
+ let event = gst::event::FlushStart::builder()
+ .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(seek_seqnum).build();
+ let event = gst::event::FlushStart::builder()
+ .seqnum(seek_seqnum)
+ .build();
gst_debug!(CAT, obj: element, "Pushing event {:?}", event);
self.srcpad.push_event(event);
@@ -1020,7 +1024,9 @@ impl MccParse {
state = self.flush(state);
- let event = gst::Event::new_flush_stop(true).seqnum(seek_seqnum).build();
+ let event = gst::event::FlushStop::builder(true)
+ .seqnum(seek_seqnum)
+ .build();
/* Drop our state while we push a serialized event upstream */
drop(state);
diff --git a/video/closedcaption/src/scc_enc.rs b/video/closedcaption/src/scc_enc.rs
index 949c3e4fc..d60079f88 100644
--- a/video/closedcaption/src/scc_enc.rs
+++ b/video/closedcaption/src/scc_enc.rs
@@ -269,7 +269,7 @@ impl SccEnc {
// We send our own caps downstream
let caps = gst::Caps::builder("application/x-scc").build();
- self.srcpad.push_event(gst::Event::new_caps(&caps).build())
+ self.srcpad.push_event(gst::event::Caps::new(&caps))
}
EventView::Eos(_) => {
let mut state = self.state.lock().unwrap();
diff --git a/video/closedcaption/src/scc_parse.rs b/video/closedcaption/src/scc_parse.rs
index 36bffa5fc..5bc5053fa 100644
--- a/video/closedcaption/src/scc_parse.rs
+++ b/video/closedcaption/src/scc_parse.rs
@@ -260,13 +260,13 @@ impl SccParse {
.field("format", &"raw")
.field("framerate", &framerate)
.build();
- events.push(gst::Event::new_caps(&caps).build());
+ events.push(gst::event::Caps::new(&caps));
state.framerate = Some(framerate);
}
if state.need_segment {
let segment = gst::FormattedSegment::<gst::format::Time>::new();
- events.push(gst::Event::new_segment(&segment).build());
+ events.push(gst::event::Segment::new(&segment));
state.need_segment = false;
}
diff --git a/video/closedcaption/src/tttocea608.rs b/video/closedcaption/src/tttocea608.rs
index dde0288a8..bd29169c9 100644
--- a/video/closedcaption/src/tttocea608.rs
+++ b/video/closedcaption/src/tttocea608.rs
@@ -296,7 +296,7 @@ impl TtToCea608 {
.mul_div_round(fps_d, fps_n)
.unwrap();
- let event = gst::Event::new_gap(start, end - start).build();
+ let event = gst::event::Gap::new(start, end - start);
drop(state);
@@ -635,7 +635,7 @@ impl TtToCea608 {
match query.view_mut() {
QueryView::Latency(ref mut q) => {
- let mut peer_query = gst::query::Query::new_latency();
+ let mut peer_query = gst::query::Latency::new();
let ret = self.sinkpad.peer_query(&mut peer_query);
@@ -702,7 +702,7 @@ impl TtToCea608 {
gst_debug!(CAT, obj: pad, "Pushing caps {}", caps);
- let new_event = gst::Event::new_caps(&downstream_caps).build();
+ let new_event = gst::event::Caps::new(&downstream_caps);
drop(state);
diff --git a/video/closedcaption/tests/mcc_enc.rs b/video/closedcaption/tests/mcc_enc.rs
index 9b5876e4a..1fbfe89fd 100644
--- a/video/closedcaption/tests/mcc_enc.rs
+++ b/video/closedcaption/tests/mcc_enc.rs
@@ -127,7 +127,7 @@ Time Code Rate=30DF\r\n\
};
assert_eq!(h.push(buf), Ok(gst::FlowSuccess::Ok));
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
let buf = h.pull().expect("Couldn't pull buffer");
let timecode = buf
diff --git a/video/closedcaption/tests/mcc_parse.rs b/video/closedcaption/tests/mcc_parse.rs
index 42b0f3c99..0ad06ee92 100644
--- a/video/closedcaption/tests/mcc_parse.rs
+++ b/video/closedcaption/tests/mcc_parse.rs
@@ -92,7 +92,7 @@ fn test_parse() {
data = &data[l..];
}
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
while let Some(buf) = h.try_pull() {
output_len += buf.get_size();
checksum = checksum.wrapping_add(
@@ -173,17 +173,14 @@ fn test_pull() {
}
/* Now seek and check that we receive buffers with appropriate PTS */
- h.push_upstream_event(
- gst::Event::new_seek(
- 1.0,
- gst::SeekFlags::FLUSH,
- gst::SeekType::Set,
- gst::GenericFormattedValue::Time(gst::SECOND),
- gst::SeekType::Set,
- gst::GenericFormattedValue::Time(2 * gst::SECOND),
- )
- .build(),
- );
+ h.push_upstream_event(gst::event::Seek::new(
+ 1.0,
+ gst::SeekFlags::FLUSH,
+ gst::SeekType::Set,
+ gst::GenericFormattedValue::Time(gst::SECOND),
+ gst::SeekType::Set,
+ gst::GenericFormattedValue::Time(2 * gst::SECOND),
+ ));
loop {
let mut done = false;
diff --git a/video/closedcaption/tests/scc_enc.rs b/video/closedcaption/tests/scc_enc.rs
index 92003df99..2115156c4 100644
--- a/video/closedcaption/tests/scc_enc.rs
+++ b/video/closedcaption/tests/scc_enc.rs
@@ -60,7 +60,7 @@ fn test_encode_single_packet() {
};
assert_eq!(h.push(buf), Ok(gst::FlowSuccess::Ok));
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
let buf = h.pull().expect("Couldn't pull buffer");
@@ -158,7 +158,7 @@ fn test_encode_multiple_packets() {
buffers.iter().for_each(|buf| {
assert_eq!(h.push(buf.clone()), Ok(gst::FlowSuccess::Ok));
});
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
// Pull 1
let buf = h.pull().expect("Couldn't pull buffer");
diff --git a/video/closedcaption/tests/scc_parse.rs b/video/closedcaption/tests/scc_parse.rs
index fa3797a4a..cbabccdb0 100644
--- a/video/closedcaption/tests/scc_parse.rs
+++ b/video/closedcaption/tests/scc_parse.rs
@@ -79,7 +79,7 @@ fn test_parse() {
data = &data[l..];
}
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
while let Some(buf) = h.try_pull() {
output_len += buf.get_size();
checksum = checksum.wrapping_add(
diff --git a/video/closedcaption/tests/tttocea608.rs b/video/closedcaption/tests/tttocea608.rs
index 34fd3b3b1..8153a246d 100644
--- a/video/closedcaption/tests/tttocea608.rs
+++ b/video/closedcaption/tests/tttocea608.rs
@@ -105,7 +105,7 @@ fn test_one_timed_buffer_and_eos() {
assert_eq!(h.buffers_in_queue(), 0);
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
/* Check that we do receive an erase_display */
assert_eq!(h.buffers_in_queue(), 2);
@@ -222,7 +222,7 @@ fn test_erase_display_memory_gaps() {
assert_eq!(h.push(inbuf), Ok(gst::FlowSuccess::Ok));
/* Let's first push a gap that doesn't leave room for our two control codes */
- let gap_event = gst::Event::new_gap(2 * gst::SECOND, 2_533_333_333.into()).build();
+ let gap_event = gst::event::Gap::new(2 * gst::SECOND, 2_533_333_333.into());
assert_eq!(h.push_event(gap_event), true);
let mut erase_display_buffers = 0;
@@ -237,7 +237,7 @@ fn test_erase_display_memory_gaps() {
assert_eq!(erase_display_buffers, 0);
- let gap_event = gst::Event::new_gap(4_533_333_333.into(), 1.into()).build();
+ let gap_event = gst::event::Gap::new(4_533_333_333.into(), 1.into());
assert_eq!(h.push_event(gap_event), true);
while h.buffers_in_queue() > 0 {
@@ -353,7 +353,7 @@ fn test_one_timed_buffer_and_eos_roll_up2() {
assert_eq!(h.buffers_in_queue(), 0);
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
let expected_gaps: [(gst::ClockTime, gst::ClockTime); 2] = [
(0.into(), 1_000_000_000.into()),
diff --git a/video/flavors/src/flvdemux.rs b/video/flavors/src/flvdemux.rs
index d6679264b..5e5db06b1 100644
--- a/video/flavors/src/flvdemux.rs
+++ b/video/flavors/src/flvdemux.rs
@@ -293,7 +293,7 @@ impl FlvDemux {
_element: &gst::Element,
) -> Result<(), gst::LoggableError> {
let mode = {
- let mut query = gst::Query::new_scheduling();
+ let mut query = gst::query::Scheduling::new();
if !pad.peer_query(&mut query) {
return Err(gst_loggable_error!(CAT, "Scheduling query failed on peer"));
}
@@ -598,7 +598,7 @@ impl FlvDemux {
}
};
- pad.push_event(gst::Event::new_caps(&caps).build());
+ pad.push_event(gst::event::Caps::new(&caps));
}
Event::Buffer(stream, buffer) => {
let pad = match stream {
@@ -658,12 +658,12 @@ impl FlvDemux {
let full_stream_id = srcpad.create_stream_id(element, Some(name)).unwrap();
// FIXME group id
- srcpad.push_event(gst::Event::new_stream_start(&full_stream_id).build());
- srcpad.push_event(gst::Event::new_caps(&caps).build());
+ srcpad.push_event(gst::event::StreamStart::new(&full_stream_id));
+ srcpad.push_event(gst::event::Caps::new(&caps));
// FIXME proper segment handling
let segment = gst::FormattedSegment::<gst::ClockTime>::default();
- srcpad.push_event(gst::Event::new_segment(&segment).build());
+ srcpad.push_event(gst::event::Segment::new(&segment));
self.flow_combiner.lock().unwrap().add_pad(&srcpad);
diff --git a/video/gif/tests/gifenc.rs b/video/gif/tests/gifenc.rs
index ade3b121d..9d06ce26b 100644
--- a/video/gif/tests/gifenc.rs
+++ b/video/gif/tests/gifenc.rs
@@ -64,7 +64,7 @@ fn test_encode(video_info: &gst_video::VideoInfo) {
};
h.push(buffer.clone()).unwrap();
}
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
for _ in 0..6 {
// last frame is the GIF trailer
diff --git a/video/rav1e/tests/rav1enc.rs b/video/rav1e/tests/rav1enc.rs
index c574b912b..09b727c3f 100644
--- a/video/rav1e/tests/rav1enc.rs
+++ b/video/rav1e/tests/rav1enc.rs
@@ -181,7 +181,7 @@ fn test_encode(video_info: &gst_video::VideoInfo) {
for _ in 0..5 {
h.push(buffer.clone()).unwrap();
}
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
for i in 0..5 {
let buffer = h.pull().unwrap();
diff --git a/video/rspng/tests/pngenc.rs b/video/rspng/tests/pngenc.rs
index 09af25a01..de57b1965 100644
--- a/video/rspng/tests/pngenc.rs
+++ b/video/rspng/tests/pngenc.rs
@@ -81,7 +81,7 @@ fn test_png_encode(video_info: &gst_video::VideoInfo) {
};
h.push(buffer.clone()).unwrap();
}
- h.push_event(gst::Event::new_eos().build());
+ h.push_event(gst::event::Eos::new());
(0..5).for_each(|_| {
let buffer = h.pull().unwrap();