anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Crop video to match widget ratio

Browse source
This commit is contained in:
Marvin W 2021-11-09 22:06:45 +01:00 committed by fiaxh
parent 4c56a84303
commit aae13b9ea6
1 changed files with 45 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
plugins/rtp/src/video_widget.vala
View file

@ -12,8 +12,9 @@ public class Dino.Plugins.Rtp.VideoWidget : Gtk.Bin, Dino.Plugins.VideoCallWidge
private bool attached; private bool attached;
private Device? connected_device; private Device? connected_device;
private Gst.Element? connected_device_element;
private Stream? connected_stream; private Stream? connected_stream;
private Gst.Element convert; private Gst.Element prepare;
public VideoWidget(Plugin plugin) { public VideoWidget(Plugin plugin) {
this.plugin = plugin; this.plugin = plugin;
@ -28,22 +29,34 @@ public class Dino.Plugins.Rtp.VideoWidget : Gtk.Bin, Dino.Plugins.VideoCallWidge
this.widget = widget; this.widget = widget;
add(widget); add(widget);
widget.visible = true; widget.visible = true;
// Listen for resolution changes
element.get_static_pad("sink").notify["caps"].connect(() => {
if (element.get_static_pad("sink").caps == null) return;
int width, height;
element.get_static_pad("sink").caps.get_structure(0).get_int("width", out width);
element.get_static_pad("sink").caps.get_structure(0).get_int("height", out height);
resolution_changed(width, height);
});
} else { } else {
warning("Could not create GTK video sink. Won't display videos."); warning("Could not create GTK video sink. Won't display videos.");
} }
size_allocate.connect_after(after_size_allocate);
} }
public void display_stream(Xmpp.Xep.JingleRtp.Stream stream) { public void input_caps_changed(GLib.Object pad, ParamSpec spec) {
Gst.Caps? caps = (pad as Gst.Pad).caps;
if (caps == null) return;
int width, height;
caps.get_structure(0).get_int("width", out width);
caps.get_structure(0).get_int("height", out height);
resolution_changed(width, height);
}
public void after_size_allocate(Gtk.Allocation allocation) {
if (prepare != null) {
Gst.Element crop = ((Gst.Bin)prepare).get_by_name(@"video_widget_$(id)_crop");
if (crop != null) {
Value ratio = new Value(typeof(Gst.Fraction));
Gst.Value.set_fraction(ref ratio, allocation.width, allocation.height);
crop.set_property("aspect-ratio", ratio);
}
}
}
public void display_stream(Xmpp.Xep.JingleRtp.Stream stream, Xmpp.Jid jid) {
if (element == null) return; if (element == null) return;
detach(); detach();
if (stream.media != "video") return; if (stream.media != "video") return;
@ -51,11 +64,12 @@ public class Dino.Plugins.Rtp.VideoWidget : Gtk.Bin, Dino.Plugins.VideoCallWidge
if (connected_stream == null) return; if (connected_stream == null) return;
plugin.pause(); plugin.pause();
pipe.add(element); pipe.add(element);
convert = Gst.parse_bin_from_description(@"videoconvert name=video_widget_$(id)_convert", true); prepare = Gst.parse_bin_from_description(@"aspectratiocrop aspect-ratio=4/3 name=video_widget_$(id)_crop ! videoconvert name=video_widget_$(id)_convert", true);
convert.name = @"video_widget_$(id)_prepare"; prepare.name = @"video_widget_$(id)_prepare";
pipe.add(convert); prepare.get_static_pad("sink").notify["caps"].connect(input_caps_changed);
convert.link(element); pipe.add(prepare);
connected_stream.add_output(convert); connected_stream.add_output(prepare);
prepare.link(element);
element.set_locked_state(false); element.set_locked_state(false);
plugin.unpause(); plugin.unpause();
attached = true; attached = true;
@ -68,11 +82,13 @@ public class Dino.Plugins.Rtp.VideoWidget : Gtk.Bin, Dino.Plugins.VideoCallWidge
if (connected_device == null) return; if (connected_device == null) return;
plugin.pause(); plugin.pause();
pipe.add(element); pipe.add(element);
convert = Gst.parse_bin_from_description(@"videoflip method=horizontal-flip name=video_widget_$(id)_flip ! videoconvert name=video_widget_$(id)_convert", true); prepare = Gst.parse_bin_from_description(@"aspectratiocrop aspect-ratio=4/3 name=video_widget_$(id)_crop ! videoflip method=horizontal-flip name=video_widget_$(id)_flip ! videoconvert name=video_widget_$(id)_convert", true);
convert.name = @"video_widget_$(id)_prepare"; prepare.name = @"video_widget_$(id)_prepare";
pipe.add(convert); prepare.get_static_pad("sink").notify["caps"].connect(input_caps_changed);
convert.link(element); pipe.add(prepare);
connected_device.link_source().link(convert); connected_device_element = connected_device.link_source();
connected_device_element.link(prepare);
prepare.link(element);
element.set_locked_state(false); element.set_locked_state(false);
plugin.unpause(); plugin.unpause();
attached = true; attached = true;
@ -82,19 +98,19 @@ public class Dino.Plugins.Rtp.VideoWidget : Gtk.Bin, Dino.Plugins.VideoCallWidge
if (element == null) return; if (element == null) return;
if (attached) { if (attached) {
if (connected_stream != null) { if (connected_stream != null) {
connected_stream.remove_output(convert); connected_stream.remove_output(prepare);
connected_stream = null; connected_stream = null;
} }
if (connected_device != null) { if (connected_device != null) {
connected_device.link_source().unlink(element); connected_device_element.unlink(element);
connected_device.unlink(); // We get a new ref to recover the element, so unlink twice connected_device_element = null;
connected_device.unlink(); connected_device.unlink();
connected_device = null; connected_device = null;
} }
convert.set_locked_state(true); prepare.set_locked_state(true);
convert.set_state(Gst.State.NULL); prepare.set_state(Gst.State.NULL);
pipe.remove(convert); pipe.remove(prepare);
convert = null; prepare = null;
element.set_locked_state(true); element.set_locked_state(true);
element.set_state(Gst.State.NULL); element.set_state(Gst.State.NULL);
pipe.remove(element); pipe.remove(element);