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

Jump to bottom

firefox: wrapper: add libva to libs #81917

Merged
merged 2 commits into from May 5, 2020
Merged

firefox: wrapper: add libva to libs #81917

merged 2 commits into from May 5, 2020

Conversation

colemickens
Copy link
Member

@colemickens colemickens commented Mar 6, 2020 •
edited

Motivation for this change

This change allows VA-API to work in Firefox Nightly builds as provided by nixpkgs-mozilla.

Two changes:

  • add libva to the Firefox wrapper
  • move to ffmpeg_4 (without it, (firefox/ffmpeg) doesn't attempt to use libva/vaapi)
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@colemickens
Copy link
Member Author

Followup:

@colemickens
Copy link
Member Author

Looks like it's probably related to this:

[Child 23304: MediaPDecoder #1]: D/PlatformDecoderModule Initialising FFmpeg decoder.
[Child 23304: MediaPlayback #1]: D/PlatformDecoderModule Sandbox decoder rejects requested type
[Child 23304: MediaPDecoder #3]: D/PlatformDecoderModule Initialising VA-API FFmpeg decoder
[Child 23304: MediaPDecoder #3]: D/PlatformDecoderModule VA-API FFmpeg is disabled by platform
[Child 23304: MediaPDecoder #3]: D/PlatformDecoderModule Initialising FFmpeg decoder.
[Child 23304: MediaPlayback #1]: D/PlatformDecoderModule Sandbox decoder rejects requested type
[Child 23304: MediaPlayback #1]: D/PlatformDecoderModule Sandbox decoder rejects requested type
[Child 23304: MediaPlayback #1]: D/PlatformDecoderModule Sandbox decoder rejects requested type
[Child 23304: MediaPlayback #1]: D/PlatformDecoderModule Sandbox decoder rejects requested type
[Child 23304: MediaPDecoder #2]: D/PlatformDecoderModule Initialising FFmpeg decoder.
[Child 23304: MediaPDecoder #4]: D/PlatformDecoderModule Initialising VA-API FFmpeg decoder
[Child 23304: MediaPDecoder #4]: D/PlatformDecoderModule VA-API FFmpeg is disabled by platform
[Child 23304: MediaPDecoder #4]: D/PlatformDecoderModule Initialising FFmpeg decoder.
[Child 23304: MediaPDecoder #1]: D/PlatformDecoderModule FFmpeg init successful.

WebGL creation failed: 
* Refused to create WebGL2 context because of blacklist entry: FEATURE_FAILURE_GLXTEST_FAILED

GLXtest process failed (exited with status 1): No visuals found

@colemickens
Copy link
Member Author

cc: @worldofpeace You replied in another thread about Firefox and hardware acceleration in NixOS. I am using the nightly package (a bin package).

@primeos
Copy link
Member

primeos commented Apr 23, 2020

@colemickens since Firefox 75 is released now and 76 should already be in the beta channel you might want to give this another shot, if you have time. If not feel free to simply ignore this comment ;)

It would also be also nice if we had VA-API support for the firefox package that we build from source, but that seems outside the scope of this PR (and Firefox rebuilds most likely take a very long time).

@colemickens
Copy link
Member Author

Oops. In one version of this I had actually built firefox as well. Anyway, this works with Nightly!

[Child 29119: MediaPlayback #1]: D/PlatformDecoderModule Sandbox decoder rejects requested type
[Child 29119: MediaPlayback #1]: D/PlatformDecoderModule Sandbox decoder rejects requested type
[Child 29119: MediaPDecoder #1]: D/PlatformDecoderModule Initialising VA-API FFmpeg decoder
[Child 29119: MediaPDecoder #2]: D/PlatformDecoderModule Initialising FFmpeg decoder.
libva info: VA-API version 1.6.0
libva info: Trying to open /run/opengl-driver/lib/dri/iHD_drv_video.so
libva info: Found init function __vaDriverInit_1_6
libva info: va_openDriver() returns 0

[h264 @ 0x7f4fe222e000] nal_unit_type: 7(SPS), nal_ref_idc: 3
[h264 @ 0x7f4fe222e000] nal_unit_type: 8(PPS), nal_ref_idc: 3
[Child 29119: MediaPDecoder #2]: D/PlatformDecoderModule VA-API FFmpeg init successful
[h264 @ 0x7f4fe222e000] nal_unit_type: 6(SEI), nal_ref_idc: 0
[h264 @ 0x7f4fe222e000] nal_unit_type: 5(IDR), nal_ref_idc: 3
[Child 29119: MediaPDecoder #2]: D/PlatformDecoderModule Choosing FFmpeg pixel format for VA-API video decoding.
[Child 29119: MediaPDecoder #2]: D/PlatformDecoderModule Requesting pixel format VAAPI_VLD
[h264 @ 0x7f4fe222e000] Format vaapi_vld chosen by get_format().
[h264 @ 0x7f4fe222e000] Format vaapi_vld requires hwaccel initialisation.
[h264 @ 0x7f4fe222e000] Considering format 0x3231564e -> nv12.
[h264 @ 0x7f4fe222e000] Picked nv12 (0x3231564e) as best match for yuv420p.

We can merge? In the meantime I can try to make the change for firefox from source too.

@colemickens colemickens marked this pull request as ready for review April 27, 2020 11:04
@colemickens
Copy link
Member Author

Ah, I should be careful, I actually have some other related firefox commits on the branch that I tested from. Let me do a few additional checks around nightly and/or wait for this build to finish.

@colemickens
Copy link
Member Author

Interesting, it looks like this does require moving over to ffmpeg4!

@colemickens
firefox: wrapper: use ffmpeg_4 for vaapi
552d729 
without this, adding libva is insufficient to get VA-API working in
Firefox.
@colemickens
Copy link
Member Author

This time I'm sure I'm testing firefox-nightly with the wrapper from this branch:

export MOZ_LOG="PlatformDecoderModule:5"; \
 set f (~/code/nixcfg/nixbuild.sh -A latest.firefox-nightly-bin); \
$f/bin/firefox --no-remote -P vaapi &> /tmp/firefox

similar logs as I posted ~1 hr ago, with two commits now, pushing now.

@colemickens
Copy link
Member Author

Note, I don't know if this is a strong requirement by Firefox or is due to how we build ffmpeg4? But I definitely couldn't get this working with nightly without adding the ffmpeg4 commit.

@ofborg ofborg bot requested review from andir and edolstra April 27, 2020 12:23
@colemickens
Copy link
Member Author

Alright, I'm going to put a couple more hours in and then give up and back out the change to the source package and leave this as a change only targetting nightly. However, I know a lot of people want the source build to have va-api too.

@colemickens
Copy link
Member Author

Okay, back to the original scope of this PR. I'll iterate on this, but I know this helps Nightly users, so let's go with this.

I can confirm both commits are needed. The older ffmpeg in the wrapper does NOT work, it doesn't even attempt to use va-api or libva.

Fortunately, this also means it's easy for Nightly users to test, since this only requires a change to the wrapper and won't need to rebuild Firefox.

@peterhoeg peterhoeg mentioned this pull request Apr 29, 2020
Closed
@colemickens colemickens requested review from andir and primeos May 4, 2020 02:41
primeos
primeos approved these changes May 4, 2020
View reviewed changes
Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

LGTM :) But I'll leave the final decision and merging up to @andir since he's the maintainer.

@andir
Copy link
Member

andir commented May 5, 2020 •
edited

Can I test this with the firefox-{beta,bin} from nixpkgs or will that not work?

With firefox-bin on master it didn't really work yet:

EDIT

firefox-beta did work.. I'll merge this in. Thank you for looking at this @colemickens!

@andir andir merged commit d9f4f06 into NixOS:master May 5, 2020
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/hardware-acceleration-on-firefox/7947/6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@primeos primeos primeos approved these changes

@edolstra edolstra Awaiting requested review from edolstra

@andir andir Awaiting requested review from andir

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@colemickens @primeos @andir @nixos-discourse