From 36825b82f3e619df2205150ec6beed5703001e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Wed, 27 Feb 2019 12:13:25 +0100 Subject: [PATCH 1/4] Shutdown player when HTMLMediaElement is dropped --- Cargo.lock | 577 +++--------------- components/script/dom/baseaudiocontext.rs | 6 +- components/script/dom/bindings/trace.rs | 3 +- components/script/dom/htmlmediaelement.rs | 25 +- tests/wpt/mozilla/meta/MANIFEST.json | 48 +- .../tests/mozilla/remove_video_iframe.html | 14 + .../resources/remove_video_iframe_inner.html | 1 + .../mozilla/tests/mozilla/resources/video.mp4 | Bin 0 -> 31603 bytes 8 files changed, 151 insertions(+), 523 deletions(-) create mode 100644 tests/wpt/mozilla/tests/mozilla/remove_video_iframe.html create mode 100644 tests/wpt/mozilla/tests/mozilla/resources/remove_video_iframe_inner.html create mode 100644 tests/wpt/mozilla/tests/mozilla/resources/video.mp4 diff --git a/Cargo.lock b/Cargo.lock index cb5c8464d52..782d49bd8fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,7 +61,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_log-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -91,14 +91,6 @@ dependencies = [ "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "array-init" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "arrayref" version = "0.3.5" @@ -154,7 +146,7 @@ dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -225,7 +217,7 @@ dependencies = [ "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -280,7 +272,7 @@ dependencies = [ "device 0.0.1 (git+https://github.com/servo/devices)", "embedder_traits 0.0.1", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "servo_rand 0.0.1", "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -306,7 +298,7 @@ name = "blurmac" version = "0.1.0" source = "git+https://github.com/servo/devices#cb28c4725ffbfece99dab842d17d3e8c50774778" dependencies = [ - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -351,11 +343,6 @@ dependencies = [ "alloc-stdlib 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "build_const" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "byte-slice-cast" version = "0.2.0" @@ -385,24 +372,6 @@ dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bzip2" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bzip2-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "canvas" version = "0.0.1" @@ -417,7 +386,7 @@ dependencies = [ "gleam 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", "pixels 0.0.1", @@ -461,7 +430,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clap 2.28.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -616,7 +585,7 @@ dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -658,7 +627,7 @@ dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "layout_traits 0.0.1", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "metrics 0.0.1", "msg 0.0.1", "net 0.0.1", @@ -719,14 +688,6 @@ dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "crc" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "crc32fast" version = "1.1.2" @@ -911,7 +872,7 @@ name = "debugger" version = "0.0.1" dependencies = [ "crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "ws 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -973,7 +934,7 @@ dependencies = [ "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1088,7 +1049,7 @@ dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1173,7 +1134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1248,7 +1209,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide_c_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1339,7 +1299,7 @@ version = "0.2.0" source = "git+https://github.com/servo/gaol#3882c7f7c27b7908b6d574a6e7e6a86598ecbba4" dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1384,7 +1344,7 @@ dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "net_traits 0.0.1", "ordered-float 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1433,7 +1393,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1445,27 +1405,6 @@ dependencies = [ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "glib" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "glib-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "glob" version = "0.2.11" @@ -1502,270 +1441,6 @@ dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gobject-subclass" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gobject-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gst-plugin" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-subclass 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-app" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-app-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-app-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-audio" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "array-init 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-audio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-audio-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-base" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-base-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-player" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-player-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-video 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-player-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-video-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-sdp" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sdp-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-sdp-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-video" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-video-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-video-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-base-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-webrtc" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sdp 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-webrtc-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "gstreamer-webrtc-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sdp-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gvr-sys" version = "0.7.0" @@ -1782,7 +1457,7 @@ dependencies = [ "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "string 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1889,7 +1564,7 @@ name = "html5ever" version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1933,7 +1608,7 @@ dependencies = [ "httparse 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2117,7 +1792,7 @@ dependencies = [ "combine 3.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "jni-sys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2186,7 +1861,7 @@ dependencies = [ "html5ever 0.22.5 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "msg 0.0.1", "net_traits 0.0.1", @@ -2236,7 +1911,7 @@ dependencies = [ "layout_traits 0.0.1", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "metrics 0.0.1", "msg 0.0.1", @@ -2338,7 +2013,7 @@ name = "libmlservo" version = "0.0.1" dependencies = [ "libservo 0.0.1", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "simpleservo 0.0.1", "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2368,7 +2043,7 @@ dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "layout_thread 0.0.1", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", @@ -2432,7 +2107,7 @@ dependencies = [ [[package]] name = "log" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2560,7 +2235,7 @@ version = "0.0.1" dependencies = [ "gfx_traits 0.0.1", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -2614,26 +2289,6 @@ dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "miniz_oxide" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "miniz_oxide_c_api" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "mio" version = "0.6.16" @@ -2645,7 +2300,7 @@ dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazycell 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2658,7 +2313,7 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazycell 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2706,7 +2361,7 @@ dependencies = [ "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mozjs_sys 0.61.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2722,15 +2377,6 @@ dependencies = [ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "msdos_time" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "msg" version = "0.0.1" @@ -2742,11 +2388,6 @@ dependencies = [ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)", ] -[[package]] -name = "muldiv" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "net" version = "0.0.1" @@ -2770,7 +2411,7 @@ dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2823,7 +2464,7 @@ dependencies = [ "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2962,7 +2603,7 @@ dependencies = [ "gleam 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3143,7 +2784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3158,11 +2799,6 @@ dependencies = [ "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "podio" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "precomputed-hash" version = "0.1.1" @@ -3189,7 +2825,7 @@ dependencies = [ "influent 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3220,7 +2856,7 @@ dependencies = [ "energy-monitor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "energymon 0.3.0 (git+https://github.com/energymon/energymon-rust.git)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "signpost 0.1.0 (git+https://github.com/pcwalton/signpost.git)", @@ -3369,7 +3005,7 @@ dependencies = [ "gvr-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "ovr-mobile-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rust-webvr-api 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "winit 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3481,7 +3117,7 @@ dependencies = [ "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "metrics 0.0.1", @@ -3627,7 +3263,7 @@ dependencies = [ "cssparser 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", "phf_codegen 0.7.23 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3703,7 +3339,7 @@ dependencies = [ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "libservo 0.0.1", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-src 0.1.0 (git+https://github.com/servo/osmesa-src)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rust-webvr 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3753,10 +3389,9 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" dependencies = [ "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", - "servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)", "servo-media-player 0.1.0 (git+https://github.com/servo/media)", "servo-media-streams 0.1.0 (git+https://github.com/servo/media)", "servo-media-webrtc 0.1.0 (git+https://github.com/servo/media)", @@ -3765,12 +3400,11 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.1.0" -source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3779,41 +3413,10 @@ dependencies = [ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "servo-media-gstreamer" -version = "0.1.0" -source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" -dependencies = [ - "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-subclass 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gst-plugin 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-app 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-audio 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-player 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sdp 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-video 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-webrtc 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", - "servo-media-player 0.1.0 (git+https://github.com/servo/media)", - "servo-media-streams 0.1.0 (git+https://github.com/servo/media)", - "servo-media-webrtc 0.1.0 (git+https://github.com/servo/media)", - "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "zip 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3823,14 +3426,15 @@ dependencies = [ [[package]] name = "servo-media-streams" version = "0.1.0" -source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" [[package]] name = "servo-media-webrtc" version = "0.1.0" -source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo-media-streams 0.1.0 (git+https://github.com/servo/media)", ] @@ -3889,7 +3493,7 @@ dependencies = [ "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3926,7 +3530,7 @@ dependencies = [ [[package]] name = "servo_media_derive" version = "0.1.0" -source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" dependencies = [ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3938,7 +3542,7 @@ name = "servo_rand" version = "0.0.1" dependencies = [ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3948,7 +3552,7 @@ name = "servo_remutex" version = "0.0.1" dependencies = [ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4022,7 +3626,7 @@ dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "libservo 0.0.1", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4033,7 +3637,7 @@ version = "0.0.1" dependencies = [ "cbindgen 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "simpleservo 0.0.1", ] @@ -4046,7 +3650,7 @@ dependencies = [ "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", "jni 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "simpleservo 0.0.1", ] @@ -4179,7 +3783,7 @@ dependencies = [ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4466,7 +4070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4485,7 +4089,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4513,7 +4117,7 @@ dependencies = [ "crossbeam-deque 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4537,7 +4141,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4553,7 +4157,7 @@ dependencies = [ "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4740,7 +4344,7 @@ version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4806,7 +4410,7 @@ dependencies = [ "futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4829,7 +4433,7 @@ dependencies = [ "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net_traits 0.0.1", "pixels 0.0.1", @@ -4866,7 +4470,7 @@ dependencies = [ "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "plane-split 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4923,7 +4527,7 @@ dependencies = [ "euclid 0.19.5 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rust-webvr 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", @@ -5007,7 +4611,7 @@ dependencies = [ "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5042,7 +4646,7 @@ dependencies = [ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5094,7 +4698,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5117,24 +4721,12 @@ name = "xml5ever" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "markup5ever 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "zip" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -] - [metadata] "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" @@ -5149,7 +4741,6 @@ dependencies = [ "checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" "checksum app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9dadc668390b373e73e4abbfc1f07238b09a25858f2f39c06cebc6d8e141d774" "checksum approx 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f71f10b5c4946a64aad7b8cf65e3406cd3da22fc448595991d22423cf6db67b4" -"checksum array-init 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c3cc8456d0ae81a8c76f59e384683a601548c38949a4bfcb65dd31ded5c75ff3" "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" "checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2" "checksum ascii 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae7d751998c189c1d4468cf0a39bb2eae052a9c58d50ebb3b9591ee3813ad50" @@ -5175,14 +4766,11 @@ dependencies = [ "checksum boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbec60c560f322d8e3cd403f91d8908cfd965fff53ba97154bd1b9d90149d98e" "checksum brotli 3.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "43b92d759a5f8532e5b0bc06dc31593af01447db9e141c3b67bdb132e58c2844" "checksum brotli-decompressor 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3f34b04c706eaa3f9e5f47f35a1aa3fdb4d3a2854632dacf87b77995827b19ac" -"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" "checksum byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64" "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" "checksum byte-tools 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "980479e6fde23246dfb54d47580d66b4e99202e7579c5eaa9fe10ecb5ebd2182" "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d" "checksum bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e178b8e0e239e844b083d5a0d4a156b2654e67f9f80144d48398fcd736a24fb8" -"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" -"checksum bzip2-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2c5162604199bbb17690ede847eaa6120a3f33d5ab4dcc8e7c25b16d849ae79b" "checksum caseless 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "808dab3318747be122cb31d36de18d4d1c81277a76f8332a02b81a3d73463d7f" "checksum cbindgen 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ae5776bf2f6d5ff4f07eb63aa666fd9e1dbe0fe4b87f0fa32b469efae2940f7" "checksum cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "2119ea4867bd2b8ed3aecab467709720b2d55b1bcfe09f772fd68066eaf15275" @@ -5205,7 +4793,6 @@ dependencies = [ "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" "checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9" "checksum core-text 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6705907bc253cee90b8551017836ce50904be305c99fec5ea74a8d72d799e58" -"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192" "checksum crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "548dfc2fa4933009668d4a51f9ef074b8af8f2d6a6410225d76d6b1c3c56ca6f" "checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3" @@ -5270,30 +4857,9 @@ dependencies = [ "checksum gif 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff3414b424657317e708489d2857d9575f4403698428b040b609b9d1c1a84a2c" "checksum gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604" "checksum gleam 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d7591624fbbc384a8195791facbd16a5b118d5d2240c508de518b7ccc771fe" -"checksum glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "740f7fda8dde5f5e3944dabdb4a73ac6094a8a7fdf0af377468e98ca93733e61" -"checksum glib-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3573351e846caed9f11207b275cd67bc07f0c2c94fb628e5d7c92ca056c7882d" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum glutin 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "535c6eda58adbb227604b2db10a022ffd6339d7ea3e970f338e7d98aeb24fcc3" "checksum glx 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "52ec1845f1defffd4e469ff2e3a38b2e042345a0f80a82e84ee508ba5f1e11d6" -"checksum gobject-subclass 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23a365ac97171d914fc0f2ccf86f3a05ae4ee870427eee9c82f6bb95bbf201b6" -"checksum gobject-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08475e4a08f27e6e2287005950114735ed61cec2cb8c1187682a5aec8c69b715" -"checksum gst-plugin 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3225ac2bfebc921ec5a11f52bb95e1b30d48b80d3ebde3d1ce7a800405d1b8e5" -"checksum gstreamer 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df451f98ea8b987b5fc1b647b9f038ca6ea106b08c3bccc1ef3126d4f0a687c1" -"checksum gstreamer-app 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f4f865cf7f22c66907372a2e3b0f0ced3d3fedab823641d6667d2568be71408" -"checksum gstreamer-app-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f0b8319fe7a8a015412a76a56b248a3c68561a39225a3fa0fcbb58aab8e12392" -"checksum gstreamer-audio 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e6161fdafd1211ebcf332cbeb0026dcde297d2f5f211ca99c5c0c90c445dcff8" -"checksum gstreamer-audio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5266ec77146be5279a90d49794339377bc2f78883fd044366261ac9cfac9d6e5" -"checksum gstreamer-base 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4a68e3ee44369208fb27acc94defd10e4e8bc2ae8be77b0a85f90a0cf8bd6fd8" -"checksum gstreamer-base-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1eb57a7d013604ab7af2b843b62b13b8fb30f22d066919f7e198f528c3296cd0" -"checksum gstreamer-player 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1144c6c5c3af25dd1f89b4f9d2762f1c2d8789e65cdc79e2451dd24350d84dd2" -"checksum gstreamer-player-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f0e642cb58d3733e2724def7186101bb00144fc97d45b2c379eba6d0c0662dec" -"checksum gstreamer-sdp 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "047223a666099fd59b357e2db72638bf486d04cff206dc78902f05e9e6260202" -"checksum gstreamer-sdp-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e4db988cfb5a31c422964dcf5d458e878dbe446828c7ab38bf27e9ee47cc0bc" -"checksum gstreamer-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "548bbd6a222826340953d2c1d50c3695463719cfb6414499300de5909a6ba1ea" -"checksum gstreamer-video 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c1f04816d7e183714830da26274f97e7aeff09ae6641058538d21443b4ec07d" -"checksum gstreamer-video-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e2efb301a0b94fa4af503122faa04247085936dd888fd59fa4e21eab3cbd37" -"checksum gstreamer-webrtc 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "247eb5d55a42f1e15200c9e6ff7d854034219798713515c11bd875da0c7d144f" -"checksum gstreamer-webrtc-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c57e396dd61d0b8e55653e801bc906ef32409f3fcbf26b9614167712765c7c80" "checksum gvr-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1334b94d8ce67319ddc44663daef53d8c1538629a11562530c981dbd9085b9a" "checksum h2 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "a27e7ed946e8335bdf9a191bc1b9b14a03ba822d013d2f58437f4fabcbd7fc2c" "checksum half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f" @@ -5345,7 +4911,7 @@ dependencies = [ "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" "checksum linked_hash_set 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3c7c91c4c7bbeb4f2f7c4e5be11e6a05bd6830bc37249c47ce1ad86ad453ff9c" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" -"checksum log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fcce5fa49cc693c312001daf1d13411c4a5283796bac1084299ea3e567113f" +"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" "checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" "checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" @@ -5359,8 +4925,6 @@ dependencies = [ "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" "checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed" "checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4" -"checksum miniz_oxide 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9ba430291c9d6cedae28bcd2d49d1c32fc57d60cd49086646c5dd5673a870eb5" -"checksum miniz_oxide_c_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5a5b8234d6103ebfba71e29786da4608540f862de5ce980a1c94f86a40ca0d51" "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432" "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" @@ -5369,8 +4933,6 @@ dependencies = [ "checksum mozangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "45a8a18a41cfab0fde25cc2f43ea89064d211a0fbb33225b8ff93ab20406e0e7" "checksum mozjs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c7eea7a83e5f237500eb7d66c8ca9c6dc97e3dc4f129eae2dc63fa17fb87f9a" "checksum mozjs_sys 0.61.6 (registry+https://github.com/rust-lang/crates.io-index)" = "610d0fce234d68723526bfdc57091f6f4fe5ed661a343125014cd61823711cb5" -"checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729" -"checksum muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" "checksum new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4" "checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" @@ -5408,7 +4970,6 @@ dependencies = [ "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" "checksum plane-split 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9760bb0546502fcfae6d2d1d638fac6b9272027a3efae34060218152d0ce8387" "checksum png 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9adebf7fb91ccf5eac9da1a8e00e83cb8ae882c3e8d8e4ad59da73cb8c82a2c9" -"checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "38fddd23d98b2144d197c0eca5705632d4fe2667d14a6be5df8934f8d74f1978" "checksum procedural-masquerade 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9a1574a51c3fd37b26d2c0032b649d08a7d51d4cca9c41bbc5bf7118fa4509d0" @@ -5449,7 +5010,6 @@ dependencies = [ "checksum servo-freetype-sys 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d00ab791f66cd2ec58e72c91b6076cee20fac560463aa871404eb31dfc9c4ff" "checksum servo-media 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-audio 0.1.0 (git+https://github.com/servo/media)" = "" -"checksum servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-player 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-streams 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-webrtc 0.1.0 (git+https://github.com/servo/media)" = "" @@ -5558,4 +5118,3 @@ dependencies = [ "checksum xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1" "checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5" "checksum xml5ever 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "32cd7ebf0203c620906230ce22caa5df0b603c32b6fef72a275a48f6a2ae64b9" -"checksum zip 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "77ce0ceee93c995954a31f77903925a6a8bb094709445238e344f2107910e29e" diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs index 9429a03c1aa..e300e2db081 100644 --- a/components/script/dom/baseaudiocontext.rs +++ b/components/script/dom/baseaudiocontext.rs @@ -50,7 +50,7 @@ use servo_media::audio::context::{AudioContext, AudioContextOptions, ProcessingS use servo_media::audio::context::{OfflineAudioContextOptions, RealTimeAudioContextOptions}; use servo_media::audio::decoder::AudioDecoderCallbacks; use servo_media::audio::graph::NodeId; -use servo_media::{Backend, ServoMedia}; +use servo_media::ServoMedia; use std::cell::Cell; use std::collections::{HashMap, VecDeque}; use std::mem; @@ -75,7 +75,7 @@ struct DecodeResolver { pub struct BaseAudioContext { eventtarget: EventTarget, #[ignore_malloc_size_of = "servo_media"] - audio_context_impl: AudioContext, + audio_context_impl: AudioContext, /// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-destination destination: MutNullableDom, listener: MutNullableDom, @@ -131,7 +131,7 @@ impl BaseAudioContext { false } - pub fn audio_context_impl(&self) -> &AudioContext { + pub fn audio_context_impl(&self) -> &AudioContext { &self.audio_context_impl } diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 8216d8c6a71..181bae0a3f9 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -103,7 +103,6 @@ use servo_media::audio::param::ParamType; use servo_media::player::Player; use servo_media::streams::MediaStream as BackendMediaStream; use servo_media::webrtc::WebRtcController; -use servo_media::Backend; use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl}; use smallvec::SmallVec; use std::cell::{Cell, RefCell, UnsafeCell}; @@ -481,7 +480,7 @@ unsafe_no_jsmanaged_fields!(InteractiveWindow); unsafe_no_jsmanaged_fields!(CanvasId); unsafe_no_jsmanaged_fields!(SourceSet); unsafe_no_jsmanaged_fields!(AudioBuffer); -unsafe_no_jsmanaged_fields!(AudioContext); +unsafe_no_jsmanaged_fields!(AudioContext); unsafe_no_jsmanaged_fields!(NodeId); unsafe_no_jsmanaged_fields!(AnalysisEngine, DistanceModel, PanningModel, ParamType); unsafe_no_jsmanaged_fields!(dyn Player); diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index 079bbd9d4bd..fcf2b4dda4c 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -1147,15 +1147,16 @@ impl HTMLMediaElement { action_receiver.to_opaque(), Box::new(move |message| { let event: PlayerEvent = message.to().unwrap(); + trace!("Player event {:?}", event); let this = trusted_node.clone(); - task_source - .queue_with_canceller( - task!(handle_player_event: move || { - this.root().handle_player_event(&event); - }), - &canceller, - ) - .unwrap(); + if let Err(err) = task_source.queue_with_canceller( + task!(handle_player_event: move || { + this.root().handle_player_event(&event); + }), + &canceller, + ) { + warn!("Could not queue player event handler task {:?}", err); + } }), ); @@ -1489,6 +1490,14 @@ impl HTMLMediaElement { } } +impl Drop for HTMLMediaElement { + fn drop(&mut self) { + if let Err(err) = self.player.shutdown() { + warn!("Error shutting down player {:?}", err); + } + } +} + impl HTMLMediaElementMethods for HTMLMediaElement { // https://html.spec.whatwg.org/multipage/#dom-media-networkstate fn NetworkState(&self) -> u16 { diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 4ed5f502112..2e3ce214fb3 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -1,5 +1,11 @@ { "items": { + "conformancechecker": { + "mozilla/remove_video_iframe.html": [] + }, + "manual": { + "mozilla/remove_video_iframe.html": [] + }, "reftest": { "css/abs-overflow-stackingcontext.html": [ [ @@ -7325,6 +7331,7 @@ {} ] ], + "mozilla/remove_video_iframe.html": [], "mozilla/reparse_style_elements.html": [ [ "mozilla/reparse_style_elements.html", @@ -7626,7 +7633,11 @@ ], {} ] - ] + ], + "mozilla/remove_video_iframe.html": [] + }, + "stub": { + "mozilla/remove_video_iframe.html": [] }, "support": { ".gitignore": [ @@ -10864,6 +10875,7 @@ {} ] ], + "mozilla/remove_video_iframe.html": [], "mozilla/reparse_style_elements_ref.html": [ [ {} @@ -10939,6 +10951,11 @@ {} ] ], + "mozilla/resources/remove_video_iframe_inner.html": [ + [ + {} + ] + ], "mozilla/resources/second.html": [ [ {} @@ -10949,6 +10966,11 @@ {} ] ], + "mozilla/resources/video.mp4": [ + [ + {} + ] + ], "mozilla/resources/worker_success.js": [ [ {} @@ -13550,6 +13572,12 @@ {} ] ], + "mozilla/remove_video_iframe.html": [ + [ + "/_mozilla/mozilla/remove_video_iframe.html", + {} + ] + ], "mozilla/response-data-brotli.htm": [ [ "mozilla/response-data-brotli.htm", @@ -13862,6 +13890,12 @@ {} ] ] + }, + "visual": { + "mozilla/remove_video_iframe.html": [] + }, + "wdspec": { + "mozilla/remove_video_iframe.html": [] } }, "paths": { @@ -20461,6 +20495,10 @@ "d562e12720350501ad14223b668131837fd10620", "support" ], + "mozilla/remove_video_iframe.html": [ + "67b28d100828334ba96736d5fb2bcf01ed554d68", + "testharness" + ], "mozilla/reparse_style_elements.html": [ "e54f5a28d131ab41f89d3d70a9d01ea2fae751c1", "reftest" @@ -20529,6 +20567,10 @@ "b0883f382e1a80609b7b2c7904e701fbe6760b14", "support" ], + "mozilla/resources/remove_video_iframe_inner.html": [ + "bdd3d9349af8ade8bb4dcec1d7d46256ee2cffa1", + "support" + ], "mozilla/resources/second.html": [ "c4fbe534ed193e1d192c0338997a8d9da8eb6406", "support" @@ -20537,6 +20579,10 @@ "8faa57c0c47c4fdf27c052d059b28ee1088235e9", "support" ], + "mozilla/resources/video.mp4": [ + "fb5dbca23808bee44003692cb0e139dd6a22e874", + "support" + ], "mozilla/resources/worker_success.js": [ "327986f34b9b20476b6a7b1189c732a9ea8b9f68", "support" diff --git a/tests/wpt/mozilla/tests/mozilla/remove_video_iframe.html b/tests/wpt/mozilla/tests/mozilla/remove_video_iframe.html new file mode 100644 index 00000000000..67b28d10082 --- /dev/null +++ b/tests/wpt/mozilla/tests/mozilla/remove_video_iframe.html @@ -0,0 +1,14 @@ + + +Removing an iframe loading a video should not panic + + + + diff --git a/tests/wpt/mozilla/tests/mozilla/resources/remove_video_iframe_inner.html b/tests/wpt/mozilla/tests/mozilla/resources/remove_video_iframe_inner.html new file mode 100644 index 00000000000..bdd3d9349af --- /dev/null +++ b/tests/wpt/mozilla/tests/mozilla/resources/remove_video_iframe_inner.html @@ -0,0 +1 @@ + diff --git a/tests/wpt/mozilla/tests/mozilla/resources/video.mp4 b/tests/wpt/mozilla/tests/mozilla/resources/video.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..fb5dbca23808bee44003692cb0e139dd6a22e874 GIT binary patch literal 31603 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

7C>UsdFnFIg{I%sCoz;nl?!-`aiObF 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 Date: Tue, 12 Mar 2019 12:46:56 +0100 Subject: [PATCH 2/4] Use servo-media-auto and call ServoMedia::init where required --- Cargo.lock | 483 +++++++++++++++++++++ components/script/Cargo.toml | 1 + components/script/dom/baseaudiocontext.rs | 3 + components/script/dom/htmlmediaelement.rs | 2 + components/script/dom/mediadevices.rs | 2 + components/script/dom/rtcpeerconnection.rs | 2 + 6 files changed, 493 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 782d49bd8fd..79103ada30b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,6 +91,14 @@ dependencies = [ "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "array-init" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "arrayref" version = "0.3.5" @@ -343,6 +351,11 @@ dependencies = [ "alloc-stdlib 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "build_const" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "byte-slice-cast" version = "0.2.0" @@ -372,6 +385,24 @@ dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "bzip2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "canvas" version = "0.0.1" @@ -688,6 +719,14 @@ dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crc" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "crc32fast" version = "1.1.2" @@ -1209,6 +1248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide_c_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1405,6 +1445,27 @@ dependencies = [ "gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "glib" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "glib-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "glob" version = "0.2.11" @@ -1441,6 +1502,285 @@ dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "gobject-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-app" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-app-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-app-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-audio" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "array-init 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-audio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-audio-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-base" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-base-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-gl" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-gl-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-video 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-video-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-gl-egl" +version = "0.1.0" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +dependencies = [ + "gstreamer-gl 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-gl-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-video-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-player" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-player-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-video 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-player-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-video-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-sdp" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sdp-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-sdp-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-video" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-video-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-video-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-webrtc" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sdp 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-webrtc-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gstreamer-webrtc-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sdp-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "gvr-sys" version = "0.7.0" @@ -2289,6 +2629,26 @@ dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "miniz_oxide" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "miniz_oxide_c_api" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", + "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", + "miniz_oxide 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "mio" version = "0.6.16" @@ -2377,6 +2737,15 @@ dependencies = [ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "msdos_time" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "msg" version = "0.0.1" @@ -2388,6 +2757,11 @@ dependencies = [ "webrender_api 0.60.0 (git+https://github.com/servo/webrender)", ] +[[package]] +name = "muldiv" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "net" version = "0.0.1" @@ -2799,6 +3173,11 @@ dependencies = [ "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "podio" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "precomputed-hash" version = "0.1.1" @@ -3146,6 +3525,7 @@ dependencies = [ "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", "servo-media 0.1.0 (git+https://github.com/servo/media)", + "servo-media-auto 0.1.0 (git+https://github.com/servo/media)", "servo_allocator 0.0.1", "servo_arc 0.1.1", "servo_atoms 0.0.1", @@ -3413,6 +3793,61 @@ dependencies = [ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "servo-media-auto" +version = "0.1.0" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +dependencies = [ + "servo-media-dummy 0.1.0 (git+https://github.com/servo/media)", + "servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)", +] + +[[package]] +name = "servo-media-dummy" +version = "0.1.0" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +dependencies = [ + "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-media 0.1.0 (git+https://github.com/servo/media)", + "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", + "servo-media-player 0.1.0 (git+https://github.com/servo/media)", + "servo-media-streams 0.1.0 (git+https://github.com/servo/media)", + "servo-media-webrtc 0.1.0 (git+https://github.com/servo/media)", +] + +[[package]] +name = "servo-media-gstreamer" +version = "0.1.0" +source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +dependencies = [ + "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-app 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-audio 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-gl 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-gl-egl 0.1.0 (git+https://github.com/servo/media)", + "gstreamer-player 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sdp 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sdp-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-video 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gstreamer-webrtc 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-media 0.1.0 (git+https://github.com/servo/media)", + "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", + "servo-media-player 0.1.0 (git+https://github.com/servo/media)", + "servo-media-streams 0.1.0 (git+https://github.com/servo/media)", + "servo-media-webrtc 0.1.0 (git+https://github.com/servo/media)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "zip 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "servo-media-player" version = "0.1.0" @@ -4727,6 +5162,18 @@ dependencies = [ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "zip" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + [metadata] "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e" @@ -4741,6 +5188,7 @@ dependencies = [ "checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" "checksum app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9dadc668390b373e73e4abbfc1f07238b09a25858f2f39c06cebc6d8e141d774" "checksum approx 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f71f10b5c4946a64aad7b8cf65e3406cd3da22fc448595991d22423cf6db67b4" +"checksum array-init 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "23589ecb866b460d3a0f1278834750268c607e8e28a1b982c907219f3178cd72" "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" "checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2" "checksum ascii 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae7d751998c189c1d4468cf0a39bb2eae052a9c58d50ebb3b9591ee3813ad50" @@ -4766,11 +5214,14 @@ dependencies = [ "checksum boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbec60c560f322d8e3cd403f91d8908cfd965fff53ba97154bd1b9d90149d98e" "checksum brotli 3.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "43b92d759a5f8532e5b0bc06dc31593af01447db9e141c3b67bdb132e58c2844" "checksum brotli-decompressor 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3f34b04c706eaa3f9e5f47f35a1aa3fdb4d3a2854632dacf87b77995827b19ac" +"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" "checksum byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64" "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" "checksum byte-tools 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "980479e6fde23246dfb54d47580d66b4e99202e7579c5eaa9fe10ecb5ebd2182" "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d" "checksum bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e178b8e0e239e844b083d5a0d4a156b2654e67f9f80144d48398fcd736a24fb8" +"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" "checksum caseless 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "808dab3318747be122cb31d36de18d4d1c81277a76f8332a02b81a3d73463d7f" "checksum cbindgen 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ae5776bf2f6d5ff4f07eb63aa666fd9e1dbe0fe4b87f0fa32b469efae2940f7" "checksum cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "2119ea4867bd2b8ed3aecab467709720b2d55b1bcfe09f772fd68066eaf15275" @@ -4793,6 +5244,7 @@ dependencies = [ "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" "checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9" "checksum core-text 13.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6705907bc253cee90b8551017836ce50904be305c99fec5ea74a8d72d799e58" +"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192" "checksum crossbeam-channel 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "548dfc2fa4933009668d4a51f9ef074b8af8f2d6a6410225d76d6b1c3c56ca6f" "checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3" @@ -4857,9 +5309,31 @@ dependencies = [ "checksum gif 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff3414b424657317e708489d2857d9575f4403698428b040b609b9d1c1a84a2c" "checksum gl_generator 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0ffaf173cf76c73a73e080366bf556b4776ece104b06961766ff11449f38604" "checksum gleam 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d7591624fbbc384a8195791facbd16a5b118d5d2240c508de518b7ccc771fe" +"checksum glib 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e8fdc159c196a5dfa53a92929ac4c10c8a6637ffb43951f3fff89c2cd2365" +"checksum glib-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5bda542f3caee39a027638e9644ff89204101ad916fd7370b585ad2c5fc97e61" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum glutin 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "535c6eda58adbb227604b2db10a022ffd6339d7ea3e970f338e7d98aeb24fcc3" "checksum glx 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "52ec1845f1defffd4e469ff2e3a38b2e042345a0f80a82e84ee508ba5f1e11d6" +"checksum gobject-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23e05a14290d3dc255223cba51db4b0f3da438d5250657996fa99b2a30faf43e" +"checksum gstreamer 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edd8690dc3fb124e02d06c266c0b2a1ff4617910a26bbf2afb6d8183e76bf8c" +"checksum gstreamer-app 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac4e19310527c932c79da0afa2fb973bc300744347b65e7f8d67d83e4a5484c" +"checksum gstreamer-app-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef2e3acd3ac1127109558bad31b8861f1806141375ca8787baecc25ed9c83497" +"checksum gstreamer-audio 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "505abc1a03de4dfcff4219ec21a98016ce6180950db7b349a31e4aadb4e376cd" +"checksum gstreamer-audio-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2be21b626cbb00f15582da5fc8e254dea95b728fe79a862687a3ad43918a4e8c" +"checksum gstreamer-base 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5125abdd41935c39cf0525160882c18610ee9332496fd4ca69c1218069126ae" +"checksum gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a3f7c5624775ddfdc34a0e5932e1f3786a305390f26844e7567fb0179b985f2" +"checksum gstreamer-gl 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "364a49f206a6d58cc7d51204472cfb2b5e274c8b2b5a438aadfb3e93d21207d7" +"checksum gstreamer-gl-egl 0.1.0 (git+https://github.com/servo/media)" = "" +"checksum gstreamer-gl-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83ac65068d1e4d9a43e84cc87b68f0f3aa79a16edc107722b8fda476b7ae636a" +"checksum gstreamer-player 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5341030ff6c8fb0e83ed01abab236a74cbcbe88afd0f4870e3a6b34a1fd61c4" +"checksum gstreamer-player-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ac29007ef1f9abc0e35ea0b65c4331ddae5355ad6869e1099f3497db606c40a" +"checksum gstreamer-sdp 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "edbaa1a273328f4e8ab261cc2bc0065fdb0f2f53a16f0525b4f5d75cf0aa6225" +"checksum gstreamer-sdp-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81136c0579291b36c1b2fb0e797f4847e22ac502ee36733dfdc5a95fb71c23f0" +"checksum gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "79e3a47e15245892cfa722e5f64714c9e2de5683eef0a706f56a8899b78100c8" +"checksum gstreamer-video 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ac4da6efce179977de2337d392574c6e6c00f502a8fef6f6bfc11f8e16a93ed" +"checksum gstreamer-video-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da2b2bc12f6cbb96f2735e4b9e3241a9832139de042cf67415025c282b2ff9b7" +"checksum gstreamer-webrtc 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90b57e4a91aa677fae841711af3b5b962d37c64c1c62cbeefaba4af18e049c2f" +"checksum gstreamer-webrtc-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9dd6c04ea7cd1222787d6718f1e42a062cae3abbe257ff9ebb34793e67afcdad" "checksum gvr-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1334b94d8ce67319ddc44663daef53d8c1538629a11562530c981dbd9085b9a" "checksum h2 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "a27e7ed946e8335bdf9a191bc1b9b14a03ba822d013d2f58437f4fabcbd7fc2c" "checksum half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f" @@ -4925,6 +5399,8 @@ dependencies = [ "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" "checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed" "checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4" +"checksum miniz_oxide 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9ba430291c9d6cedae28bcd2d49d1c32fc57d60cd49086646c5dd5673a870eb5" +"checksum miniz_oxide_c_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5a5b8234d6103ebfba71e29786da4608540f862de5ce980a1c94f86a40ca0d51" "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432" "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" @@ -4933,6 +5409,8 @@ dependencies = [ "checksum mozangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "45a8a18a41cfab0fde25cc2f43ea89064d211a0fbb33225b8ff93ab20406e0e7" "checksum mozjs 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c7eea7a83e5f237500eb7d66c8ca9c6dc97e3dc4f129eae2dc63fa17fb87f9a" "checksum mozjs_sys 0.61.6 (registry+https://github.com/rust-lang/crates.io-index)" = "610d0fce234d68723526bfdc57091f6f4fe5ed661a343125014cd61823711cb5" +"checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729" +"checksum muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" "checksum new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4" "checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" @@ -4970,6 +5448,7 @@ dependencies = [ "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" "checksum plane-split 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9760bb0546502fcfae6d2d1d638fac6b9272027a3efae34060218152d0ce8387" "checksum png 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9adebf7fb91ccf5eac9da1a8e00e83cb8ae882c3e8d8e4ad59da73cb8c82a2c9" +"checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "38fddd23d98b2144d197c0eca5705632d4fe2667d14a6be5df8934f8d74f1978" "checksum procedural-masquerade 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9a1574a51c3fd37b26d2c0032b649d08a7d51d4cca9c41bbc5bf7118fa4509d0" @@ -5010,6 +5489,9 @@ dependencies = [ "checksum servo-freetype-sys 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d00ab791f66cd2ec58e72c91b6076cee20fac560463aa871404eb31dfc9c4ff" "checksum servo-media 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-audio 0.1.0 (git+https://github.com/servo/media)" = "" +"checksum servo-media-auto 0.1.0 (git+https://github.com/servo/media)" = "" +"checksum servo-media-dummy 0.1.0 (git+https://github.com/servo/media)" = "" +"checksum servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-player 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-streams 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-webrtc 0.1.0 (git+https://github.com/servo/media)" = "" @@ -5118,3 +5600,4 @@ dependencies = [ "checksum xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "12ea8eda4b1eb72f02d148402e23832d56a33f55d8c1b2d5bcdde91d79d47cb1" "checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5" "checksum xml5ever 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "32cd7ebf0203c620906230ce22caa5df0b603c32b6fef72a275a48f6a2ae64b9" +"checksum zip 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "77ce0ceee93c995954a31f77903925a6a8bb094709445238e344f2107910e29e" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 421d16fca3c..6bb94a63abf 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -96,6 +96,7 @@ servo_atoms = {path = "../atoms"} servo_config = {path = "../config"} servo_geometry = {path = "../geometry" } servo-media = {git = "https://github.com/servo/media"} +servo-media-auto = {git = "https://github.com/servo/media"} servo_rand = {path = "../rand"} servo_url = {path = "../url"} smallvec = { version = "0.6", features = ["std", "union"] } diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs index e300e2db081..96f21eeddfc 100644 --- a/components/script/dom/baseaudiocontext.rs +++ b/components/script/dom/baseaudiocontext.rs @@ -51,6 +51,7 @@ use servo_media::audio::context::{OfflineAudioContextOptions, RealTimeAudioConte use servo_media::audio::decoder::AudioDecoderCallbacks; use servo_media::audio::graph::NodeId; use servo_media::ServoMedia; +use servo_media_auto::Backend; use std::cell::Cell; use std::collections::{HashMap, VecDeque}; use std::mem; @@ -108,6 +109,8 @@ impl BaseAudioContext { }, }; + ServoMedia::init::(); + let context = BaseAudioContext { eventtarget: EventTarget::new_inherited(), audio_context_impl: ServoMedia::get() diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index fcf2b4dda4c..de84ae42b4f 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -68,6 +68,7 @@ use servo_config::pref; use servo_media::player::frame::{Frame, FrameRenderer}; use servo_media::player::{PlaybackState, Player, PlayerError, PlayerEvent, StreamType}; use servo_media::ServoMedia; +use servo_media_auto::Backend; use servo_url::ServoUrl; use std::cell::Cell; use std::collections::VecDeque; @@ -249,6 +250,7 @@ pub enum ReadyState { impl HTMLMediaElement { pub fn new_inherited(tag_name: LocalName, prefix: Option, document: &Document) -> Self { + ServoMedia::init::(); Self { htmlelement: HTMLElement::new_inherited(tag_name, prefix, document), network_state: Cell::new(NetworkState::Empty), diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs index b89762c3779..808ce22c2af 100644 --- a/components/script/dom/mediadevices.rs +++ b/components/script/dom/mediadevices.rs @@ -17,6 +17,7 @@ use crate::dom::promise::Promise; use dom_struct::dom_struct; use servo_media::streams::capture::{Constrain, ConstrainRange, MediaTrackConstraintSet}; use servo_media::ServoMedia; +use servo_media_auto::Backend; use std::rc::Rc; #[dom_struct] @@ -26,6 +27,7 @@ pub struct MediaDevices { impl MediaDevices { pub fn new_inherited() -> MediaDevices { + ServoMedia::init::(); MediaDevices { eventtarget: EventTarget::new_inherited(), } diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs index eb94914e588..0a1c41cf3f9 100644 --- a/components/script/dom/rtcpeerconnection.rs +++ b/components/script/dom/rtcpeerconnection.rs @@ -39,6 +39,7 @@ use servo_media::webrtc::{ BundlePolicy, IceCandidate, SdpType, SessionDescription, WebRtcController, WebRtcSignaller, }; use servo_media::ServoMedia; +use servo_media_auto::Backend; use std::cell::Cell; use std::rc::Rc; @@ -117,6 +118,7 @@ impl RTCPeerConnection { RTCPeerConnectionBinding::Wrap, ); let signaller = this.make_signaller(); + ServoMedia::init::(); *this.controller.borrow_mut() = Some(ServoMedia::get().unwrap().create_webrtc(signaller)); if let Some(ref servers) = config.iceServers { if let Some(ref server) = servers.get(0) { From fc28073dfba05cb2d3fda624c135b2125c1b90af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Tue, 12 Mar 2019 16:56:14 +0100 Subject: [PATCH 3/4] Update GStreamer binaries and setup for Travis --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 659e2ad4b5e..ce52b227f9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,13 +20,13 @@ matrix: - sudo add-apt-repository 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.9 main' -y - sudo apt-get update -q - sudo apt-get install clang-3.9 llvm-3.9 llvm-3.9-runtime -y - - curl -L https://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-x86_64-linux-gnu.tar.gz | tar xz - - sed -i "s;prefix=/root/gstreamer;prefix=$PWD/gstreamer;g" $PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc - - export PKG_CONFIG_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig - - export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/gstreamer-1.0 - - export GST_PLUGIN_SCANNER=$PWD/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner - - export PATH=$PATH:$PWD/gstreamer/bin - - export LD_LIBRARY_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH + - curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz + - sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc + - export PKG_CONFIG_PATH=$PWD/gst/lib/pkgconfig + - export GST_PLUGIN_SYSTEM_PATH=$PWD/gst/lib/gstreamer-1.0 + - export GST_PLUGIN_SCANNER=$PWD/gst/libexec/gstreamer-1.0/gst-plugin-scanner + - export PATH=$PATH:$PWD/gst/bin + - export LD_LIBRARY_PATH=$PWD/gst/lib:$LD_LIBRARY_PATH - export LLVM_CONFIG=/usr/lib/llvm-3.9/bin/llvm-config - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y - source ~/.profile From dc41d2fb77e99862701d5b527a32b90163ffdb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Thu, 14 Mar 2019 11:29:23 +0100 Subject: [PATCH 4/4] Temporarily disable GL functionality --- Cargo.lock | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79103ada30b..b11added8e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1634,14 +1634,6 @@ dependencies = [ "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gstreamer-gl-egl" -version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" -dependencies = [ - "gstreamer-gl 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "gstreamer-gl-sys" version = "0.7.0" @@ -3769,7 +3761,7 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +source = "git+https://github.com/servo/media#a5a8490087d786a4dbebed43e9705874c4351aa0" dependencies = [ "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", "servo-media-player 0.1.0 (git+https://github.com/servo/media)", @@ -3780,7 +3772,7 @@ dependencies = [ [[package]] name = "servo-media-audio" version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +source = "git+https://github.com/servo/media#a5a8490087d786a4dbebed43e9705874c4351aa0" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3796,7 +3788,7 @@ dependencies = [ [[package]] name = "servo-media-auto" version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +source = "git+https://github.com/servo/media#a5a8490087d786a4dbebed43e9705874c4351aa0" dependencies = [ "servo-media-dummy 0.1.0 (git+https://github.com/servo/media)", "servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)", @@ -3805,7 +3797,7 @@ dependencies = [ [[package]] name = "servo-media-dummy" version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +source = "git+https://github.com/servo/media#a5a8490087d786a4dbebed43e9705874c4351aa0" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3819,7 +3811,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer" version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +source = "git+https://github.com/servo/media#a5a8490087d786a4dbebed43e9705874c4351aa0" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3829,7 +3821,6 @@ dependencies = [ "gstreamer-app 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-audio 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-gl 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gstreamer-gl-egl 0.1.0 (git+https://github.com/servo/media)", "gstreamer-player 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-sdp 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-sdp-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3851,7 +3842,7 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +source = "git+https://github.com/servo/media#a5a8490087d786a4dbebed43e9705874c4351aa0" dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3861,12 +3852,12 @@ dependencies = [ [[package]] name = "servo-media-streams" version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +source = "git+https://github.com/servo/media#a5a8490087d786a4dbebed43e9705874c4351aa0" [[package]] name = "servo-media-webrtc" version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +source = "git+https://github.com/servo/media#a5a8490087d786a4dbebed43e9705874c4351aa0" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3965,7 +3956,7 @@ dependencies = [ [[package]] name = "servo_media_derive" version = "0.1.0" -source = "git+https://github.com/servo/media#9d9f557fc7bfa78075b83edd822557548c9d4344" +source = "git+https://github.com/servo/media#a5a8490087d786a4dbebed43e9705874c4351aa0" dependencies = [ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5323,7 +5314,6 @@ dependencies = [ "checksum gstreamer-base 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5125abdd41935c39cf0525160882c18610ee9332496fd4ca69c1218069126ae" "checksum gstreamer-base-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a3f7c5624775ddfdc34a0e5932e1f3786a305390f26844e7567fb0179b985f2" "checksum gstreamer-gl 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "364a49f206a6d58cc7d51204472cfb2b5e274c8b2b5a438aadfb3e93d21207d7" -"checksum gstreamer-gl-egl 0.1.0 (git+https://github.com/servo/media)" = "" "checksum gstreamer-gl-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83ac65068d1e4d9a43e84cc87b68f0f3aa79a16edc107722b8fda476b7ae636a" "checksum gstreamer-player 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5341030ff6c8fb0e83ed01abab236a74cbcbe88afd0f4870e3a6b34a1fd61c4" "checksum gstreamer-player-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ac29007ef1f9abc0e35ea0b65c4331ddae5355ad6869e1099f3497db606c40a"