plugins, examples, tutorials: Use AudioCapsBuilder and VideoCapsBuilder

Simplify caps creation code

1 files changed, 28 insertions, 35 deletions

diff --git a/audio/csound/tests/csound_filter.rs b/audio/csound/tests/csound_filter.rs
index ed8b1598..6d3ee896 100644
--- a/audio/csound/tests/csound_filter.rs
+++ b/audio/csound/tests/csound_filter.rs
@@ -91,11 +91,10 @@ fn csound_filter_eos() {
     let num_channels = 1;
     let sr: i32 = 44_100;
 
-    let caps = gst::Caps::builder("audio/x-raw")
-        .field("format", gst_audio::AUDIO_FORMAT_F64.to_str())
-        .field("rate", sr)
-        .field("channels", num_channels)
-        .field("layout", "interleaved")
+    let caps = gst_audio::AudioCapsBuilder::new_interleaved()
+        .format(gst_audio::AUDIO_FORMAT_F64)
+        .rate(sr)
+        .channels(num_channels)
         .build();
 
     let mut h = build_harness(
@@ -201,11 +200,10 @@ fn csound_filter_underflow() {
     let num_channels = 1;
     let sr: i32 = 44_100;
 
-    let caps = gst::Caps::builder("audio/x-raw")
-        .field("format", gst_audio::AUDIO_FORMAT_F64.to_str())
-        .field("rate", sr)
-        .field("channels", num_channels)
-        .field("layout", "interleaved")
+    let caps = gst_audio::AudioCapsBuilder::new_interleaved()
+        .format(gst_audio::AUDIO_FORMAT_F64)
+        .rate(sr)
+        .channels(num_channels)
         .build();
 
     let mut h = build_harness(
@@ -280,20 +278,18 @@ fn csound_filter_caps_negotiation() {
     let ochannels = 1;
     let sr: i32 = 44_100;
 
-    let src_caps = gst::Caps::builder("audio/x-raw")
-        .field("format", gst_audio::AUDIO_FORMAT_F64.to_str())
-        .field("rate", sr)
-        .field("channels", ichannels)
-        .field("layout", "interleaved")
+    let src_caps = gst_audio::AudioCapsBuilder::new_interleaved()
+        .format(gst_audio::AUDIO_FORMAT_F64)
+        .rate(sr)
+        .channels(ichannels)
         .build();
 
     // Define the output caps which would be fixated
     // at the end of the caps negotiation
-    let sink_caps = gst::Caps::builder("audio/x-raw")
-        .field("format", gst_audio::AUDIO_FORMAT_F64.to_str())
-        .field("rate", gst::IntRange::new(1i32, 48000))
-        .field("channels", gst::IntRange::new(1i32, 2))
-        .field("layout", "interleaved")
+    let sink_caps = gst_audio::AudioCapsBuilder::new_interleaved()
+        .format(gst_audio::AUDIO_FORMAT_F64)
+        .rate_range(1..=48000)
+        .channels_range(1..=2)
         .build();
 
     // build the harness setting its src and sink caps,
@@ -329,11 +325,10 @@ fn csound_filter_caps_negotiation() {
         .expect("pad has no caps");
 
     // our expected caps at the harness sinkpad
-    let expected_caps = gst::Caps::builder("audio/x-raw")
-        .field("format", gst_audio::AUDIO_FORMAT_F64.to_str())
-        .field("rate", 44_100i32)
-        .field("channels", ochannels)
-        .field("layout", "interleaved")
+    let expected_caps = gst_audio::AudioCapsBuilder::new_interleaved()
+        .format(gst_audio::AUDIO_FORMAT_F64)
+        .rate(44_100)
+        .channels(ochannels)
         .build();
 
     assert_eq!(harness_sink_caps, expected_caps);
@@ -350,20 +345,18 @@ fn csound_filter_caps_negotiation_fail() {
     let ichannels = 2;
     let ochannels = 1;
 
-    let src_caps = gst::Caps::builder("audio/x-raw")
-        .field("format", gst_audio::AUDIO_FORMAT_F64.to_str())
-        .field("rate", 44_100i32)
-        .field("channels", ichannels)
-        .field("layout", "interleaved")
+    let src_caps = gst_audio::AudioCapsBuilder::new_interleaved()
+        .format(gst_audio::AUDIO_FORMAT_F64)
+        .rate(44_100)
+        .channels(ichannels)
         .build();
 
     // instead of having a range for channels/rate fields
     // we fixate them  to 2 and 48_000 respectively, which would cause the negotiation error
-    let sink_caps = gst::Caps::builder("audio/x-raw")
-        .field("format", gst_audio::AUDIO_FORMAT_F64.to_str())
-        .field("rate", 48_000i32)
-        .field("channels", ichannels)
-        .field("layout", "interleaved")
+    let sink_caps = gst_audio::AudioCapsBuilder::new_interleaved()
+        .format(gst_audio::AUDIO_FORMAT_F64)
+        .rate(48_000)
+        .channels(ichannels)
         .build();
 
     let mut h = build_harness(