Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recorder: Always use mixer and fix potential bugs for null access #229

Closed
wants to merge 2 commits into from
Closed

Recorder: Always use mixer and fix potential bugs for null access #229

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
956acfb
Recorder: Always use mixer
ryonakano Jan 20, 2024
86d5b40
Fix potential bugs
ryonakano Jan 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 18 additions & 21 deletions src/Services/Recorder.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,18 @@ public class Recorder : Object {
throw new Gst.ParseError.NO_SUCH_ELEMENT ("Failed to create element \"level\"");
}

var mixer = Gst.ElementFactory.make ("audiomixer", "mixer");
if (mixer == null) {
throw new Gst.ParseError.NO_SUCH_ELEMENT ("Failed to create element \"audiomixer\"");
}

var sink = Gst.ElementFactory.make ("filesink", "sink");
if (sink == null) {
throw new Gst.ParseError.NO_SUCH_ELEMENT ("Failed to create element \"filesink\"");
}

pipeline.add_many (level, mixer, sink);

SourceID source = (SourceID) Application.settings.get_enum ("source");

Gst.Element? sys_sound = null;
Expand All @@ -150,6 +157,8 @@ public class Recorder : Object {

sys_sound.set ("device", monitor_name);
debug ("sound source (system): \"Monitor of %s\"", default_sink.display_name);
pipeline.add (sys_sound);
sys_sound.get_static_pad ("src").link (mixer.request_pad_simple ("sink_%u"));
}

Gst.Element? mic_sound = null;
Expand All @@ -162,6 +171,8 @@ public class Recorder : Object {
}

debug ("sound source (microphone): \"%s\"", microphone.display_name);
pipeline.add (mic_sound);
mic_sound.get_static_pad ("src").link (mixer.request_pad_simple ("sink_%u"));
}

FormatID file_format = (FormatID) Application.settings.get_enum ("format");
Expand All @@ -175,7 +186,7 @@ public class Recorder : Object {
Gst.Element? muxer = null;
if (fmt_data.muxer != null) {
muxer = Gst.ElementFactory.make (fmt_data.muxer, "muxer");
if (encoder == null) {
if (muxer == null) {
throw new Gst.ParseError.NO_SUCH_ELEMENT ("Failed to create muxer element \"%s\"", fmt_data.muxer);
}
}
Expand All @@ -189,31 +200,17 @@ public class Recorder : Object {

// Dual-channelization
var caps_filter = Gst.ElementFactory.make ("capsfilter", "filter");
if (caps_filter == null) {
throw new Gst.ParseError.NO_SUCH_ELEMENT ("Failed to create element \"capsfilter\"");
}

caps_filter.set ("caps", new Gst.Caps.simple (
"audio/x-raw", "channels", Type.INT,
(ChannelID) Application.settings.get_enum ("channel")
));
pipeline.add_many (caps_filter, level, encoder, sink);

switch (source) {
case SourceID.MIC:
pipeline.add_many (mic_sound);
mic_sound.link_many (caps_filter, level, encoder);
break;
case SourceID.SYSTEM:
pipeline.add_many (sys_sound);
sys_sound.link_many (caps_filter, level, encoder);
break;
case SourceID.BOTH:
var mixer = Gst.ElementFactory.make ("audiomixer", "mixer");
pipeline.add_many (mic_sound, sys_sound, mixer);
mic_sound.get_static_pad ("src").link (mixer.request_pad_simple ("sink_%u"));
sys_sound.get_static_pad ("src").link (mixer.request_pad_simple ("sink_%u"));
mixer.link_many (caps_filter, level, encoder);
break;
default:
assert_not_reached ();
}
pipeline.add_many (caps_filter, encoder);
mixer.link_many (caps_filter, level, encoder);

if (muxer != null) {
pipeline.add (muxer);
Expand Down