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.

Sign up for GitHub

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

obs-webrtc: Add multitrack audio support #10544

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

obs-webrtc: Add multitrack audio support #10544

wants to merge 1 commit into from

Conversation

Sean-Der
Copy link
Contributor

Description

Add support for multitrack audio in WebRTC plugin

Motivation and Context

Requested by user in discord

How Has This Been Tested?

Tested against https://github.com/Sean-Der/multitrack-save

Types of changes

  • New feature (non-breaking change which adds functionality)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@WizardCM WizardCM added the New Feature New feature or plugin label Apr 16, 2024
RytoEX
RytoEX requested changes Apr 20, 2024
View reviewed changes
Copy link
Member

@RytoEX RytoEX left a comment •
edited

Choose a reason for hiding this comment

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

Nits. Will also need merge conflicts fixed.

Commit will need to either:

  • need to note "this commit also modifies UI files"
  • add "UI" to the commit message prefix
  • be split into two commits for each component (UI, obs-webrtc)

plugins/obs-webrtc/whip-output.cpp
last_audio_timestamp = packet->dts_usec;
if (audio_tracks.size() <= packet->track_idx) {
do_log(LOG_ERROR,
"Recieved audio for track that does not exist");
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"Recieved audio for track that does not exist");
"Received audio for track that does not exist");

UI/window-basic-settings-stream.cpp
@@ -182,11 +182,14 @@ void OBSBasicSettings::LoadStream1Settings()

#define SRT_PROTOCOL "srt"
#define RIST_PROTOCOL "rist"
#define WHIP_PROTOCOL "WHIP"
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
#define WHIP_PROTOCOL "WHIP"
#define WHIP_PROTOCOL "whip"

Unless this needs to be capitalized for other reasons.

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

@RytoEX RytoEX RytoEX requested changes

Assignees
No one assigned
Labels
New Feature New feature or plugin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Sean-Der @RytoEX @WizardCM