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

handbrake: fix missing audio #71851

Merged
merged 1 commit into from Oct 24, 2019
Merged

Conversation

acowley
Copy link
Contributor

@acowley acowley commented Oct 23, 2019

We build HandBrake with a newer ffmpeg than upstream expects, triggering a problem where the audio samplerate defaults to zero because HandBrake was not explicitly setting it.

This has been fixed in HandBrake upstream, but we must cherry pick this change in order to produce videos with audio until HandBrake 1.3.0 is released.

Motivation for this change

Fix an issue where HandBrake could not produce videos with working audio.

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"
  • 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 @wmertens @Anton-Latukha

We build HandBrake with a newer ffmpeg than upstream expects,
triggering a problem where the audio samplerate defaults to zero
because HandBrake was not explicitly setting it.

This has been fixed in HandBrake upstream, but we must cherry pick
this change in order to produce videos with audio until HandBrake
1.3.0 is released.
@wmertens
Copy link
Contributor

LGTM!

@wmertens wmertens merged commit c98a006 into NixOS:master Oct 24, 2019
@Anton-Latukha
Copy link
Contributor

@acowley Thank you for commenting the patch. I understand only people like us, who think about other people.

@woffs
Copy link
Contributor

woffs commented Oct 31, 2019

this should be backported to 19.09

@woffs
Copy link
Contributor

woffs commented Oct 31, 2019

I can approve that

handbrake = pkgs.handbrake.overrideAttrs (old: {
   patches = [(pkgs.fetchpatch {
     name = "set-ffmpeg-samplerate.patch";
     url = "https://patch-diff.githubusercontent.com/raw/HandBrake/HandBrake/pull/2126.patch";
     sha256 = "00lds9h27cvyr53qpvv8gbv01hfxdxd8gphxcwbwg8akqrvk9gbf";
   })];
});

fixes this for 19.09 too :-)

woffs pushed a commit to woffs/nixpkgs that referenced this pull request Nov 1, 2019
We build HandBrake with a newer ffmpeg than upstream expects,
triggering a problem where the audio samplerate defaults to zero
because HandBrake was not explicitly setting it.

This has been fixed in HandBrake upstream, but we must cherry pick
this change in order to produce videos with audio until HandBrake
1.3.0 is released.

(cherry picked from commit d51e366)
bjornfor pushed a commit that referenced this pull request Nov 4, 2019
We build HandBrake with a newer ffmpeg than upstream expects,
triggering a problem where the audio samplerate defaults to zero
because HandBrake was not explicitly setting it.

This has been fixed in HandBrake upstream, but we must cherry pick
this change in order to produce videos with audio until HandBrake
1.3.0 is released.

(cherry picked from commit d51e366)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants