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

[FIX] WebRTC echo while talking #17145

Merged
merged 29 commits into from
Apr 7, 2020
Merged

[FIX] WebRTC echo while talking #17145

merged 29 commits into from
Apr 7, 2020

Conversation

ndroo
Copy link
Contributor

@ndroo ndroo commented Apr 3, 2020

Closes #15018

sampaiodiego and others added 18 commits March 31, 2020 00:34
Co-Authored-By: Douglas Gubert <d-gubert@users.noreply.github.com>
* New metric to track oplog queue

* Reuse mongo instance from getMongoInfo
franckadil
franckadil previously approved these changes Apr 3, 2020
Copy link

@franckadil franckadil left a comment

Choose a reason for hiding this comment

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

Tested, fixes the echo issues on both nightly builds and and current stable versions.

@engelgabriel engelgabriel added this to the 3.1.0 milestone Apr 3, 2020
engelgabriel
engelgabriel previously approved these changes Apr 3, 2020
@ggazzo ggazzo changed the title [Fix] Update WebRTC echo #15018 [FIX] Update WebRTC echo #15018 Apr 3, 2020
@engelgabriel
Copy link
Member

@ndroo can you please point the PT to our develop branch instead of master?

@rodrigok rodrigok dismissed engelgabriel’s stale review April 3, 2020 20:57

The base branch was changed.

@rodrigok rodrigok dismissed franckadil’s stale review April 3, 2020 20:57

The base branch was changed.

@rodrigok rodrigok changed the base branch from master to develop April 3, 2020 20:57
@rodrigok
Copy link
Member

rodrigok commented Apr 3, 2020

@ndroo can you fix the conflicts? I changed the base branch from master to develop

@rodrigok rodrigok changed the base branch from develop to master April 3, 2020 20:59
@rodrigok
Copy link
Member

rodrigok commented Apr 3, 2020

@ndroo I reverted the base branch, please rebase your work base on develop branch, otherwise, it will show all the diff we have on master here

@ndroo ndroo changed the base branch from master to develop April 3, 2020 21:37
@ndroo
Copy link
Contributor Author

ndroo commented Apr 3, 2020

Updated branch, resolved merges. Let me know if you're happy with this!

@engelgabriel
Copy link
Member

@ndroo

I am so sorry for asking this, I don't want to be annoying but the best way for us to merge your PR without having to deal with all these conflicts on unrelated files would be if you can please fork our current develop branch and make the 2 line changes again on a new PR.

I know it is a lot of work for just a small fix, but we need to keep the changelog clean and I really want to merge this PR ASAP to give you the credit.

Can you please do that?

Cheers,

Gab

Copy link
Contributor

@konsumate konsumate left a comment

Choose a reason for hiding this comment

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

The echo seems to be coming from the self-video in the smaller "videos" section.
Is it necessary to mute the video in the "main-video" section as well?

…7145-ndroo-master

* 'develop' of github.com:RocketChat/Rocket.Chat:
  Fix: Huge amount of hasLicense calls to the server (RocketChat#17169)
@gabriellsh
Copy link
Member

Could you please remove history files from commit and update with develop branch? Thanks!

@rodrigok rodrigok changed the title [FIX] Update WebRTC echo #15018 [FIX] WebRTC echo while talking Apr 7, 2020
@rodrigok rodrigok merged commit c40c93d into RocketChat:develop Apr 7, 2020
@ndroo
Copy link
Contributor Author

ndroo commented Apr 7, 2020

Sorry for the delayed reply here, life has been crazy, looks like you're in good shape now...so glad this got fixed for everyone else.

@ndroo ndroo deleted the master branch April 7, 2020 14:10
@sampaiodiego sampaiodiego mentioned this pull request Apr 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WebRTC echo while talking
10 participants