Skip to content

libdatachannel: init at 0.18.5#237099

Merged
Janik-Haag merged 1 commit intoNixOS:masterfrom
erdnaxe:libdatachannel
Jun 27, 2023
Merged

libdatachannel: init at 0.18.5#237099
Janik-Haag merged 1 commit intoNixOS:masterfrom
erdnaxe:libdatachannel

Conversation

@erdnaxe
Copy link
Member

@erdnaxe erdnaxe commented Jun 10, 2023

Description of changes

Motivation: Next major version of OBS Studio will depend on libdatachannel for WHIP (WebRTC) support.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
    • Built OBS Studio master with it, and successfully streamed using WHIP.
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jun 10, 2023
Copy link
Contributor

@raphaelr raphaelr left a comment

Choose a reason for hiding this comment

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

Most feedback is about reducing vendoring

@erdnaxe erdnaxe changed the title libdatachannel: init at 0.18.4 libdatachannel: init at 0.18.5 Jun 20, 2023
@erdnaxe
Copy link
Member Author

erdnaxe commented Jun 20, 2023

Using usrsctp from NixPkgs (rather than the vendored one) breaks WHIP audio: I get strange audio cracks when streaming to a WHIP server with Opus.

I am going to investigate why before continuing this PR.

Thank you for the plog derivation, I will open another pull request opened at #238806.

@erdnaxe erdnaxe marked this pull request as ready for review June 24, 2023 17:03
@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/prs-ready-for-review/3032/2368

@Janik-Haag Janik-Haag requested review from misuzu and raphaelr June 27, 2023 07:53
Copy link
Member

@Janik-Haag Janik-Haag left a comment

Choose a reason for hiding this comment

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

LGTM; I will merge this once some one else approves this as well or ~2 weeks go by with out some one complaining.

Copy link
Contributor

@raphaelr raphaelr left a comment

Choose a reason for hiding this comment

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

LGTM

@Janik-Haag Janik-Haag merged commit a327d55 into NixOS:master Jun 27, 2023
let
# Use usrsctp version specified at https://github.com/paullouisageneau/libdatachannel/tree/master/deps
# Older or newer usrsctp might break libdatachannel, please keep it synced with upstream.
customUsrsctp = usrsctp.overrideAttrs (finalAttrs: previousAttrs: {
Copy link
Member

Choose a reason for hiding this comment

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

A more canonical name we would use would be usrsctp'

Copy link
Member

Choose a reason for hiding this comment

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

we can revert this If you find it more then a slight annoyance.

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 can open another PR if you say this is important.

Copy link
Member

Choose a reason for hiding this comment

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

Just keep it in mind for next time or the next change to this file

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

Labels

8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants