diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2022-10-19 19:18:43 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2022-10-19 19:43:29 +0300 |
commit | 12400b6b87e75cfdfa7701b62cf8698c11e14a73 (patch) | |
tree | df8f49f8258a34e961b8f9710671fc0d97bf7c58 /utils/togglerecord | |
parent | 9ce8e93c6374a712a6c8981557c726a3fc04273b (diff) |
Update everything for element factory builder API changes
And set properties as part of object construction wherever it makes
sense.
Diffstat (limited to 'utils/togglerecord')
-rw-r--r-- | utils/togglerecord/examples/gtk_recording.rs | 80 | ||||
-rw-r--r-- | utils/togglerecord/tests/tests.rs | 48 |
2 files changed, 71 insertions, 57 deletions
diff --git a/utils/togglerecord/examples/gtk_recording.rs b/utils/togglerecord/examples/gtk_recording.rs index a5ce8d1d..5816eefd 100644 --- a/utils/togglerecord/examples/gtk_recording.rs +++ b/utils/togglerecord/examples/gtk_recording.rs @@ -23,54 +23,66 @@ fn create_pipeline() -> ( ) { let pipeline = gst::Pipeline::new(None); - let video_src = gst::ElementFactory::make("videotestsrc", None).unwrap(); - video_src.set_property("is-live", true); - video_src.set_property_from_str("pattern", "ball"); + let video_src = gst::ElementFactory::make("videotestsrc") + .property("is-live", true) + .property_from_str("pattern", "ball") + .build() + .unwrap(); - let timeoverlay = gst::ElementFactory::make("timeoverlay", None).unwrap(); - timeoverlay.set_property("font-desc", "Monospace 20"); + let timeoverlay = gst::ElementFactory::make("timeoverlay") + .property("font-desc", "Monospace 20") + .build() + .unwrap(); - let video_tee = gst::ElementFactory::make("tee", None).unwrap(); - let video_queue1 = gst::ElementFactory::make("queue", None).unwrap(); - let video_queue2 = gst::ElementFactory::make("queue", None).unwrap(); + let video_tee = gst::ElementFactory::make("tee").build().unwrap(); + let video_queue1 = gst::ElementFactory::make("queue").build().unwrap(); + let video_queue2 = gst::ElementFactory::make("queue").build().unwrap(); - let video_convert1 = gst::ElementFactory::make("videoconvert", None).unwrap(); - let video_convert2 = gst::ElementFactory::make("videoconvert", None).unwrap(); + let video_convert1 = gst::ElementFactory::make("videoconvert").build().unwrap(); + let video_convert2 = gst::ElementFactory::make("videoconvert").build().unwrap(); - let video_sink = gst::ElementFactory::make("gtk4paintablesink", None).unwrap(); + let video_sink = gst::ElementFactory::make("gtk4paintablesink") + .build() + .unwrap(); - let video_enc = gst::ElementFactory::make("x264enc", None).unwrap(); - video_enc.set_property("rc-lookahead", 10i32); - video_enc.set_property("key-int-max", 30u32); - let video_parse = gst::ElementFactory::make("h264parse", None).unwrap(); + let video_enc = gst::ElementFactory::make("x264enc") + .property("rc-lookahead", 10i32) + .property("key-int-max", 30u32) + .build() + .unwrap(); + let video_parse = gst::ElementFactory::make("h264parse").build().unwrap(); - let audio_src = gst::ElementFactory::make("audiotestsrc", None).unwrap(); - audio_src.set_property("is-live", true); - audio_src.set_property_from_str("wave", "ticks"); + let audio_src = gst::ElementFactory::make("audiotestsrc") + .property("is-live", true) + .property_from_str("wave", "ticks") + .build() + .unwrap(); - let audio_tee = gst::ElementFactory::make("tee", None).unwrap(); - let audio_queue1 = gst::ElementFactory::make("queue", None).unwrap(); - let audio_queue2 = gst::ElementFactory::make("queue", None).unwrap(); + let audio_tee = gst::ElementFactory::make("tee").build().unwrap(); + let audio_queue1 = gst::ElementFactory::make("queue").build().unwrap(); + let audio_queue2 = gst::ElementFactory::make("queue").build().unwrap(); - let audio_convert1 = gst::ElementFactory::make("audioconvert", None).unwrap(); - let audio_convert2 = gst::ElementFactory::make("audioconvert", None).unwrap(); + let audio_convert1 = gst::ElementFactory::make("audioconvert").build().unwrap(); + let audio_convert2 = gst::ElementFactory::make("audioconvert").build().unwrap(); - let audio_sink = gst::ElementFactory::make("autoaudiosink", None).unwrap(); + let audio_sink = gst::ElementFactory::make("autoaudiosink").build().unwrap(); - let audio_enc = gst::ElementFactory::make("lamemp3enc", None).unwrap(); - let audio_parse = gst::ElementFactory::make("mpegaudioparse", None).unwrap(); + let audio_enc = gst::ElementFactory::make("lamemp3enc").build().unwrap(); + let audio_parse = gst::ElementFactory::make("mpegaudioparse").build().unwrap(); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); - let mux_queue1 = gst::ElementFactory::make("queue", None).unwrap(); - let mux_queue2 = gst::ElementFactory::make("queue", None).unwrap(); + let mux_queue1 = gst::ElementFactory::make("queue").build().unwrap(); + let mux_queue2 = gst::ElementFactory::make("queue").build().unwrap(); - let mux = gst::ElementFactory::make("mp4mux", None).unwrap(); + let mux = gst::ElementFactory::make("mp4mux").build().unwrap(); - let file_sink = gst::ElementFactory::make("filesink", None).unwrap(); - file_sink.set_property("location", "recording.mp4"); - file_sink.set_property("async", false); - file_sink.set_property("sync", false); + let file_sink = gst::ElementFactory::make("filesink") + .property("location", "recording.mp4") + .property("async", false) + .property("sync", false) + .build() + .unwrap(); pipeline .add_many(&[ diff --git a/utils/togglerecord/tests/tests.rs b/utils/togglerecord/tests/tests.rs index 8e16990d..e5511f5f 100644 --- a/utils/togglerecord/tests/tests.rs +++ b/utils/togglerecord/tests/tests.rs @@ -43,8 +43,10 @@ fn setup_sender_receiver( mpsc::Receiver<Either<gst::Buffer, gst::Event>>, thread::JoinHandle<()>, ) { - let fakesink = gst::ElementFactory::make("fakesink", None).unwrap(); - fakesink.set_property("async", false); + let fakesink = gst::ElementFactory::make("fakesink") + .property("async", false) + .build() + .unwrap(); pipeline.add(&fakesink).unwrap(); let main_stream = pad == "src"; @@ -250,13 +252,13 @@ fn recv_buffers( #[test] fn test_create() { init(); - assert!(gst::ElementFactory::make("togglerecord", None).is_ok()); + assert!(gst::ElementFactory::make("togglerecord").build().is_ok()); } #[test] fn test_create_pads() { init(); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); let sinkpad = togglerecord.request_pad_simple("sink_%u").unwrap(); let srcpad = sinkpad.iterate_internal_links().next().unwrap().unwrap(); @@ -274,7 +276,7 @@ fn test_one_stream_open() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input, _, receiver_output, thread) = @@ -306,7 +308,7 @@ fn test_one_stream_gaps_open() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input, _, receiver_output, thread) = @@ -339,7 +341,7 @@ fn test_one_stream_close_open() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input, receiver_input_done, receiver_output, thread) = @@ -373,7 +375,7 @@ fn test_one_stream_open_close() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input, receiver_input_done, receiver_output, thread) = @@ -408,7 +410,7 @@ fn test_one_stream_open_close_open() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input, receiver_input_done, receiver_output, thread) = @@ -452,7 +454,7 @@ fn test_two_stream_open() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -505,7 +507,7 @@ fn test_two_stream_open_shift() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -562,7 +564,7 @@ fn test_two_stream_open_shift_main() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -627,7 +629,7 @@ fn test_two_stream_open_close() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -696,7 +698,7 @@ fn test_two_stream_close_open() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -765,7 +767,7 @@ fn test_two_stream_open_close_open() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -859,7 +861,7 @@ fn test_two_stream_open_close_open_gaps() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -959,7 +961,7 @@ fn test_two_stream_close_open_close_delta() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -1048,7 +1050,7 @@ fn test_three_stream_open_close_open() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -1172,7 +1174,7 @@ fn test_two_stream_main_eos() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -1247,7 +1249,7 @@ fn test_two_stream_secondary_eos_first() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -1315,7 +1317,7 @@ fn test_three_stream_main_eos() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -1416,7 +1418,7 @@ fn test_three_stream_main_and_second_eos() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = @@ -1517,7 +1519,7 @@ fn test_three_stream_secondary_eos_first() { init(); let pipeline = gst::Pipeline::new(None); - let togglerecord = gst::ElementFactory::make("togglerecord", None).unwrap(); + let togglerecord = gst::ElementFactory::make("togglerecord").build().unwrap(); pipeline.add(&togglerecord).unwrap(); let (sender_input_1, receiver_input_done_1, receiver_output_1, thread_1) = |