Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update gstreamer in gstplugin port.

Browse source
This commit is contained in:
Josh Matthews 2020-02-19 17:46:43 -05:00
parent b13a37db28
commit fee7cc2a36
5 changed files with 58 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ports/gstplugin/Cargo.toml
View file

@ -18,13 +18,13 @@ path = "lib.rs"
crossbeam-channel = "0.4"
euclid = "0.20"
gleam = "0.6"
glib = { version = "0.8", features = ["subclassing"] }
gstreamer = { version = "0.14", features = ["subclassing"] }
gstreamer-base = { version = "0.14", features = ["subclassing"] }
gstreamer-gl = { version = "0.14" }
glib = "0.9"
gstreamer = "0.15"
gstreamer-base = "0.15"
gstreamer-gl = "0.15"
gstreamer-gl-sys = { version = "0.8", features = ["wayland"] }
gstreamer-sys = { version = "0.8" }
gstreamer-video = { version = "0.14", features = ["subclassing"] }
gstreamer-sys = "0.8"
gstreamer-video = "0.15"
log = "0.4"
lazy_static = "1.4"
libservo = {path = "../../components/servo"}

12
ports/gstplugin/servowebsrc.rs
View file

@ -12,7 +12,6 @@ use euclid::Rect;
use euclid::Scale;
use euclid::Size2D;
use glib::glib_bool_error;
use glib::glib_object_impl;
use glib::glib_object_subclass;
use glib::object::Cast;
@ -110,6 +109,7 @@ use std::collections::HashMap;
use std::convert::TryFrom;
use std::ffi::c_void;
use std::rc::Rc;
use std::str::FromStr;
use std::sync::atomic::AtomicU64;
use std::sync::atomic::Ordering;
use std::sync::Mutex;
@ -519,7 +519,7 @@ impl ObjectSubclass for ServoWebSrc {
env!("CARGO_PKG_AUTHORS"),
);
let src_caps = Caps::from_string(CAPS).unwrap();
let src_caps = Caps::from_str(CAPS).unwrap();
let src_pad_template =
PadTemplate::new("src", PadDirection::Src, PadPresence::Always, &src_caps).unwrap();
klass.add_pad_template(src_pad_template);
@ -546,7 +546,7 @@ impl ObjectImpl for ServoWebSrc {
Property("url", ..) => {
let mut guard = self.url.lock().expect("Failed to lock mutex");
let url = value.get().expect("Failed to get url value");
*guard = Some(url);
*guard = url;
},
_ => unimplemented!(),
}
@ -572,14 +572,14 @@ impl BaseSrcImpl for ServoWebSrc {
// Save the video info for later use
let info = VideoInfo::from_caps(outcaps)
.ok_or_else(|| gst_loggable_error!(CATEGORY, "Failed to get video info"))?;
.map_err(|_| gst_loggable_error!(CATEGORY, "Failed to get video info"))?;
*self.info.lock().unwrap() = Some(info);
// Save the framerate if it is set
let framerate = outcaps
.get_structure(0)
.and_then(|cap| cap.get::<Fraction>("framerate"));
if let Some(framerate) = framerate {
.and_then(|cap| cap.get::<Fraction>("framerate").ok());
if let Some(Some(framerate)) = framerate {
let frame_duration_micros =
1_000_000 * *framerate.denom() as u64 / *framerate.numer() as u64;
debug!("Setting frame duration to {}micros", frame_duration_micros);

2
ports/libsimpleservo/jniapi/Cargo.toml
View file

@ -16,7 +16,7 @@ bench = false
[dependencies]
android_injected_glue = "0.2"
android_logger = "0.7"
gstreamer = "0.14.5"
gstreamer = "0.15"
jni = "0.10.2"
libc = "0.2"
log = "0.4"