Shut down the media stack when shutting down the constellation

components/constellation/Cargo.toml

@@ -43,3 +43,6 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
 
 [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios")))'.dependencies]
 gaol = {git = "https://github.com/servo/gaol"}
+
+[target.'cfg(all(any(target_os = "macos", target_os = "linux"), not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies]
+gecko-media = {git = "https://github.com/servo/gecko-media.git"}

components/constellation/constellation.rs

@@ -108,6 +108,8 @@ use debugger;
 use devtools_traits::{ChromeToDevtoolsControlMsg, DevtoolsControlMsg};
 use euclid::{Size2D, TypedSize2D, ScaleFactor};
 use event_loop::EventLoop;
+#[cfg(all(any(target_os = "macos", target_os = "linux"), not(any(target_arch = "arm", target_arch = "aarch64"))))]
+use gecko_media::GeckoMedia;
 use gfx::font_cache_thread::FontCacheThread;
 use gfx_traits::Epoch;
 use ipc_channel::{Error as IpcError};
@@ -1481,6 +1483,16 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
 
         debug!("Asking compositor to complete shutdown.");
         self.compositor_proxy.send(ToCompositorMsg::ShutdownComplete);
+
+        #[cfg(all(
+            any(target_os = "macos", target_os = "linux"),
+            not(any(target_arch = "arm", target_arch = "aarch64")),
+        ))]
+        {
+            if let Err(()) = GeckoMedia::shutdown() {
+                warn!("Media stack shutdown failed.");
+            }
+        }
     }
 
     fn handle_pipeline_exited(&mut self, pipeline_id: PipelineId) {

components/constellation/lib.rs

@@ -17,6 +17,8 @@ extern crate devtools_traits;
 extern crate euclid;
 #[cfg(all(not(target_os = "windows"), not(target_os = "ios")))]
 extern crate gaol;
+#[cfg(all(any(target_os = "macos", target_os = "linux"), not(any(target_arch = "arm", target_arch = "aarch64"))))]
+extern crate gecko_media;
 extern crate gfx;
 extern crate gfx_traits;
 extern crate hyper;