diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2022-10-09 16:06:59 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2022-10-10 15:03:25 +0300 |
commit | 7ee4afacf413b2e3c386bb1070994ed4325994e6 (patch) | |
tree | eddcc0e047ab4704e5a459dd551a55196e8a1848 /video/ffv1 | |
parent | 7818ac658b02417fda071ce025b6d6a7fdb54a76 (diff) |
Change *Impl trait methods to only take &self and not Self::Type in addition
Diffstat (limited to 'video/ffv1')
-rw-r--r-- | video/ffv1/src/ffv1dec/imp.rs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/video/ffv1/src/ffv1dec/imp.rs b/video/ffv1/src/ffv1dec/imp.rs index 6d6372fe0..6fcfd6b4f 100644 --- a/video/ffv1/src/ffv1dec/imp.rs +++ b/video/ffv1/src/ffv1dec/imp.rs @@ -358,7 +358,6 @@ impl VideoDecoderImpl for Ffv1Dec { /* We allocate the decoder here rather than start() because we need the sink caps */ fn set_format( &self, - element: &super::Ffv1Dec, state: &gst_video::VideoCodecState<'static, gst_video::video_codec_state::Readable>, ) -> Result<(), gst::LoggableError> { let info = state.info(); @@ -372,7 +371,8 @@ impl VideoDecoderImpl for Ffv1Dec { let format = get_output_format(decoder.config_record()) .ok_or_else(|| gst::loggable_error!(CAT, "Unsupported format"))?; - let output_state = element + let instance = self.instance(); + 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))?; @@ -386,23 +386,22 @@ impl VideoDecoderImpl for Ffv1Dec { }; drop(decoder_state); - element + instance .negotiate(output_state) .map_err(|err| gst::loggable_error!(CAT, "Negotiation failed: {}", err))?; - self.parent_set_format(element, state) + self.parent_set_format(state) } - fn stop(&self, element: &super::Ffv1Dec) -> Result<(), gst::ErrorMessage> { + fn stop(&self) -> Result<(), gst::ErrorMessage> { let mut decoder_state = self.state.lock().unwrap(); *decoder_state = DecoderState::Stopped; - self.parent_stop(element) + self.parent_stop() } fn handle_frame( &self, - element: &super::Ffv1Dec, mut frame: gst_video::VideoCodecFrame, ) -> Result<gst::FlowSuccess, gst::FlowError> { let mut state = self.state.lock().unwrap(); @@ -438,14 +437,13 @@ impl VideoDecoderImpl for Ffv1Dec { drop(state); frame.set_output_buffer(buf); - element.finish_frame(frame)?; + self.instance().finish_frame(frame)?; Ok(gst::FlowSuccess::Ok) } fn decide_allocation( &self, - element: &Self::Type, query: &mut gst::query::Allocation, ) -> Result<(), gst::LoggableError> { let supported = query @@ -461,6 +459,6 @@ impl VideoDecoderImpl for Ffv1Dec { *video_meta_supported = supported; } - self.parent_decide_allocation(element, query) + self.parent_decide_allocation(query) } } |