mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-11-26 19:41:09 +00:00
Code Issues Projects Releases Wiki Activity

gstreamer-audio/video: Make allocator optional in get_allocator() functions for encoder/decoder base classes

Browse source 
They can be and are often None.
This commit is contained in:
Sebastian Dröge 2020-03-29 22:37:01 +03:00
parent 0b0544da63
commit 0651bfb51b
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gstreamer-audio/src/audio_decoder.rs
View file

@ -49,7 +49,7 @@ pub trait AudioDecoderExtManual: 'static {
fn set_output_format(&self, info: &AudioInfo) -> Result<(), gst::FlowError>; fn set_output_format(&self, info: &AudioInfo) -> Result<(), gst::FlowError>;
fn get_allocator(&self) -> (gst::Allocator, gst::AllocationParams); fn get_allocator(&self) -> (Option<gst::Allocator>, gst::AllocationParams);
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
fn error<T: gst::MessageErrorDomain>( fn error<T: gst::MessageErrorDomain>(
@ -136,7 +136,7 @@ impl<O: IsA<AudioDecoder>> AudioDecoderExtManual for O {
} }
} }
fn get_allocator(&self) -> (gst::Allocator, gst::AllocationParams) { fn get_allocator(&self) -> (Option<gst::Allocator>, gst::AllocationParams) {
unsafe { unsafe {
let mut allocator = ptr::null_mut(); let mut allocator = ptr::null_mut();
let mut params = mem::zeroed(); let mut params = mem::zeroed();

4
gstreamer-audio/src/audio_encoder.rs
View file

@ -25,7 +25,7 @@ pub trait AudioEncoderExtManual: 'static {
fn set_output_format(&self, caps: &gst::Caps) -> Result<(), gst::FlowError>; fn set_output_format(&self, caps: &gst::Caps) -> Result<(), gst::FlowError>;
fn get_allocator(&self) -> (gst::Allocator, gst::AllocationParams); fn get_allocator(&self) -> (Option<gst::Allocator>, gst::AllocationParams);
fn get_latency(&self) -> (gst::ClockTime, gst::ClockTime); fn get_latency(&self) -> (gst::ClockTime, gst::ClockTime);
} }
@ -73,7 +73,7 @@ impl<O: IsA<AudioEncoder>> AudioEncoderExtManual for O {
} }
} }
fn get_allocator(&self) -> (gst::Allocator, gst::AllocationParams) { fn get_allocator(&self) -> (Option<gst::Allocator>, gst::AllocationParams) {
unsafe { unsafe {
let mut allocator = ptr::null_mut(); let mut allocator = ptr::null_mut();
let mut params = mem::zeroed(); let mut params = mem::zeroed();

4
gstreamer-video/src/video_decoder.rs
View file

@ -47,7 +47,7 @@ pub trait VideoDecoderExtManual: 'static {
fn get_frames(&self) -> Vec<VideoCodecFrame>; fn get_frames(&self) -> Vec<VideoCodecFrame>;
fn get_oldest_frame(&self) -> Option<VideoCodecFrame>; fn get_oldest_frame(&self) -> Option<VideoCodecFrame>;
fn get_allocator(&self) -> (gst::Allocator, gst::AllocationParams); fn get_allocator(&self) -> (Option<gst::Allocator>, gst::AllocationParams);
fn have_frame(&self) -> Result<gst::FlowSuccess, gst::FlowError>; fn have_frame(&self) -> Result<gst::FlowSuccess, gst::FlowError>;
fn finish_frame(&self, frame: VideoCodecFrame) -> Result<gst::FlowSuccess, gst::FlowError>; fn finish_frame(&self, frame: VideoCodecFrame) -> Result<gst::FlowSuccess, gst::FlowError>;
@ -113,7 +113,7 @@ impl<O: IsA<VideoDecoder>> VideoDecoderExtManual for O {
ret.into_result() ret.into_result()
} }
fn get_allocator(&self) -> (gst::Allocator, gst::AllocationParams) { fn get_allocator(&self) -> (Option<gst::Allocator>, gst::AllocationParams) {
unsafe { unsafe {
let mut allocator = ptr::null_mut(); let mut allocator = ptr::null_mut();
let mut params = mem::zeroed(); let mut params = mem::zeroed();

4
gstreamer-video/src/video_encoder.rs
View file

@ -31,7 +31,7 @@ pub trait VideoEncoderExtManual: 'static {
fn get_frames(&self) -> Vec<VideoCodecFrame>; fn get_frames(&self) -> Vec<VideoCodecFrame>;
fn get_oldest_frame(&self) -> Option<VideoCodecFrame>; fn get_oldest_frame(&self) -> Option<VideoCodecFrame>;
fn get_allocator(&self) -> (gst::Allocator, gst::AllocationParams); fn get_allocator(&self) -> (Option<gst::Allocator>, gst::AllocationParams);
fn finish_frame( fn finish_frame(
&self, &self,
@ -71,7 +71,7 @@ impl<O: IsA<VideoEncoder>> VideoEncoderExtManual for O {
ret.into_result() ret.into_result()
} }
fn get_allocator(&self) -> (gst::Allocator, gst::AllocationParams) { fn get_allocator(&self) -> (Option<gst::Allocator>, gst::AllocationParams) {
unsafe { unsafe {
let mut allocator = ptr::null_mut(); let mut allocator = ptr::null_mut();
let mut params = mem::zeroed(); let mut params = mem::zeroed();