Allow requesting a ringtone during SIP transfers #207
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dennwc
reviewed
Oct 22, 2024
pkg/sip/inbound.go
Outdated
| w := c.lkRoom.SwapOutput(nil) | ||
|
|
||
| defer func() { | ||
| if err != nil && !c.done.Load() { |
There was a problem hiding this comment.
Ideally this should check an actual return var of the function. I usually declare it with a different name to make sure it's the right one:
func (c *inboundCall) transferCall(...) (gerr error) {
// ...
defer func() {
if gerr != nil {
// ...
}
}()| defer rcancel() | ||
|
|
||
| // mute the room audio to the SIP participant | ||
| w := c.lkRoom.SwapOutput(nil) |
There was a problem hiding this comment.
Since w may contain C resampler, we need to make sure it's either set back via SwapOutput, or closed if it's no longer needed.
There was a problem hiding this comment.
Sorry for confusing, but this still is not closed. The c.media.GetAudioWriter() is fine, it will be closed when c.media is closed. The problem is with w - you detach it from the room, so it won't be closed if the transfer succeeds. It should probably be in the defer below - it either swaps w back to the room, or should close it.
dennwc
approved these changes
Oct 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.