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

ffmpeg-full: 4.1.4 -> 4.2 #67205

Merged
merged 2 commits into from Aug 23, 2019

Conversation

@primeos
Copy link
Member

commented Aug 21, 2019

Changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.2:/Changelog

Configuration flag changes:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff/n4.1.4..n4.2:/configure

Ignored new configuration flags:
--enable-libaribb24 enable ARIB text and caption decoding via libaribb24 [no]
--enable-pocketsphinx enable PocketSphinx, needed for asr filter [no]
--enable-cuda-nvcc enable Nvidia CUDA compiler [no]
--disable-cuda-llvm disable CUDA compilation using clang [autodetect]
--disable-msa2 disable MSA2 optimizations

The renamed and removed configuration options where not used.

Motivation for this change

Update to the latest version (ffmpeg_4 is already updated) and add proper support for AV1 decoding.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-review wip"
    • Only meguca fails, which is broken on Hydra for quite a while now.
  • 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.
Notify maintainers

cc @

Changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.2:/Changelog

Configuration flag changes:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff/n4.1.4..n4.2:/configure

Ignored new configuration flags:
--enable-libaribb24      enable ARIB text and caption decoding via libaribb24 [no]
--enable-pocketsphinx    enable PocketSphinx, needed for asr filter [no]
--enable-cuda-nvcc       enable Nvidia CUDA compiler [no]
--disable-cuda-llvm      disable CUDA compilation using clang [autodetect]
--disable-msa2           disable MSA2 optimizations

The renamed and removed configuration options where not used.

I've added a patch to prefer libdav1d over libaom, as libaom wasn't even
able to play my sample videos for AV1 (apart from the reduced
performance, at least in theory).
@mmahut

This comment has been minimized.

Copy link
Member

commented Aug 22, 2019

Fails on darwin as we have g++: error: unrecognized command line option '-msse4.2'.

@primeos

This comment has been minimized.

Copy link
Member Author

commented Aug 23, 2019

@mmahut are you sure that error message was from the build of ffmpeg-full? And if so: Could you have a look at it (I don't have a darwin system) / provide some additional information?

Also: Did the build of 4.1.4 succeed on your darwin setup (at least the --disable-sse42 option was already present in 4.1.4)?

The darwin build from ofborg did succeed (I assume it was either based on a different Nixpkgs commit or there's an important difference in the setup): https://github.com/NixOS/nixpkgs/pull/67205/checks?check_run_id=199575061

Only the aarch64 build was failing, but due to a build failure in a dependency and the build for 4.1.4 was also failing: https://hydra.nixos.org/build/98821440

@mmahut

This comment has been minimized.

Copy link
Member

commented Aug 23, 2019

Sorry, @primeos I meant aarch64 and did not know it is because of a dependency.

@primeos

This comment has been minimized.

Copy link
Member Author

commented Aug 23, 2019

@mmahut ok, no problem, I tried to fix it, let's see if it works (cannot test it locally atm).

@primeos primeos force-pushed the primeos:ffmpeg-full branch from ccdfdf2 to fcac9a4 Aug 23, 2019
The AArch64 build was failing since 2019-03-26:
https://hydra.nixos.org/build/98821440
@primeos primeos force-pushed the primeos:ffmpeg-full branch from fcac9a4 to 4469c23 Aug 23, 2019
@primeos

This comment has been minimized.

Copy link
Member Author

commented Aug 23, 2019

ok, it builds on all three platforms now :)
(The fix for AArch64 isn't that great tbh, but it'll work for now and its definitely better than a broken package IMO)

I'll merge it as my manual tests where fine so far (tested all three binaries, playing videos, transcoding videos, etc.).

@primeos primeos merged commit 7126eed into NixOS:master Aug 23, 2019
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
ffmpeg-full on aarch64-linux Success
Details
ffmpeg-full on x86_64-darwin Success
Details
ffmpeg-full on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.