diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2022-10-12 17:48:47 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2022-10-12 19:50:15 +0300 |
commit | e49138516cc5eb1d125e3139ae1cf24eb3b00016 (patch) | |
tree | 197d72bb75d5f8480d813ca4e0d4b7844d4df641 /video | |
parent | 2bffdec691c441c9effefa4f27f72d64681c0bf2 (diff) |
Update for pad default functions API changes
Diffstat (limited to 'video')
-rw-r--r-- | video/closedcaption/src/cea608overlay/imp.rs | 4 | ||||
-rw-r--r-- | video/closedcaption/src/cea608tojson/imp.rs | 6 | ||||
-rw-r--r-- | video/closedcaption/src/cea608tott/imp.rs | 2 | ||||
-rw-r--r-- | video/closedcaption/src/jsontovtt/imp.rs | 10 | ||||
-rw-r--r-- | video/closedcaption/src/mcc_enc/imp.rs | 6 | ||||
-rw-r--r-- | video/closedcaption/src/mcc_parse/imp.rs | 10 | ||||
-rw-r--r-- | video/closedcaption/src/scc_enc/imp.rs | 8 | ||||
-rw-r--r-- | video/closedcaption/src/scc_parse/imp.rs | 10 | ||||
-rw-r--r-- | video/closedcaption/src/transcriberbin/imp.rs | 9 | ||||
-rw-r--r-- | video/closedcaption/src/tttocea608/imp.rs | 6 | ||||
-rw-r--r-- | video/closedcaption/src/tttojson/imp.rs | 4 | ||||
-rw-r--r-- | video/flavors/src/flvdemux/imp.rs | 14 | ||||
-rw-r--r-- | video/webp/src/dec/imp.rs | 8 |
13 files changed, 49 insertions, 48 deletions
diff --git a/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs index e52eb690..d7b89247 100644 --- a/video/closedcaption/src/cea608overlay/imp.rs +++ b/video/closedcaption/src/cea608overlay/imp.rs @@ -527,9 +527,9 @@ impl Cea608Overlay { let mut state = self.state.lock().unwrap(); state.caption_frame = CaptionFrame::default(); state.composition = None; - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } } diff --git a/video/closedcaption/src/cea608tojson/imp.rs b/video/closedcaption/src/cea608tojson/imp.rs index 633982ae..d3bfb8e8 100644 --- a/video/closedcaption/src/cea608tojson/imp.rs +++ b/video/closedcaption/src/cea608tojson/imp.rs @@ -932,7 +932,7 @@ impl Cea608ToJson { *state = State::default(); state.settings = old_settings; drop(state); - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::Eos(..) => { if let Some(lines) = self.state.borrow_mut().drain_pending(self) { @@ -942,9 +942,9 @@ impl Cea608ToJson { let _ = self.output(lines); } - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } } diff --git a/video/closedcaption/src/cea608tott/imp.rs b/video/closedcaption/src/cea608tott/imp.rs index f0dcdccf..c7231643 100644 --- a/video/closedcaption/src/cea608tott/imp.rs +++ b/video/closedcaption/src/cea608tott/imp.rs @@ -367,7 +367,7 @@ impl Cea608ToTt { _ => (), } - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } } diff --git a/video/closedcaption/src/jsontovtt/imp.rs b/video/closedcaption/src/jsontovtt/imp.rs index 9818fcf1..842a055d 100644 --- a/video/closedcaption/src/jsontovtt/imp.rs +++ b/video/closedcaption/src/jsontovtt/imp.rs @@ -435,10 +435,10 @@ impl JsonToVtt { ), } } - pad.event_default(Some(&*self.instance()), event); + gst::Pad::event_default(pad, Some(&*self.instance()), event); true } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } @@ -453,7 +453,7 @@ impl JsonToVtt { let buffers = state.handle_eos(self); drop(state); let _ = self.output(buffers); - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::Caps(..) => { let mut downstream_caps = match self.srcpad.allowed_caps() { @@ -506,7 +506,7 @@ impl JsonToVtt { }; /* FIXME: Handle segment updates by draining? */ - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::Gap(ev) => { gst::log!(CAT, obj: pad, "Handling gap {:?}", ev); @@ -516,7 +516,7 @@ impl JsonToVtt { let _ = self.output(buffers); true } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } diff --git a/video/closedcaption/src/mcc_enc/imp.rs b/video/closedcaption/src/mcc_enc/imp.rs index 36a66434..d6112de9 100644 --- a/video/closedcaption/src/mcc_enc/imp.rs +++ b/video/closedcaption/src/mcc_enc/imp.rs @@ -375,7 +375,7 @@ impl MccEnc { .build(); self.srcpad.push_event(gst::event::Caps::new(&caps)) } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } @@ -388,7 +388,7 @@ impl MccEnc { gst::log!(CAT, obj: pad, "Dropping seek event"); false } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } @@ -408,7 +408,7 @@ impl MccEnc { ); true } - _ => pad.query_default(Some(&*self.instance()), query), + _ => gst::Pad::query_default(pad, Some(&*self.instance()), query), } } } diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs index 0c2e40bb..16d0558f 100644 --- a/video/closedcaption/src/mcc_parse/imp.rs +++ b/video/closedcaption/src/mcc_parse/imp.rs @@ -883,14 +883,14 @@ impl MccParse { let state = self.flush(state); drop(state); - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::Eos(_) => { gst::log!(CAT, obj: pad, "Draining"); if let Err(err) = self.handle_buffer(None, false) { gst::error!(CAT, obj: pad, "Failed to drain parser: {:?}", err); } - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } _ => { if event.is_sticky() @@ -902,7 +902,7 @@ impl MccParse { state.pending_events.push(event); true } else { - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } } } @@ -1007,7 +1007,7 @@ impl MccParse { gst::log!(CAT, obj: pad, "Handling event {:?}", event); match event.view() { EventView::Seek(e) => self.perform_seek(e), - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } @@ -1061,7 +1061,7 @@ impl MccParse { self.sinkpad.peer_query(query) } } - _ => pad.query_default(Some(&*self.instance()), query), + _ => gst::Pad::query_default(pad, Some(&*self.instance()), query), } } } diff --git a/video/closedcaption/src/scc_enc/imp.rs b/video/closedcaption/src/scc_enc/imp.rs index 2b37a4f6..4fa33191 100644 --- a/video/closedcaption/src/scc_enc/imp.rs +++ b/video/closedcaption/src/scc_enc/imp.rs @@ -307,9 +307,9 @@ impl SccEnc { gst::error!(CAT, obj: pad, "Failed to write a line after EOS: {:?}", err); return false; } - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } @@ -322,7 +322,7 @@ impl SccEnc { gst::log!(CAT, obj: pad, "Dropping seek event"); false } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } @@ -342,7 +342,7 @@ impl SccEnc { ); true } - _ => pad.query_default(Some(&*self.instance()), query), + _ => gst::Pad::query_default(pad, Some(&*self.instance()), query), } } } diff --git a/video/closedcaption/src/scc_parse/imp.rs b/video/closedcaption/src/scc_parse/imp.rs index f6c4f220..9aafb49c 100644 --- a/video/closedcaption/src/scc_parse/imp.rs +++ b/video/closedcaption/src/scc_parse/imp.rs @@ -762,14 +762,14 @@ impl SccParse { let state = self.flush(state); drop(state); - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::Eos(_) => { gst::log!(CAT, obj: pad, "Draining"); if let Err(err) = self.handle_buffer(None) { gst::error!(CAT, obj: pad, "Failed to drain parser: {:?}", err); } - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } _ => { if event.is_sticky() @@ -781,7 +781,7 @@ impl SccParse { state.pending_events.push(event); true } else { - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } } } @@ -886,7 +886,7 @@ impl SccParse { gst::log!(CAT, obj: pad, "Handling event {:?}", event); match event.view() { EventView::Seek(e) => self.perform_seek(e), - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } @@ -940,7 +940,7 @@ impl SccParse { self.sinkpad.peer_query(query) } } - _ => pad.query_default(Some(&*self.instance()), query), + _ => gst::Pad::query_default(pad, Some(&*self.instance()), query), } } } diff --git a/video/closedcaption/src/transcriberbin/imp.rs b/video/closedcaption/src/transcriberbin/imp.rs index 5bb928e9..07710c96 100644 --- a/video/closedcaption/src/transcriberbin/imp.rs +++ b/video/closedcaption/src/transcriberbin/imp.rs @@ -411,7 +411,8 @@ impl TranscriberBin { QueryViewMut::Latency(q) => { let mut upstream_query = gst::query::Latency::new(); - let ret = pad.query_default(Some(&*self.instance()), &mut upstream_query); + let ret = + gst::Pad::query_default(pad, Some(&*self.instance()), &mut upstream_query); if ret { let (_, mut min, _) = upstream_query.result(); @@ -436,7 +437,7 @@ impl TranscriberBin { ret } - _ => pad.query_default(Some(&*self.instance()), query), + _ => gst::Pad::query_default(pad, Some(&*self.instance()), query), } } @@ -510,9 +511,9 @@ impl TranscriberBin { } } - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } } diff --git a/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs index 22ca651b..c1b6d90f 100644 --- a/video/closedcaption/src/tttocea608/imp.rs +++ b/video/closedcaption/src/tttocea608/imp.rs @@ -929,7 +929,7 @@ impl TtToCea608 { drop(state); } - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::FlushStop(_) => { let mut state = self.state.lock().unwrap(); @@ -946,9 +946,9 @@ impl TtToCea608 { drop(settings); drop(state); - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } } diff --git a/video/closedcaption/src/tttojson/imp.rs b/video/closedcaption/src/tttojson/imp.rs index 030efe63..87b2636f 100644 --- a/video/closedcaption/src/tttojson/imp.rs +++ b/video/closedcaption/src/tttojson/imp.rs @@ -132,8 +132,8 @@ impl TtToJson { .build(); self.srcpad.push_event(gst::event::Caps::new(&caps)) } - EventView::Eos(_) => pad.event_default(Some(&*self.instance()), event), - _ => pad.event_default(Some(&*self.instance()), event), + EventView::Eos(_) => gst::Pad::event_default(pad, Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } } diff --git a/video/flavors/src/flvdemux/imp.rs b/video/flavors/src/flvdemux/imp.rs index 80c683d1..7905a969 100644 --- a/video/flavors/src/flvdemux/imp.rs +++ b/video/flavors/src/flvdemux/imp.rs @@ -370,21 +370,21 @@ impl FlvDemux { match event.view() { EventView::Eos(..) => { // TODO implement - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::Segment(..) => { // TODO implement - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::FlushStart(..) => { // TODO implement - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::FlushStop(..) => { // TODO implement - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } @@ -432,7 +432,7 @@ impl FlvDemux { false } } - _ => pad.query_default(Some(&*self.instance()), query), + _ => gst::Pad::query_default(pad, Some(&*self.instance()), query), } } @@ -444,7 +444,7 @@ impl FlvDemux { // TODO: Implement false } - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } diff --git a/video/webp/src/dec/imp.rs b/video/webp/src/dec/imp.rs index 8c90375a..e9f327d8 100644 --- a/video/webp/src/dec/imp.rs +++ b/video/webp/src/dec/imp.rs @@ -241,16 +241,16 @@ impl WebPDec { EventView::FlushStop(..) => { let mut state = self.state.lock().unwrap(); *state = State::default(); - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::Eos(..) => { if let Err(err) = self.decode() { self.post_error_message(err); } - pad.event_default(Some(&*self.instance()), event) + gst::Pad::event_default(pad, Some(&*self.instance()), event) } EventView::Segment(..) => true, - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } @@ -260,7 +260,7 @@ impl WebPDec { gst::log!(CAT, obj: pad, "Handling event {:?}", event); match event.view() { EventView::Seek(..) => false, - _ => pad.event_default(Some(&*self.instance()), event), + _ => gst::Pad::event_default(pad, Some(&*self.instance()), event), } } } |