Skip to content
Permalink
Browse files

Miscellaneous gstreamer plugin fixes

  • Loading branch information
asajeffrey committed Dec 13, 2019
1 parent dcdf910 commit aca438aebc9291db9f1226d2575230a5189eddea
Showing with 263 additions and 124 deletions.
  1. +48 −8 Cargo.lock
  2. +3 −3 ports/gstplugin/Cargo.toml
  3. +1 −1 ports/gstplugin/logging.rs
  4. +206 −112 ports/gstplugin/servowebsrc.rs
  5. +5 −0 servo-tidy.toml

Some generated files are not rendered by default. Learn more.

@@ -22,7 +22,7 @@ glib = { version = "0.8", features = ["subclassing"] }
gstreamer = { version = "0.14", features = ["subclassing"] }
gstreamer-base = { version = "0.14", features = ["subclassing"] }
gstreamer-gl = { version = "0.14" }
gstreamer-gl-sys = { version = "0.8" }
gstreamer-gl-sys = { version = "0.8", features = ["wayland"] }
gstreamer-sys = { version = "0.8" }
gstreamer-video = { version = "0.14", features = ["subclassing"] }
log = "0.4"
@@ -31,9 +31,9 @@ libservo = {path = "../../components/servo"}
servo-media = {git = "https://github.com/servo/media"}
sparkle = "0.1"
# NOTE: the sm-angle-default feature only enables angle on windows, not other platforms!
surfman = { version = "0.1", features = ["sm-angle-default", "sm-osmesa"] }
surfman = { git = "https://github.com/pcwalton/surfman", branch = "multi" }
surfman-chains-api = "0.2"
surfman-chains = "0.2.1"
surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains", branch = "multi" }

[build-dependencies]
gst-plugin-version-helper = "0.1"
@@ -9,7 +9,7 @@ use lazy_static::lazy_static;

lazy_static! {
pub static ref CATEGORY: DebugCategory =
DebugCategory::new("servosrc", DebugColorFlags::empty(), Some("Servo"));
DebugCategory::new("servowebsrc", DebugColorFlags::empty(), Some("Servo"));
}

pub static LOGGER: ServoSrcLogger = ServoSrcLogger;

0 comments on commit aca438a

Please sign in to comment.
You can’t perform that action at this time.