From 565bf7514506110a53e37ca686a222527e1ed4e4 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 13 Mar 2018 10:00:19 +0100 Subject: Remove Rust MP4 parser Part 1 for #58 --- toolkit/components/telemetry/Histograms.json | 33 ---------------------------- toolkit/library/gtest/rust/Cargo.lock | 20 ----------------- toolkit/library/gtest/rust/Cargo.toml | 1 - toolkit/library/gtest/rust/lib.rs | 1 - toolkit/library/rust/Cargo.lock | 15 ------------- toolkit/library/rust/shared/Cargo.toml | 1 - toolkit/library/rust/shared/lib.rs | 1 - 7 files changed, 72 deletions(-) (limited to 'toolkit') diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 45ad662c7..ade308cfa 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -6926,39 +6926,6 @@ "n_buckets": 1000, "description": "The time (in milliseconds) that it took to display a selected source to the user." }, - "MEDIA_RUST_MP4PARSE_SUCCESS": { - "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], - "expires_in_version": "55", - "kind": "boolean", - "bug_numbers": [1220885], - "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment.", - "cpp_guard": "MOZ_RUST_MP4PARSE" - }, - "MEDIA_RUST_MP4PARSE_ERROR_CODE": { - "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], - "expires_in_version": "55", - "kind": "enumerated", - "n_values": 32, - "bug_numbers": [1238420], - "description": "The error code reported when an MP4 parse attempt has failed.0 = OK, 1 = bad argument, 2 = invalid data, 3 = unsupported, 4 = unexpected end of file, 5 = read error.", - "cpp_guard": "MOZ_RUST_MP4PARSE" - }, - "MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": { - "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], - "expires_in_version": "55", - "kind": "boolean", - "bug_numbers": [1231169], - "description": "Whether rust and stagefight mp4 parser audio track results match.", - "cpp_guard": "MOZ_RUST_MP4PARSE" - }, - "MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": { - "alert_emails": ["giles@mozilla.com", "kinetik@flim.org"], - "expires_in_version": "55", - "kind": "boolean", - "bug_numbers": [1231169], - "description": "Whether rust and stagefight mp4 parser video track results match.", - "cpp_guard": "MOZ_RUST_MP4PARSE" - }, "MEDIA_WMF_DECODE_ERROR": { "expires_in_version": "55", "kind": "enumerated", diff --git a/toolkit/library/gtest/rust/Cargo.lock b/toolkit/library/gtest/rust/Cargo.lock index e1f7ed14e..2f2f7a4a8 100644 --- a/toolkit/library/gtest/rust/Cargo.lock +++ b/toolkit/library/gtest/rust/Cargo.lock @@ -3,7 +3,6 @@ name = "gkrust-gtest" version = "0.1.0" dependencies = [ "gkrust-shared 0.1.0", - "mp4parse-gtest 0.1.0", "nsstring-gtest 0.1.0", ] @@ -16,7 +15,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gkrust-shared" version = "0.1.0" dependencies = [ - "mp4parse_capi 0.6.0", "nsstring 0.1.0", "rust_url_capi 0.0.1", ] @@ -41,24 +39,6 @@ name = "matches" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "mp4parse" -version = "0.6.0" -dependencies = [ - "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "mp4parse-gtest" -version = "0.1.0" - -[[package]] -name = "mp4parse_capi" -version = "0.6.0" -dependencies = [ - "mp4parse 0.6.0", -] - [[package]] name = "nsstring" version = "0.1.0" diff --git a/toolkit/library/gtest/rust/Cargo.toml b/toolkit/library/gtest/rust/Cargo.toml index 5611e1777..38ca72d2c 100644 --- a/toolkit/library/gtest/rust/Cargo.toml +++ b/toolkit/library/gtest/rust/Cargo.toml @@ -6,7 +6,6 @@ license = "MPL-2.0" description = "Testing code for libgkrust" [dependencies] -mp4parse-gtest = { path = "../../../../dom/media/gtest" } nsstring-gtest = { path = "../../../../xpcom/rust/nsstring/gtest" } gkrust-shared = { path = "../../rust/shared" } diff --git a/toolkit/library/gtest/rust/lib.rs b/toolkit/library/gtest/rust/lib.rs index c39801840..eb0f102b9 100644 --- a/toolkit/library/gtest/rust/lib.rs +++ b/toolkit/library/gtest/rust/lib.rs @@ -3,5 +3,4 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. extern crate gkrust_shared; -extern crate mp4parse_gtest; extern crate nsstring_gtest; diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock index 7c1d54ddc..ca04ab281 100644 --- a/toolkit/library/rust/Cargo.lock +++ b/toolkit/library/rust/Cargo.lock @@ -14,7 +14,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "gkrust-shared" version = "0.1.0" dependencies = [ - "mp4parse_capi 0.6.0", "nsstring 0.1.0", "rust_url_capi 0.0.1", ] @@ -39,20 +38,6 @@ name = "matches" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "mp4parse" -version = "0.6.0" -dependencies = [ - "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "mp4parse_capi" -version = "0.6.0" -dependencies = [ - "mp4parse 0.6.0", -] - [[package]] name = "nsstring" version = "0.1.0" diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml index 07e735755..fe05ecaaf 100644 --- a/toolkit/library/rust/shared/Cargo.toml +++ b/toolkit/library/rust/shared/Cargo.toml @@ -6,7 +6,6 @@ license = "MPL-2.0" description = "Shared Rust code for libxul" [dependencies] -mp4parse_capi = { path = "../../../../media/libstagefright/binding/mp4parse_capi" } nsstring = { path = "../../../../xpcom/rust/nsstring" } rust_url_capi = { path = "../../../../netwerk/base/rust-url-capi" } diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs index 838b9f379..ddaebca51 100644 --- a/toolkit/library/rust/shared/lib.rs +++ b/toolkit/library/rust/shared/lib.rs @@ -2,6 +2,5 @@ // 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/. -extern crate mp4parse_capi; extern crate nsstring; extern crate rust_url_capi; -- cgit v1.2.3