Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use published re_rav1d #7723

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Use published re_rav1d #7723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 25 additions & 24 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4756,29 +4756,6 @@ dependencies = [
"rand",
]

[[package]]
name = "rav1d"
version = "1.0.0"
source = "git+https://github.com/rerun-io/rav1d?rev=a9059f6a02e68cf2aba3795cc370c72f695c4730#a9059f6a02e68cf2aba3795cc370c72f695c4730"
dependencies = [
"assert_matches",
"atomig",
"av-data",
"bitflags 2.6.0",
"cc",
"cfg-if",
"cfg_aliases 0.2.1",
"libc",
"nasm-rs",
"parking_lot",
"paste",
"raw-cpuid",
"static_assertions",
"strum",
"to_method",
"zerocopy",
]

[[package]]
name = "raw-cpuid"
version = "11.2.0"
Expand Down Expand Up @@ -5400,6 +5377,30 @@ dependencies = [
"thiserror",
]

[[package]]
name = "re_rav1d"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9505a568b5cf6d270ab1aabc8159f0b67f43d46c1dd27088a7cd11f845a1fd6"
dependencies = [
"assert_matches",
"atomig",
"av-data",
"bitflags 2.6.0",
"cc",
"cfg-if",
"cfg_aliases 0.2.1",
"libc",
"nasm-rs",
"parking_lot",
"paste",
"raw-cpuid",
"static_assertions",
"strum",
"to_method",
"zerocopy",
]

[[package]]
name = "re_renderer"
version = "0.19.0-alpha.3"
Expand Down Expand Up @@ -5942,9 +5943,9 @@ dependencies = [
"indicatif",
"itertools 0.13.0",
"parking_lot",
"rav1d",
"re_log",
"re_mp4",
"re_rav1d",
"re_tracing",
"re_video",
"thiserror",
Expand Down
6 changes: 6 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ re_web_viewer_server = { path = "crates/viewer/re_web_viewer_server", version =
ewebsock = "0.6.0"
re_math = "0.20.0"

# If this package fails to build, install `nasm` locally, or build through `pixi`.
# NOTE: we use `dav1d` as an alias for our own re_rav1d crate
# See https://github.com/rerun-io/re_rav1d/pull/2
dav1d = { package = "re_rav1d", version = "0.1.0", default-features = false }
# dav1d = { version = "0.10.3" } # Requires separate install of `dav1d` library. Fast in debug builds. Useful for development.

# egui-crates:
ecolor = "0.29.1"
eframe = { version = "0.29.1", default-features = false, features = [
Expand Down
10 changes: 4 additions & 6 deletions crates/store/re_video/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,13 @@ thiserror.workspace = true
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]

# If this package fails to build, install `nasm` locally, or build through `pixi`.
# See https://github.com/rerun-io/rav1d/pull/1
# TODO(#7588): publish this fork of rav1d
dav1d = { git = "https://github.com/rerun-io/rav1d", rev = "a9059f6a02e68cf2aba3795cc370c72f695c4730", package = "rav1d", optional = true, default-features = false, features = [
# We opt-out of wasm features so we don't need `nasm` installed. It's still pretty fast.
# NOTE: we use `dav1d` as an alias for our own re_rav1d crate
# See https://github.com/rerun-io/re_rav1d/pull/2
dav1d = { workspace = true, optional = true, default-features = false, features = [
# We opt-out of wasm features so we don't need `nasm` installed. It's still pretty fast.
"bitdepth_8",
] }

# dav1d = { version = "0.10.3", optional = true } # Requires separate install of `dav1d` library. Fast in debug builds. Useful for development.

[dev-dependencies]
indicatif.workspace = true
re_video = { workspace = true, features = ["av1"] } # For the `frames` example
Expand Down
Loading