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.

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

Make the path to ffmpeg customisable #8100

Merged
merged 13 commits into from
Nov 13, 2024
Merged

Make the path to ffmpeg customisable #8100

merged 13 commits into from
Nov 13, 2024

Conversation

abey79
Copy link
Member

@abey79 abey79 commented Nov 12, 2024

What

Makes the path to ffmpeg customisable. Also hides the auto/soft/hard choice on native as it has not impact.

Export-1731429356460.mp4

Checklist

  • I have read and agree to Contributor Guide and the Code of Conduct
  • I've included a screenshot or gif (if applicable)
  • I have tested the web demo (if applicable):
  • The PR title and labels are set such as to maximize their usefulness for the next release's CHANGELOG
  • If applicable, add a new check to the release checklist!
  • If have noted any breaking changes to the log API in CHANGELOG.md and the migration guide

To run all checks from main, comment on the PR with @rerun-bot full-check.

@abey79 abey79 added exclude from changelog PRs with this won't show up in CHANGELOG.md 🎞️ video labels Nov 12, 2024
@abey79 abey79 marked this pull request as ready for review November 12, 2024 14:10
@abey79 abey79 marked this pull request as draft November 12, 2024 14:32
@Wumpf Wumpf self-requested a review November 12, 2024 14:59
@abey79 abey79 force-pushed the antoine/ffmpeg-path-config branch from e3b83ca to 433763a Compare November 12, 2024 16:37
@abey79 abey79 marked this pull request as ready for review November 12, 2024 16:38
@abey79 abey79 added the ui concerns graphical user interface label Nov 13, 2024
Copy link
Member

@emilk emilk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beautiful!

/// Don't use this field directly, use [`AppOptions::video_decoder_settings`] instead.
///
/// Implementation note: we avoid using `Option<PathBuf>` here to avoid loosing the user-defined
/// path when disabling the override.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

crates/viewer/re_viewer/src/ui/settings_screen.rs Outdated Show resolved Hide resolved
crates/viewer/re_viewer/src/ui/settings_screen.rs Outdated Show resolved Hide resolved
crates/viewer/re_viewer/src/ui/settings_screen.rs Outdated Show resolved Hide resolved
@@ -100,6 +99,9 @@ fn settings_screen_ui_impl(ui: &mut egui::Ui, app_options: &mut AppOptions, keep
ui.strong("Map view");

ui.horizontal(|ui| {
// TODO(ab): needed for alignment, we should use egui flex instead
ui.set_height(19.0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why 19 though? Aren't most things in our ui 20 heigh?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I basically used what the edit text told me it needs with the debug overlay

image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

smart :)

@Wumpf
Copy link
Member

Wumpf commented Nov 13, 2024

confirmed to work like a charm on Windows!

@emilk emilk merged commit d85280c into main Nov 13, 2024
37 checks passed
@emilk emilk deleted the antoine/ffmpeg-path-config branch November 13, 2024 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
exclude from changelog PRs with this won't show up in CHANGELOG.md ui concerns graphical user interface 🎞️ video
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants