Bug 1423469 - update mp4 rust parser. r=kinetik

Alfredo.Yang · Alfredo.Yang · commit 3cf0d3b49175 · 2018-01-05T11:11:06.000+08:00
MozReview-Commit-ID: IMnqoNL2jay

--HG--
extra : rebase_source : 14bd23405f9dfdcbb8bae5a850439918aacec5e3
diff --git a/media/mp4parse-rust/mp4parse-cargo.patch b/media/mp4parse-rust/mp4parse-cargo.patch
@@ -2,53 +2,48 @@ diff --git a/media/libstagefright/binding/mp4parse/Cargo.toml b/media/libstagefr
 index ff9422c..814c4c6 100644
 --- a/media/libstagefright/binding/mp4parse/Cargo.toml
 +++ b/media/libstagefright/binding/mp4parse/Cargo.toml
-@@ -20,19 +20,12 @@ exclude = [
+@@ -20,18 +20,12 @@ exclude = [
  ]
  
 -[badges]
 -travis-ci = { repository = "https://github.com/mozilla/mp4parse-rust" }
  
  [dependencies]
  byteorder = "1.0.0"
--afl = { version = "0.1.1", optional = true }
--afl-plugin = { version = "0.1.1", optional = true }
+-afl = { version = "0.3", optional = true }
 -abort_on_panic = { version = "1.0.0", optional = true }
  bitreader = { version = "0.3.0" }
  num-traits = "0.1.37"
--mp4parse_fallible = { git = "https://github.com/alfredoyang/mp4parse_fallible", optional = true }
-+mp4parse_fallible = { path = "../mp4parse_fallible", optional = true }
+ mp4parse_fallible = { version = "0.0.1", optional = true }
  
  [dev-dependencies]
  test-assembler = "0.1.2"
  
 -[features]
--fuzz = ["afl", "afl-plugin", "abort_on_panic"]
- # Somewhat heavy-handed, but we want at least -Z force-overflow-checks=on.
- [profile.release]
- debug-assertions = true
+-fuzz = ["afl", "abort_on_panic"]
 diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
 index a30e045..a965f06 100644
 --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
 +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
 @@ -18,20 +18,13 @@ exclude = [
    "*.mp4",
  ]
-
+ 
 -[badges]
 -travis-ci = { repository = "https://github.com/mozilla/mp4parse-rust" }
 +build = false
-
+ 
  [dependencies]
  byteorder = "1.0.0"
-
+ 
  # To enable fallible memory allocation, add 'features = ["mp4parse_fallible"]'
  # in mp4parse brace.
--mp4parse = {version = "0.9.0", path = "../mp4parse"}
-+mp4parse = {version = "0.9.0", path = "../mp4parse", features = ["mp4parse_fallible"]}
+-mp4parse = {version = "0.9.1", path = "../mp4parse"}
++mp4parse = {version = "0.9.1", path = "../mp4parse", features = ["mp4parse_fallible"]}
  num-traits = "0.1.37"
-
+ 
 -[build-dependencies]
--cbindgen = "0.1.30"
+-cbindgen = "0.3.1"
 -
 -[features]
 -fuzz = ["mp4parse/fuzz"]
diff --git a/media/mp4parse-rust/mp4parse.h b/media/mp4parse-rust/mp4parse.h
@@ -44,7 +44,6 @@ typedef enum {
   MP4PARSE_TRACK_TYPE_AUDIO = 1,
 } Mp4parseTrackType;
 
-struct Mp4parseParser;
 typedef struct Mp4parseParser Mp4parseParser;
 
 typedef struct {
diff --git a/media/mp4parse-rust/mp4parse/Cargo.toml b/media/mp4parse-rust/mp4parse/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mp4parse"
-version = "0.9.0"
+version = "0.9.1"
 authors = [
   "Ralph Giles <giles@mozilla.com>",
   "Matthew Gregan <kinetik@flim.org>",
@@ -24,7 +24,7 @@ exclude = [
 byteorder = "1.0.0"
 bitreader = { version = "0.3.0" }
 num-traits = "0.1.37"
-mp4parse_fallible = { path = "../mp4parse_fallible", optional = true }
+mp4parse_fallible = { version = "0.0.1", optional = true }
 
 [dev-dependencies]
 test-assembler = "0.1.2"
diff --git a/media/mp4parse-rust/mp4parse/src/lib.rs b/media/mp4parse-rust/mp4parse/src/lib.rs
@@ -3,8 +3,6 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-#![cfg_attr(feature = "fuzz", feature(plugin))]
-#![cfg_attr(feature = "fuzz", plugin(afl_plugin))]
 #[cfg(feature = "fuzz")]
 extern crate afl;
 
@@ -1422,7 +1420,7 @@ fn find_descriptor(data: &[u8], esds: &mut ES_Descriptor) -> Result<()> {
 
 fn read_ds_descriptor(data: &[u8], esds: &mut ES_Descriptor) -> Result<()> {
     let frequency_table =
-        vec![(0x1, 96000), (0x1, 88200), (0x2, 64000), (0x3, 48000),
+        vec![(0x0, 96000), (0x1, 88200), (0x2, 64000), (0x3, 48000),
              (0x4, 44100), (0x5, 32000), (0x6, 24000), (0x7, 22050),
              (0x8, 16000), (0x9, 12000), (0xa, 11025), (0xb, 8000),
              (0xc, 7350)];
diff --git a/media/mp4parse-rust/mp4parse_capi/Cargo.toml b/media/mp4parse-rust/mp4parse_capi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mp4parse_capi"
-version = "0.9.0"
+version = "0.9.1"
 authors = [
   "Ralph Giles <giles@mozilla.com>",
   "Matthew Gregan <kinetik@flim.org>",
@@ -25,6 +25,6 @@ byteorder = "1.0.0"
 
 # To enable fallible memory allocation, add 'features = ["mp4parse_fallible"]'
 # in mp4parse brace.
-mp4parse = {version = "0.9.0", path = "../mp4parse", features = ["mp4parse_fallible"]}
+mp4parse = {version = "0.9.1", path = "../mp4parse", features = ["mp4parse_fallible"]}
 num-traits = "0.1.37"
 
diff --git a/media/mp4parse-rust/update-rust.sh b/media/mp4parse-rust/update-rust.sh
@@ -2,7 +2,7 @@
 # Script to update mp4parse-rust sources to latest upstream
 
 # Default version.
-VER=d129e35848895220bae98084c17a7425a3369e0e
+VER=c714e7ee1218fb0f51d3c67166fd5fff303a0312
 
 # Accept version or commit from the command line.
 if test -n "$1"; then
diff --git a/third_party/rust/mp4parse_fallible/.cargo-checksum.json b/third_party/rust/mp4parse_fallible/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{".travis.yml":"9f13da6fb5b7189d5b0e8c0435d28a7d35899e708fd579a7e6b73fc74c3d6acf","Cargo.toml":"7e0306d977c63a491bea39dde354455f23c7eb283abf874d0122a664bbc082d3","README":"1ff38c3749ba83c9b364c6bb35b95525dd956449ec7386a50faf8fcfdd5a7de4","lib.rs":"3c54447b497f808ab7fa7659f1379acf4c5c3def37fc4cc7778281273b84eabb"},"package":"6626c2aef76eb8f984eef02e475883d3fe9112e114720446c5810fc5f045cd30"}
diff --git a/third_party/rust/mp4parse_fallible/.travis.yml b/third_party/rust/mp4parse_fallible/.travis.yml
@@ -0,0 +1,18 @@
+language: rust
+rust:
+  - stable
+  - nightly
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-5
+
+env:
+  global:
+    - CXX=g++-5
+
+script:
+  - cargo test --all --verbose
diff --git a/third_party/rust/mp4parse_fallible/Cargo.toml b/third_party/rust/mp4parse_fallible/Cargo.toml
@@ -0,0 +1,26 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "mp4parse_fallible"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+description = "Fallible replacement for Vec"
+documentation = "https://docs.rs/mp4parse_fallible/"
+license = "MPL-2.0"
+repository = "https://github.com/mozilla/mp4parse_fallible"
+
+[lib]
+name = "mp4parse_fallible"
+path = "lib.rs"
+[badges.travis-ci]
+repository = "https://github.com/mozilla/mp4parse_fallible"
diff --git a/third_party/rust/mp4parse_fallible/README b/third_party/rust/mp4parse_fallible/README
@@ -0,0 +1,7 @@
+This is from https://github.com/servo/servo/tree/master/components/fallible
+with modificaion for mp4 demuxer.
+
+The purpose of this crate is to solve infallible memory allocation problem
+which causes OOM easily on win32. This is more like a temporary solution.
+Once rust supports fallible memory allocation in its stdlib, this can be
+retired.
diff --git a/third_party/rust/mp4parse_fallible/lib.rs b/third_party/rust/mp4parse_fallible/lib.rs
@@ -0,0 +1,92 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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 std::mem;
+use std::vec::Vec;
+
+extern "C" {
+    fn realloc(ptr: *mut u8, bytes: usize) -> *mut u8;
+    fn malloc(bytes: usize) -> *mut u8;
+}
+
+pub trait FallibleVec<T> {
+    /// Append |val| to the end of |vec|.  Returns Ok(()) on success,
+    /// Err(()) if it fails, which can only be due to lack of memory.
+    fn try_push(&mut self, value: T) -> Result<(), ()>;
+
+    /// Expand the vector size. Return Ok(()) on success, Err(()) if it
+    /// fails.
+    fn try_reserve(&mut self, new_cap: usize) -> Result<(), ()>;
+}
+
+/////////////////////////////////////////////////////////////////
+// Vec
+
+impl<T> FallibleVec<T> for Vec<T> {
+    #[inline]
+    fn try_push(&mut self, val: T) -> Result<(), ()> {
+        if self.capacity() == self.len() {
+            let old_cap: usize = self.capacity();
+            let new_cap: usize
+                = if old_cap == 0 { 4 } else { old_cap.checked_mul(2).ok_or(()) ? };
+
+            try_extend_vec(self, new_cap)?;
+            debug_assert!(self.capacity() > self.len());
+        }
+        self.push(val);
+        Ok(())
+    }
+
+    #[inline]
+    fn try_reserve(&mut self, cap: usize) -> Result<(), ()> {
+        let new_cap = cap + self.capacity();
+        try_extend_vec(self, new_cap)?;
+        debug_assert!(self.capacity() == new_cap);
+        Ok(())
+    }
+}
+
+#[inline(never)]
+#[cold]
+fn try_extend_vec<T>(vec: &mut Vec<T>, new_cap: usize) -> Result<(), ()> {
+    let old_ptr = vec.as_mut_ptr();
+    let old_len = vec.len();
+
+    let old_cap: usize = vec.capacity();
+
+    if old_cap >= new_cap {
+        return Ok(());
+    }
+
+    let new_size_bytes
+        = new_cap.checked_mul(mem::size_of::<T>()).ok_or(()) ? ;
+
+    let new_ptr = unsafe {
+        if old_cap == 0 {
+            malloc(new_size_bytes)
+        } else {
+            realloc(old_ptr as *mut u8, new_size_bytes)
+        }
+    };
+
+    if new_ptr.is_null() {
+        return Err(());
+    }
+
+    let new_vec = unsafe {
+        Vec::from_raw_parts(new_ptr as *mut T, old_len, new_cap)
+    };
+
+    mem::forget(mem::replace(vec, new_vec));
+    Ok(())
+}
+
+#[test]
+fn oom_test() {
+    let mut vec: Vec<char> = Vec::new();
+    match vec.try_reserve(std::usize::MAX) {
+        Ok(_) => panic!("it should be OOM"),
+        _ => (),
+    }
+}
diff --git a/toolkit/library/gtest/rust/Cargo.lock b/toolkit/library/gtest/rust/Cargo.lock
diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"files":{".travis.yml":"9f13da6fb5b7189d5b0e8c0435d28a7d35899e708fd579a7e6b73fc74c3d6acf","Cargo.toml":"7e0306d977c63a491bea39dde354455f23c7eb283abf874d0122a664bbc082d3","README":"1ff38c3749ba83c9b364c6bb35b95525dd956449ec7386a50faf8fcfdd5a7de4","lib.rs":"3c54447b497f808ab7fa7659f1379acf4c5c3def37fc4cc7778281273b84eabb"},"package":"6626c2aef76eb8f984eef02e475883d3fe9112e114720446c5810fc5f045cd30"}`