mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2025-02-18 03:55:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix Player constructor on GStreamer 1.12 if a video renderer or signal dispatcher are given

Browse source
This commit is contained in:
Sebastian Dröge 2017-09-10 15:20:58 +03:00
parent 556b0197fc
commit 6674243cc7
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gstreamer-player/src/player.rs
View file

@ -19,17 +19,16 @@ impl Player {
signal_dispatcher: Option<&PlayerSignalDispatcher>, signal_dispatcher: Option<&PlayerSignalDispatcher>,
) -> Player { ) -> Player {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
let video_renderer = video_renderer.to_glib_full();
let signal_dispatcher = signal_dispatcher.to_glib_full();
let (major, minor, _, _) = gst::version(); let (major, minor, _, _) = gst::version();
if (major, minor) > (1, 12) { if (major, minor) > (1, 12) {
let video_renderer = video_renderer.to_glib_full();
let signal_dispatcher = signal_dispatcher.to_glib_full();
unsafe { from_glib_full(ffi::gst_player_new(video_renderer, signal_dispatcher)) } unsafe { from_glib_full(ffi::gst_player_new(video_renderer, signal_dispatcher)) }
} else { } else {
// Workaround for bad floating reference handling in 1.12. This issue was fixed for 1.13 in // Workaround for bad floating reference handling in 1.12. This issue was fixed for 1.13 in
// https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/gst-libs/gst/player/gstplayer.c?id=634cd87c76f58b5e1383715bafd5614db825c7d1 // https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/gst-libs/gst/player/gstplayer.c?id=634cd87c76f58b5e1383715bafd5614db825c7d1
let video_renderer = video_renderer.to_glib_none(); unsafe { from_glib_none(ffi::gst_player_new(video_renderer, signal_dispatcher)) }
let signal_dispatcher = signal_dispatcher.to_glib_none();
unsafe { from_glib_none(ffi::gst_player_new(video_renderer.0, signal_dispatcher.0)) }
} }
} }