Put back video metadata

components/script/Cargo.toml

@@ -23,6 +23,7 @@ tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"}
 [dependencies]
 angle = {git = "https://github.com/servo/angle", branch = "servo"}
 app_units = "0.3"
+audio-video-metadata = "0.1.2"
 bitflags = "0.7"
 canvas_traits = {path = "../canvas_traits"}
 caseless = "0.1.0"

components/script/dom/htmlmediaelement.rs

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use audio_video_metadata;
 use document_loader::LoadType;
 use dom::attr::Attr;
 use dom::bindings::cell::DOMRefCell;
@@ -160,12 +161,24 @@ impl HTMLMediaElementContext {
     }
 
     fn check_metadata(&mut self, elem: &HTMLMediaElement) {
-        // Step 6.
-        //
-        // TODO: Properly implement once we have figured out the build and
-        // licensing ffmpeg issues.
-        elem.change_ready_state(HAVE_METADATA);
-        self.have_metadata = true;
+        match audio_video_metadata::get_format_from_slice(&self.data) {
+            Ok(audio_video_metadata::Metadata::Video(meta)) => {
+                let dur = meta.audio.duration.unwrap_or(::std::time::Duration::new(0, 0));
+                *elem.video.borrow_mut() = Some(VideoMedia {
+                    format: format!("{:?}", meta.format),
+                    duration: Duration::seconds(dur.as_secs() as i64) +
+                              Duration::nanoseconds(dur.subsec_nanos() as i64),
+                    width: meta.dimensions.width,
+                    height: meta.dimensions.height,
+                    video: meta.video.unwrap_or("".to_owned()),
+                    audio: meta.audio.audio,
+                });
+                // Step 6
+                elem.change_ready_state(HAVE_METADATA);
+                self.have_metadata = true;
+            }
+            _ => {}
+        }
     }
 }
 

components/script/lib.rs

@@ -30,6 +30,7 @@
 
 extern crate angle;
 extern crate app_units;
+extern crate audio_video_metadata;
 #[allow(unused_extern_crates)]
 #[macro_use]
 extern crate bitflags;

tests/wpt/metadata/html/semantics/embedded-content/media-elements/error-codes/error.html.ini

@@ -0,0 +1,6 @@
+[error.html]
+  type: testharness
+  expected: TIMEOUT
+  [audio.error after successful load]
+    expected: TIMEOUT
+

tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata.html.ini

@@ -7,3 +7,6 @@
   [setting src attribute on autoplay video should trigger loadeddata event]
     expected: NOTRUN
 
+  [setting src attribute on autoplay audio should trigger loadeddata event]
+    expected: NOTRUN
+

tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadeddata_noautoplay.html.ini

@@ -0,0 +1,6 @@
+[event_loadeddata_noautoplay.html]
+  type: testharness
+  expected: TIMEOUT
+  [setting src attribute on non-autoplay audio should trigger loadeddata event]
+    expected: NOTRUN
+

tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata.html.ini

@@ -0,0 +1,6 @@
+[event_loadedmetadata.html]
+  type: testharness
+  expected: TIMEOUT
+  [setting src attribute on autoplay audio should trigger loadedmetadata event]
+    expected: NOTRUN
+

tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_loadedmetadata_noautoplay.html.ini

@@ -0,0 +1,6 @@
+[event_loadedmetadata_noautoplay.html]
+  type: testharness
+  expected: TIMEOUT
+  [setting src attribute on non-autoplay audio should trigger loadedmetadata event]
+    expected: NOTRUN
+

tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini

@@ -0,0 +1,6 @@
+[event_order_loadedmetadata_loadeddata.html]
+  type: testharness
+  expected: TIMEOUT
+  [setting src attribute on autoplay audio should trigger loadedmetadata then loadeddata event]
+    expected: NOTRUN
+

tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadeddata.html.ini

@@ -0,0 +1,6 @@
+[readyState_during_loadeddata.html]
+  type: testharness
+  expected: TIMEOUT
+  [audio.readyState should be >= HAVE_CURRENT_DATA during loadeddata event]
+    expected: NOTRUN
+

tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_loadedmetadata.html.ini

@@ -0,0 +1,6 @@
+[readyState_during_loadedmetadata.html]
+  type: testharness
+  expected: TIMEOUT
+  [audio.readyState should be >= HAVE_METADATA during loadedmetadata event]
+    expected: NOTRUN
+