diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2021-11-06 10:34:10 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2021-11-06 10:34:10 +0300 |
| commit | d9bda62a4720c0539a443a4e489645e9bb4af1eb (patch) | |
| tree | d59eef871715fda4a9b37e355909a345dbd598d0 /audio/lewton | |
| parent | c99b7785f941fa4f9388a88e52d74c0fa34129ec (diff) | |
Update for GLib/GStreamer API changes
And clean up a lot of related property/caps/structure code.
Diffstat (limited to 'audio/lewton')
| -rw-r--r-- | audio/lewton/src/lewtondec/imp.rs | 19 | ||||
| -rw-r--r-- | audio/lewton/tests/lewtondec.rs | 16 |
2 files changed, 16 insertions, 19 deletions
diff --git a/audio/lewton/src/lewtondec/imp.rs b/audio/lewton/src/lewtondec/imp.rs index 523cd6537..12041e22e 100644 --- a/audio/lewton/src/lewtondec/imp.rs +++ b/audio/lewton/src/lewtondec/imp.rs @@ -71,7 +71,7 @@ impl ElementImpl for LewtonDec { fn pad_templates() -> &'static [gst::PadTemplate] { static PAD_TEMPLATES: Lazy<Vec<gst::PadTemplate>> = Lazy::new(|| { - let sink_caps = gst::Caps::new_simple("audio/x-vorbis", &[]); + let sink_caps = gst::Caps::builder("audio/x-vorbis").build(); let sink_pad_template = gst::PadTemplate::new( "sink", gst::PadDirection::Sink, @@ -80,15 +80,12 @@ impl ElementImpl for LewtonDec { ) .unwrap(); - let src_caps = gst::Caps::new_simple( - "audio/x-raw", - &[ - ("format", &gst_audio::AUDIO_FORMAT_F32.to_str()), - ("rate", &gst::IntRange::<i32>::new(1, std::i32::MAX)), - ("channels", &gst::IntRange::<i32>::new(1, 255)), - ("layout", &"interleaved"), - ], - ); + let src_caps = gst::Caps::builder("audio/x-raw") + .field("format", gst_audio::AUDIO_FORMAT_F32.to_str()) + .field("rate", gst::IntRange::new(1, std::i32::MAX)) + .field("channels", gst::IntRange::new(1i32, 255)) + .field("layout", "interleaved") + .build(); let src_pad_template = gst::PadTemplate::new( "src", gst::PadDirection::Src, @@ -139,7 +136,7 @@ impl AudioDecoderImpl for LewtonDec { let mut state = state_guard.as_mut().unwrap(); let s = caps.structure(0).unwrap(); - if let Ok(Some(streamheaders)) = s.get_optional::<gst::Array>("streamheader") { + if let Ok(Some(streamheaders)) = s.get_optional::<gst::ArrayRef>("streamheader") { let streamheaders = streamheaders.as_slice(); if streamheaders.len() < 3 { gst_debug!( diff --git a/audio/lewton/tests/lewtondec.rs b/audio/lewton/tests/lewtondec.rs index e0985c80b..c26b1cb7d 100644 --- a/audio/lewton/tests/lewtondec.rs +++ b/audio/lewton/tests/lewtondec.rs @@ -52,10 +52,10 @@ fn run_test(inline_headers: bool) { let caps = gst::Caps::builder("audio/x-vorbis") .field( "streamheader", - &gst::Array::new(&[ - &gst::Buffer::from_slice(&data[0..packet_offsets[0]]), - &gst::Buffer::from_slice(&data[packet_offsets[0]..packet_offsets[1]]), - &gst::Buffer::from_slice(&data[packet_offsets[1]..packet_offsets[2]]), + gst::Array::new([ + gst::Buffer::from_slice(&data[0..packet_offsets[0]]), + gst::Buffer::from_slice(&data[packet_offsets[0]..packet_offsets[1]]), + gst::Buffer::from_slice(&data[packet_offsets[1]..packet_offsets[2]]), ]), ) .build(); @@ -92,10 +92,10 @@ fn run_test(inline_headers: bool) { assert_eq!( caps, gst::Caps::builder("audio/x-raw") - .field("format", &gst_audio::AUDIO_FORMAT_F32.to_str()) - .field("rate", &44_100i32) - .field("channels", &1i32) - .field("layout", &"interleaved") + .field("format", gst_audio::AUDIO_FORMAT_F32.to_str()) + .field("rate", 44_100i32) + .field("channels", 1i32) + .field("layout", "interleaved") .build() ); } |