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

Fix Linux build: Make the nasm feature a no-op #7675

Merged
merged 5 commits into from
Oct 10, 2024
Merged

Fix Linux build: Make the nasm feature a no-op #7675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2df119
Do not compile with `nasm` by default
emilk Oct 10, 2024
d775449
all of Linux
emilk Oct 10, 2024
7444909
Different fix: just make the `nasm` feature a noop
emilk Oct 10, 2024
edf4624
Add back code for the warning
emilk Oct 10, 2024
45d967f
silence clippy warning
emilk Oct 10, 2024
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
4 changes: 3 additions & 1 deletion crates/store/re_video/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ av1 = ["dep:dav1d"]

## Enable faster native video decoding with assembly.
## You need to install [nasm](https://nasm.us/) to compile with this feature.
nasm = ["dav1d?/default"] # The default feature set of dav1d has asm enabled
# TODO(#7671): this feature flag currently does nothing
# nasm = ["dav1d?/default"] # The default feature set of dav1d has asm enabled
nasm = [] ## TODO(#7671): fix Linux build

[dependencies]
re_log.workspace = true
Expand Down
4 changes: 3 additions & 1 deletion crates/store/re_video/src/decode/av1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ impl SyncDav1dDecoder {
pub fn new() -> Result<Self> {
re_tracing::profile_function!();

if !cfg!(feature = "nasm") {
// TODO(#7671): enable this warning again when the `nasm` feature actually does something
#[allow(clippy::overly_complex_bool_expr)]
if false && !cfg!(feature = "nasm") {
re_log::warn_once!(
"NOTE: native AV1 video decoder is running extra slowly. \
Speed it up by compiling Rerun with the `nasm` feature enabled. \
Expand Down
1 change: 1 addition & 0 deletions crates/top/rerun-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ default = ["native_viewer", "web_viewer"]

## Enable faster native video decoding with assembly.
## You need to install [nasm](https://nasm.us/) to compile with this feature.
# TODO(#7671): this feature flag currently does nothing
nasm = ["rerun/nasm"]

## Support spawning a native viewer.
Expand Down
1 change: 1 addition & 0 deletions crates/top/rerun/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ log = ["dep:env_logger", "dep:log"]

## Enable faster native video decoding with assembly.
## You need to install [nasm](https://nasm.us/) to compile with this feature.
# TODO(#7671): this feature flag currently does nothing
nasm = ["re_video/nasm"]

## Support spawning a native viewer.
Expand Down
1 change: 1 addition & 0 deletions rerun_py/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ extension-module = ["pyo3/extension-module"]

## Enable faster native video decoding with assembly.
## You need to install [nasm](https://nasm.us/) to compile with this feature.
# TODO(#7671): this feature flag currently does nothing
nasm = ["re_video/nasm"]

## Support serving a web viewer over HTTP with `serve()`.
Expand Down
Loading