Move from `imp.instance()` to `imp.obj()`

It's doing the same thing and is shorter.

25 files changed, 99 insertions, 105 deletions

diff --git a/video/cdg/src/cdgdec/imp.rs b/video/cdg/src/cdgdec/imp.rs
index d88212c8..9d077731 100644
--- a/video/cdg/src/cdgdec/imp.rs
+++ b/video/cdg/src/cdgdec/imp.rs
@@ -110,7 +110,7 @@ impl VideoDecoderImpl for CdgDec {
         {
             let mut out_info = self.output_info.lock().unwrap();
             if out_info.is_none() {
-                let instance = self.instance();
+                let instance = self.obj();
                 let output_state = instance.set_output_state(
                     gst_video::VideoFormat::Rgba,
                     CDG_WIDTH,
@@ -144,7 +144,7 @@ impl VideoDecoderImpl for CdgDec {
             Some(cmd) => cmd,
             None => {
                 // Not a CDG command
-                self.instance().release_frame(frame);
+                self.obj().release_frame(frame);
                 return Ok(gst::FlowSuccess::Ok);
             }
         };
@@ -152,7 +152,7 @@ impl VideoDecoderImpl for CdgDec {
         let mut cdg_inter = self.cdg_inter.lock().unwrap();
         cdg_inter.handle_cmd(cmd);
 
-        self.instance().allocate_output_frame(&mut frame, None)?;
+        self.obj().allocate_output_frame(&mut frame, None)?;
         {
             let output = frame.output_buffer_mut().unwrap();
             let info = self.output_info.lock().unwrap();
@@ -190,7 +190,7 @@ impl VideoDecoderImpl for CdgDec {
 
         gst::debug!(CAT, imp: self, "Finish frame pts={}", frame.pts().display());
 
-        self.instance().finish_frame(frame)
+        self.obj().finish_frame(frame)
     }
 
     fn decide_allocation(
diff --git a/video/cdg/src/cdgparse/imp.rs b/video/cdg/src/cdgparse/imp.rs
index 1e036bf4..d80a9bb6 100644
--- a/video/cdg/src/cdgparse/imp.rs
+++ b/video/cdg/src/cdgparse/imp.rs
@@ -110,14 +110,14 @@ fn time_to_bytes(time: gst::ClockTime) -> Bytes {
 
 impl BaseParseImpl for CdgParse {
     fn start(&self) -> Result<(), gst::ErrorMessage> {
-        self.instance().set_min_frame_size(CDG_PACKET_SIZE as u32);
+        self.obj().set_min_frame_size(CDG_PACKET_SIZE as u32);
 
         /* Set duration */
         let mut query = gst::query::Duration::new(gst::Format::Bytes);
-        if self.instance().src_pad().query(&mut query) {
+        if self.obj().src_pad().query(&mut query) {
             let size = query.result();
             let bytes: Option<Bytes> = size.try_into().unwrap();
-            self.instance().set_duration(bytes.map(bytes_to_time), 0);
+            self.obj().set_duration(bytes.map(bytes_to_time), 0);
         }
 
         Ok(())
@@ -127,7 +127,7 @@ impl BaseParseImpl for CdgParse {
         &self,
         mut frame: gst_base::BaseParseFrame,
     ) -> Result<(gst::FlowSuccess, u32), gst::FlowError> {
-        if self.instance().src_pad().current_caps().is_none() {
+        if self.obj().src_pad().current_caps().is_none() {
             // Set src pad caps
             let src_caps = gst::Caps::builder("video/x-cdg")
                 .field("width", CDG_WIDTH as i32)
@@ -136,7 +136,7 @@ impl BaseParseImpl for CdgParse {
                 .field("parsed", true)
                 .build();
 
-            self.instance()
+            self.obj()
                 .src_pad()
                 .push_event(gst::event::Caps::new(&src_caps));
         }
@@ -202,8 +202,7 @@ impl BaseParseImpl for CdgParse {
 
         gst::debug!(CAT, imp: self, "Found frame pts={}", pts);
 
-        self.instance()
-            .finish_frame(frame, CDG_PACKET_SIZE as u32)?;
+        self.obj().finish_frame(frame, CDG_PACKET_SIZE as u32)?;
 
         Ok((gst::FlowSuccess::Ok, skip))
     }
diff --git a/video/closedcaption/src/ccdetect/imp.rs b/video/closedcaption/src/ccdetect/imp.rs
index b54b27e5..1208a08c 100644
--- a/video/closedcaption/src/ccdetect/imp.rs
+++ b/video/closedcaption/src/ccdetect/imp.rs
@@ -208,10 +208,10 @@ impl CCDetect {
         }
 
         if notify_cc608 {
-            self.instance().notify("cc608");
+            self.obj().notify("cc608");
         }
         if notify_cc708 {
-            self.instance().notify("cc708");
+            self.obj().notify("cc708");
         }
 
         Ok(())
diff --git a/video/closedcaption/src/cea608overlay/imp.rs b/video/closedcaption/src/cea608overlay/imp.rs
index 96d4be30..13a03b56 100644
--- a/video/closedcaption/src/cea608overlay/imp.rs
+++ b/video/closedcaption/src/cea608overlay/imp.rs
@@ -507,9 +507,9 @@ impl Cea608Overlay {
                 let mut state = self.state.lock().unwrap();
                 state.caption_frame = CaptionFrame::default();
                 state.composition = None;
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 }
@@ -644,7 +644,7 @@ impl ObjectImpl for Cea608Overlay {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/closedcaption/src/cea608tojson/imp.rs b/video/closedcaption/src/cea608tojson/imp.rs
index e54d0ad2..cf90b6f0 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);
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             EventView::Eos(..) => {
                 if let Some(lines) = self.state.borrow_mut().drain_pending(self) {
@@ -942,9 +942,9 @@ impl Cea608ToJson {
                     let _ = self.output(lines);
                 }
 
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 }
@@ -993,7 +993,7 @@ impl ObjectImpl for Cea608ToJson {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/closedcaption/src/cea608tott/imp.rs b/video/closedcaption/src/cea608tott/imp.rs
index b6fd7ce9..0222b6c2 100644
--- a/video/closedcaption/src/cea608tott/imp.rs
+++ b/video/closedcaption/src/cea608tott/imp.rs
@@ -367,7 +367,7 @@ impl Cea608ToTt {
             _ => (),
         }
 
-        gst::Pad::event_default(pad, Some(&*self.instance()), event)
+        gst::Pad::event_default(pad, Some(&*self.obj()), event)
     }
 }
 
@@ -414,7 +414,7 @@ impl ObjectImpl for Cea608ToTt {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/closedcaption/src/jsontovtt/imp.rs b/video/closedcaption/src/jsontovtt/imp.rs
index 11e9f323..26d1ae3b 100644
--- a/video/closedcaption/src/jsontovtt/imp.rs
+++ b/video/closedcaption/src/jsontovtt/imp.rs
@@ -435,10 +435,10 @@ impl JsonToVtt {
                         ),
                     }
                 }
-                gst::Pad::event_default(pad, Some(&*self.instance()), event);
+                gst::Pad::event_default(pad, Some(&*self.obj()), event);
                 true
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -453,7 +453,7 @@ impl JsonToVtt {
                 let buffers = state.handle_eos(self);
                 drop(state);
                 let _ = self.output(buffers);
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             EventView::Caps(..) => {
                 let mut downstream_caps = match self.srcpad.allowed_caps() {
@@ -506,7 +506,7 @@ impl JsonToVtt {
                 };
 
                 /* FIXME: Handle segment updates by draining? */
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             EventView::Gap(ev) => {
                 gst::log!(CAT, obj: pad, "Handling gap {:?}", ev);
@@ -516,7 +516,7 @@ impl JsonToVtt {
                 let _ = self.output(buffers);
                 true
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -626,7 +626,7 @@ impl ObjectImpl for JsonToVtt {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/closedcaption/src/mcc_enc/imp.rs b/video/closedcaption/src/mcc_enc/imp.rs
index 3d1e24de..3febb2a7 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))
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -388,7 +388,7 @@ impl MccEnc {
                 gst::log!(CAT, obj: pad, "Dropping seek event");
                 false
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -408,7 +408,7 @@ impl MccEnc {
                 );
                 true
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 }
@@ -504,7 +504,7 @@ impl ObjectImpl for MccEnc {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/closedcaption/src/mcc_parse/imp.rs b/video/closedcaption/src/mcc_parse/imp.rs
index a26f077c..69c04e67 100644
--- a/video/closedcaption/src/mcc_parse/imp.rs
+++ b/video/closedcaption/src/mcc_parse/imp.rs
@@ -46,9 +46,7 @@ impl PullState {
     fn new(imp: &MccParse, pad: &gst::Pad) -> Self {
         Self {
             need_stream_start: true,
-            stream_id: pad
-                .create_stream_id(&*imp.instance(), Some("src"))
-                .to_string(),
+            stream_id: pad.create_stream_id(&*imp.obj(), Some("src")).to_string(),
             offset: 0,
             duration: gst::ClockTime::NONE,
         }
@@ -883,14 +881,14 @@ impl MccParse {
                 let state = self.flush(state);
                 drop(state);
 
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), 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);
                 }
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             _ => {
                 if event.is_sticky()
@@ -902,7 +900,7 @@ impl MccParse {
                     state.pending_events.push(event);
                     true
                 } else {
-                    gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                    gst::Pad::event_default(pad, Some(&*self.obj()), event)
                 }
             }
         }
@@ -1007,7 +1005,7 @@ impl MccParse {
         gst::log!(CAT, obj: pad, "Handling event {:?}", event);
         match event.view() {
             EventView::Seek(e) => self.perform_seek(e),
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -1061,7 +1059,7 @@ impl MccParse {
                     self.sinkpad.peer_query(query)
                 }
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 }
@@ -1140,7 +1138,7 @@ impl ObjectImpl for MccParse {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/closedcaption/src/scc_enc/imp.rs b/video/closedcaption/src/scc_enc/imp.rs
index a6825ea8..23fcbbf6 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;
                 }
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -322,7 +322,7 @@ impl SccEnc {
                 gst::log!(CAT, obj: pad, "Dropping seek event");
                 false
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -342,7 +342,7 @@ impl SccEnc {
                 );
                 true
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 }
@@ -391,7 +391,7 @@ impl ObjectImpl for SccEnc {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/closedcaption/src/scc_parse/imp.rs b/video/closedcaption/src/scc_parse/imp.rs
index f9880158..5bd19b5e 100644
--- a/video/closedcaption/src/scc_parse/imp.rs
+++ b/video/closedcaption/src/scc_parse/imp.rs
@@ -40,9 +40,7 @@ impl PullState {
     fn new(imp: &SccParse, pad: &gst::Pad) -> Self {
         Self {
             need_stream_start: true,
-            stream_id: pad
-                .create_stream_id(&*imp.instance(), Some("src"))
-                .to_string(),
+            stream_id: pad.create_stream_id(&*imp.obj(), Some("src")).to_string(),
             offset: 0,
             duration: gst::ClockTime::NONE,
         }
@@ -762,14 +760,14 @@ impl SccParse {
                 let state = self.flush(state);
                 drop(state);
 
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), 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);
                 }
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             _ => {
                 if event.is_sticky()
@@ -781,7 +779,7 @@ impl SccParse {
                     state.pending_events.push(event);
                     true
                 } else {
-                    gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                    gst::Pad::event_default(pad, Some(&*self.obj()), event)
                 }
             }
         }
@@ -886,7 +884,7 @@ impl SccParse {
         gst::log!(CAT, obj: pad, "Handling event {:?}", event);
         match event.view() {
             EventView::Seek(e) => self.perform_seek(e),
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -940,7 +938,7 @@ impl SccParse {
                     self.sinkpad.peer_query(query)
                 }
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 }
@@ -1019,7 +1017,7 @@ impl ObjectImpl for SccParse {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/closedcaption/src/transcriberbin/imp.rs b/video/closedcaption/src/transcriberbin/imp.rs
index 56e8ecd3..ab2514c9 100644
--- a/video/closedcaption/src/transcriberbin/imp.rs
+++ b/video/closedcaption/src/transcriberbin/imp.rs
@@ -220,7 +220,7 @@ impl TranscriberBin {
             gst::PadProbeReturn::Ok
         });
 
-        self.instance().add(&state.internal_bin)?;
+        self.obj().add(&state.internal_bin)?;
 
         state.cccombiner.set_property("latency", 100.mseconds());
 
@@ -411,8 +411,7 @@ impl TranscriberBin {
             QueryViewMut::Latency(q) => {
                 let mut upstream_query = gst::query::Latency::new();
 
-                let ret =
-                    gst::Pad::query_default(pad, Some(&*self.instance()), &mut upstream_query);
+                let ret = gst::Pad::query_default(pad, Some(&*self.obj()), &mut upstream_query);
 
                 if ret {
                     let (_, mut min, _) = upstream_query.result();
@@ -437,7 +436,7 @@ impl TranscriberBin {
 
                 ret
             }
-            _ => gst::Pad::query_default(pad, Some(&*self.instance()), query),
+            _ => gst::Pad::query_default(pad, Some(&*self.obj()), query),
         }
     }
 
@@ -520,9 +519,9 @@ impl TranscriberBin {
                     }
                 }
 
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 }
@@ -750,7 +749,7 @@ impl ObjectImpl for TranscriberBin {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.audio_srcpad).unwrap();
         obj.add_pad(&self.audio_sinkpad).unwrap();
         obj.add_pad(&self.video_srcpad).unwrap();
@@ -890,8 +889,8 @@ impl BinImpl for TranscriberBin {
                         let mut settings = self.settings.lock().unwrap();
                         settings.passthrough = true;
                         drop(settings);
-                        self.instance().notify("passthrough");
-                        self.instance().call_async(move |bin| {
+                        self.obj().notify("passthrough");
+                        self.obj().call_async(move |bin| {
                             let thiz = bin.imp();
                             thiz.block_and_update(true);
                         });
diff --git a/video/closedcaption/src/tttocea608/imp.rs b/video/closedcaption/src/tttocea608/imp.rs
index b7e9a82c..2430e58b 100644
--- a/video/closedcaption/src/tttocea608/imp.rs
+++ b/video/closedcaption/src/tttocea608/imp.rs
@@ -933,7 +933,7 @@ impl TtToCea608 {
                     drop(state);
                 }
 
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             EventView::FlushStop(_) => {
                 let mut state = self.state.lock().unwrap();
@@ -950,9 +950,9 @@ impl TtToCea608 {
                 drop(settings);
                 drop(state);
 
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 }
@@ -1036,7 +1036,7 @@ impl ObjectImpl for TtToCea608 {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/closedcaption/src/tttojson/imp.rs b/video/closedcaption/src/tttojson/imp.rs
index 8a8e2196..d590060b 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(_) => gst::Pad::event_default(pad, Some(&*self.instance()), event),
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            EventView::Eos(_) => gst::Pad::event_default(pad, Some(&*self.obj()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 }
@@ -237,7 +237,7 @@ impl ObjectImpl for TtToJson {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }
diff --git a/video/dav1d/src/dav1ddec/imp.rs b/video/dav1d/src/dav1ddec/imp.rs
index cdaabd1d..d89bb7be 100644
--- a/video/dav1d/src/dav1ddec/imp.rs
+++ b/video/dav1d/src/dav1ddec/imp.rs
@@ -157,7 +157,7 @@ impl Dav1dDec {
         let input_state = state.input_state.clone();
         drop(state_guard);
 
-        let instance = self.instance();
+        let instance = self.obj();
         let output_state =
             instance.set_output_state(format, pic.width(), pic.height(), Some(&input_state))?;
         instance.negotiate(output_state)?;
@@ -214,9 +214,9 @@ impl Dav1dDec {
             }
             Err(err) => {
                 gst::error!(CAT, "Sending data failed (error code: {})", err);
-                self.instance().release_frame(frame);
+                self.obj().release_frame(frame);
                 gst_video::video_decoder_error!(
-                    &*self.instance(),
+                    &*self.obj(),
                     1,
                     gst::StreamError::Decode,
                     ["Sending data failed (error code {})", err]
@@ -246,7 +246,7 @@ impl Dav1dDec {
             Err(err) => {
                 gst::error!(CAT, "Sending data failed (error code: {})", err);
                 gst_video::video_decoder_error!(
-                    &*self.instance(),
+                    &*self.obj(),
                     1,
                     gst::StreamError::Decode,
                     ["Sending data failed (error code {})", err]
@@ -359,7 +359,7 @@ impl Dav1dDec {
 
         state_guard = self.handle_resolution_change(state_guard, pic)?;
 
-        let instance = self.instance();
+        let instance = self.obj();
         let output_state = instance
             .output_state()
             .expect("Output state not set. Shouldn't happen!");
@@ -412,7 +412,7 @@ impl Dav1dDec {
                 );
 
                 gst_video::video_decoder_error!(
-                    &*self.instance(),
+                    &*self.obj(),
                     1,
                     gst::StreamError::Decode,
                     ["Retrieving decoded picture failed (error code {})", err]
@@ -596,7 +596,7 @@ impl VideoDecoderImpl for Dav1dDec {
                         Some(ref info) => {
                             let mut upstream_latency = gst::query::Latency::new();
 
-                            if self.instance().sink_pad().peer_query(&mut upstream_latency) {
+                            if self.obj().sink_pad().peer_query(&mut upstream_latency) {
                                 let (live, mut min, mut max) = upstream_latency.result();
                                 // For autodetection: 1 if live, else whatever dav1d gives us
                                 let frame_latency: u64 = if max_frame_delay < 0 && live {
@@ -665,7 +665,7 @@ impl VideoDecoderImpl for Dav1dDec {
             let mut latency_query = gst::query::Latency::new();
             let mut is_live = false;
 
-            if self.instance().sink_pad().peer_query(&mut latency_query) {
+            if self.obj().sink_pad().peer_query(&mut latency_query) {
                 is_live = latency_query.result().0;
             }
 
diff --git a/video/ffv1/src/ffv1dec/imp.rs b/video/ffv1/src/ffv1dec/imp.rs
index 086be543..14b7ef4f 100644
--- a/video/ffv1/src/ffv1dec/imp.rs
+++ b/video/ffv1/src/ffv1dec/imp.rs
@@ -371,7 +371,7 @@ impl VideoDecoderImpl for Ffv1Dec {
         let format = get_output_format(decoder.config_record())
             .ok_or_else(|| gst::loggable_error!(CAT, "Unsupported format"))?;
 
-        let instance = self.instance();
+        let instance = self.obj();
         let output_state = instance
             .set_output_state(format, info.width(), info.height(), Some(state))
             .map_err(|err| gst::loggable_error!(CAT, "Failed to set output params: {}", err))?;
@@ -437,7 +437,7 @@ impl VideoDecoderImpl for Ffv1Dec {
         drop(state);
 
         frame.set_output_buffer(buf);
-        self.instance().finish_frame(frame)?;
+        self.obj().finish_frame(frame)?;
 
         Ok(gst::FlowSuccess::Ok)
     }
diff --git a/video/gif/src/gifenc/imp.rs b/video/gif/src/gifenc/imp.rs
index 57ca4a49..a8ab2046 100644
--- a/video/gif/src/gifenc/imp.rs
+++ b/video/gif/src/gifenc/imp.rs
@@ -275,7 +275,7 @@ impl VideoEncoderImpl for GifEnc {
             *self.state.borrow_mut() = Some(state);
         }
 
-        let instance = self.instance();
+        let instance = self.obj();
         let output_state = instance
             .set_output_state(gst::Caps::builder("image/gif").build(), Some(state))
             .map_err(|_| gst::loggable_error!(CAT, "Failed to set output state"))?;
@@ -397,7 +397,7 @@ impl VideoEncoderImpl for GifEnc {
         // Currently not using incremental frames -> every frame is a keyframe
         frame.set_flags(gst_video::VideoCodecFrameFlags::SYNC_POINT);
         frame.set_output_buffer(output_buffer);
-        self.instance().finish_frame(Some(frame))
+        self.obj().finish_frame(Some(frame))
     }
 }
 
@@ -425,7 +425,7 @@ impl GifEnc {
         });
         if let Some(trailer_buffer) = trailer_buffer {
             // manually push GIF trailer to the encoder's src pad
-            self.instance().src_pad().push(trailer_buffer)?;
+            self.obj().src_pad().push(trailer_buffer)?;
         }
 
         Ok(gst::FlowSuccess::Ok)
diff --git a/video/gtk4/src/sink/imp.rs b/video/gtk4/src/sink/imp.rs
index c4abc0e5..7aa73a41 100644
--- a/video/gtk4/src/sink/imp.rs
+++ b/video/gtk4/src/sink/imp.rs
@@ -85,7 +85,7 @@ impl ObjectImpl for PaintableSink {
             "paintable" => {
                 let mut paintable = self.paintable.lock().unwrap();
                 if paintable.is_none() {
-                    self.instance().initialize_paintable(&mut paintable);
+                    self.obj().initialize_paintable(&mut paintable);
                 }
 
                 let paintable = match &*paintable {
@@ -183,7 +183,7 @@ impl ElementImpl for PaintableSink {
             gst::StateChange::NullToReady => {
                 let mut paintable = self.paintable.lock().unwrap();
                 if paintable.is_none() {
-                    self.instance().initialize_paintable(&mut paintable);
+                    self.obj().initialize_paintable(&mut paintable);
                 }
 
                 if paintable.is_none() {
diff --git a/video/gtk4/src/sink/paintable/imp.rs b/video/gtk4/src/sink/paintable/imp.rs
index f768f5ab..e4ed42b2 100644
--- a/video/gtk4/src/sink/paintable/imp.rs
+++ b/video/gtk4/src/sink/paintable/imp.rs
@@ -158,10 +158,10 @@ impl SinkPaintable {
                     old_size,
                     new_size,
                 );
-                self.instance().invalidate_size();
+                self.obj().invalidate_size();
             }
 
-            self.instance().invalidate_contents();
+            self.obj().invalidate_contents();
         }
     }
 }
diff --git a/video/png/src/pngenc/imp.rs b/video/png/src/pngenc/imp.rs
index 5c655127..2f543d73 100644
--- a/video/png/src/pngenc/imp.rs
+++ b/video/png/src/pngenc/imp.rs
@@ -295,7 +295,7 @@ impl VideoEncoderImpl for PngEncoder {
             *self.state.lock() = Some(state);
         }
 
-        let instance = self.instance();
+        let instance = self.obj();
         let output_state = instance
             .set_output_state(gst::Caps::builder("image/png").build(), Some(state))
             .map_err(|_| gst::loggable_error!(CAT, "Failed to set output state"))?;
@@ -335,6 +335,6 @@ impl VideoEncoderImpl for PngEncoder {
         // There are no such incremental frames in the png format
         frame.set_flags(gst_video::VideoCodecFrameFlags::SYNC_POINT);
         frame.set_output_buffer(output_buffer);
-        self.instance().finish_frame(Some(frame))
+        self.obj().finish_frame(Some(frame))
     }
 }
diff --git a/video/rav1e/src/rav1enc/imp.rs b/video/rav1e/src/rav1enc/imp.rs
index 34aa7ac0..f349c186 100644
--- a/video/rav1e/src/rav1enc/imp.rs
+++ b/video/rav1e/src/rav1enc/imp.rs
@@ -805,7 +805,7 @@ impl VideoEncoderImpl for Rav1Enc {
             video_info,
         });
 
-        let instance = self.instance();
+        let instance = self.obj();
         let output_state = instance
             .set_output_state(
                 gst::Caps::builder("video/x-av1")
@@ -913,7 +913,7 @@ impl Rav1Enc {
                         packet_type
                     );
 
-                    let instance = self.instance();
+                    let instance = self.obj();
                     let mut frame = instance
                         .frame(frame_number as i32)
                         .expect("frame not found");
diff --git a/video/videofx/src/border/imp.rs b/video/videofx/src/border/imp.rs
index 7e0b771f..9d2b8365 100644
--- a/video/videofx/src/border/imp.rs
+++ b/video/videofx/src/border/imp.rs
@@ -304,7 +304,7 @@ impl ObjectImpl for RoundedCorners {
                         border_radius
                     );
                     settings.border_radius_px = border_radius;
-                    self.instance().reconfigure_src();
+                    self.obj().reconfigure_src();
                 }
             }
             _ => unimplemented!(),
@@ -462,10 +462,10 @@ impl BaseTransformImpl for RoundedCorners {
         );
 
         if out_info.format() == VideoFormat::I420 {
-            self.instance().set_passthrough(true);
+            self.obj().set_passthrough(true);
             return Ok(());
         } else {
-            self.instance().set_passthrough(false);
+            self.obj().set_passthrough(false);
         }
 
         // See "A420" planar 4:4:2:0 AYUV section
@@ -487,7 +487,7 @@ impl BaseTransformImpl for RoundedCorners {
         &self,
         inbuf: InputBuffer,
     ) -> Result<PrepareOutputBufferSuccess, gst::FlowError> {
-        if self.instance().is_passthrough() {
+        if self.obj().is_passthrough() {
             return Ok(PrepareOutputBufferSuccess::InputBuffer);
         }
 
diff --git a/video/videofx/src/colordetect/imp.rs b/video/videofx/src/colordetect/imp.rs
index b321d150..f3112c86 100644
--- a/video/videofx/src/colordetect/imp.rs
+++ b/video/videofx/src/colordetect/imp.rs
@@ -105,7 +105,7 @@ impl ColorDetect {
                 .map(|c| ((c.r as u32) << 16) | ((c.g as u32) << 8) | (c.b as u32)),
         );
 
-        self.instance()
+        self.obj()
             .post_message(
                 gst::message::Element::builder(
                     gst::structure::Structure::builder("colordetect")
diff --git a/video/videofx/src/videocompare/imp.rs b/video/videofx/src/videocompare/imp.rs
index f69b5cb2..9e176144 100644
--- a/video/videofx/src/videocompare/imp.rs
+++ b/video/videofx/src/videocompare/imp.rs
@@ -196,7 +196,7 @@ impl ElementImpl for VideoCompare {
             // Since we are releasing the reference pad, we need to select a new pad for the
             // comparisons. At the moment we have no defined criteria to select the next
             // reference sink pad, so we choose the first that comes.
-            for sink_pad in self.instance().sink_pads() {
+            for sink_pad in self.obj().sink_pads() {
                 if current_reference_pad != sink_pad {
                     // Choose the first available left sink pad
                     *reference_pad = Some(sink_pad);
@@ -317,7 +317,7 @@ impl VideoAggregatorImpl for VideoCompare {
 
         // Loop through all remaining sink pads and compare the latest available buffer
         for pad in self
-            .instance()
+            .obj()
             .sink_pads()
             .into_iter()
             .map(|pad| pad.downcast::<gst_video::VideoAggregatorPad>().unwrap())
@@ -369,7 +369,7 @@ impl VideoAggregatorImpl for VideoCompare {
                 "Image detected {}",
                 message.running_time.unwrap().display()
             );
-            let element = self.instance();
+            let element = self.obj();
             let _ = element.post_message(
                 gst::message::Element::builder(message.into())
                     .src(element.as_ref())
diff --git a/video/webp/src/dec/imp.rs b/video/webp/src/dec/imp.rs
index 8e853385..b5f97e56 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();
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             EventView::Eos(..) => {
                 if let Err(err) = self.decode() {
                     self.post_error_message(err);
                 }
-                gst::Pad::event_default(pad, Some(&*self.instance()), event)
+                gst::Pad::event_default(pad, Some(&*self.obj()), event)
             }
             EventView::Segment(..) => true,
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 
@@ -260,7 +260,7 @@ impl WebPDec {
         gst::log!(CAT, obj: pad, "Handling event {:?}", event);
         match event.view() {
             EventView::Seek(..) => false,
-            _ => gst::Pad::event_default(pad, Some(&*self.instance()), event),
+            _ => gst::Pad::event_default(pad, Some(&*self.obj()), event),
         }
     }
 }
@@ -309,7 +309,7 @@ impl ObjectImpl for WebPDec {
     fn constructed(&self) {
         self.parent_constructed();
 
-        let obj = self.instance();
+        let obj = self.obj();
         obj.add_pad(&self.sinkpad).unwrap();
         obj.add_pad(&self.srcpad).unwrap();
     }