Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(500)

Issue 2408683002: Cleanup of the mixer interface. (Closed)

Created:
4 years, 2 months ago by aleloi
Modified:
4 years, 2 months ago
Reviewers:
the sun, hlundin-webrtc
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com, hlundin-webrtc
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Implemented further mixer interface change suggestions from https://codereview.webrtc.org/2386383003/ Changed mixability status into AddSource/RemoveSource. Added 'ssrc()' method to the MixerSource interface. Removed unnecessary member 'num_audio_sources_' and made the mixer be refcounted. BUG=webrtc:6346 NOTRY=True Committed: https://crrev.com/116ec6da50c7c82b2341b97e2d6d512ade3f6e00 Cr-Commit-Position: refs/heads/master@{#14612}

Patch Set 1 #

Total comments: 24

Patch Set 2 : Added checks in Add/Remove source, double add or nonexistent remove is an error. #

Total comments: 7

Patch Set 3 : Lock <-> DCHECK. #

Patch Set 4 : Rebase #

Total comments: 9

Patch Set 5 : Moved audio_mixer_unittest from test/ #

Patch Set 6 : Added clarifying comments for adding/removing sources and threading aspects of the interface. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+76 lines, -472 lines) Patch
M webrtc/modules/BUILD.gn View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M webrtc/modules/audio_mixer/audio_mixer.h View 1 2 3 4 5 2 chunks +14 lines, -7 lines 0 comments Download
M webrtc/modules/audio_mixer/audio_mixer_impl.h View 1 2 3 5 chunks +10 lines, -7 lines 0 comments Download
M webrtc/modules/audio_mixer/audio_mixer_impl.cc View 1 2 3 4 7 chunks +22 lines, -60 lines 0 comments Download
A + webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc View 1 2 3 4 19 chunks +29 lines, -27 lines 0 comments Download
D webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc View 1 2 3 4 1 chunk +0 lines, -370 lines 0 comments Download

Depends on Patchset:

Messages

Total messages: 28 (14 generated)
aleloi
Here is part 2. Please take a look! https://codereview.webrtc.org/2408683002/diff/1/webrtc/modules/audio_mixer/audio_mixer.h File webrtc/modules/audio_mixer/audio_mixer.h (left): https://codereview.webrtc.org/2408683002/diff/1/webrtc/modules/audio_mixer/audio_mixer.h#oldcode22 webrtc/modules/audio_mixer/audio_mixer.h:22: static ...
4 years, 2 months ago (2016-10-10 13:06:31 UTC) #5
the sun
https://codereview.webrtc.org/2408683002/diff/1/webrtc/modules/audio_mixer/audio_mixer.h File webrtc/modules/audio_mixer/audio_mixer.h (left): https://codereview.webrtc.org/2408683002/diff/1/webrtc/modules/audio_mixer/audio_mixer.h#oldcode22 webrtc/modules/audio_mixer/audio_mixer.h:22: static const int kMaximumAmountOfMixedAudioSources = 3; On 2016/10/10 13:06:31, ...
4 years, 2 months ago (2016-10-10 13:35:49 UTC) #6
aleloi
Uploaded new patch set. https://codereview.webrtc.org/2408683002/diff/1/webrtc/modules/audio_mixer/audio_mixer_impl.cc File webrtc/modules/audio_mixer/audio_mixer_impl.cc (right): https://codereview.webrtc.org/2408683002/diff/1/webrtc/modules/audio_mixer/audio_mixer_impl.cc#newcode249 webrtc/modules/audio_mixer/audio_mixer_impl.cc:249: return false; On 2016/10/10 13:35:49, ...
4 years, 2 months ago (2016-10-10 14:02:27 UTC) #8
the sun
lgtm % nits https://codereview.webrtc.org/2408683002/diff/20001/webrtc/modules/audio_mixer/audio_mixer_impl.cc File webrtc/modules/audio_mixer/audio_mixer_impl.cc (right): https://codereview.webrtc.org/2408683002/diff/20001/webrtc/modules/audio_mixer/audio_mixer_impl.cc#newcode245 webrtc/modules/audio_mixer/audio_mixer_impl.cc:245: RTC_DCHECK(audio_source); nit: check arguments before claiming ...
4 years, 2 months ago (2016-10-10 14:16:27 UTC) #9
aleloi
https://codereview.webrtc.org/2408683002/diff/20001/webrtc/modules/audio_mixer/audio_mixer_impl.cc File webrtc/modules/audio_mixer/audio_mixer_impl.cc (right): https://codereview.webrtc.org/2408683002/diff/20001/webrtc/modules/audio_mixer/audio_mixer_impl.cc#newcode245 webrtc/modules/audio_mixer/audio_mixer_impl.cc:245: RTC_DCHECK(audio_source); On 2016/10/10 14:16:27, the sun wrote: > nit: ...
4 years, 2 months ago (2016-10-10 14:50:35 UTC) #10
the sun
https://codereview.webrtc.org/2408683002/diff/20001/webrtc/modules/audio_mixer/audio_mixer_impl.cc File webrtc/modules/audio_mixer/audio_mixer_impl.cc (right): https://codereview.webrtc.org/2408683002/diff/20001/webrtc/modules/audio_mixer/audio_mixer_impl.cc#newcode246 webrtc/modules/audio_mixer/audio_mixer_impl.cc:246: RTC_DCHECK(FindSourceInList(audio_source, &audio_source_list_) == On 2016/10/10 14:50:35, aleloi wrote: > ...
4 years, 2 months ago (2016-10-10 19:24:48 UTC) #11
hlundin-webrtc
https://codereview.webrtc.org/2408683002/diff/80001/webrtc/modules/audio_mixer/audio_mixer.h File webrtc/modules/audio_mixer/audio_mixer.h (right): https://codereview.webrtc.org/2408683002/diff/80001/webrtc/modules/audio_mixer/audio_mixer.h#newcode57 webrtc/modules/audio_mixer/audio_mixer.h:57: // source twice is forbidden, as is removing a ...
4 years, 2 months ago (2016-10-11 11:50:21 UTC) #12
the sun
https://codereview.webrtc.org/2408683002/diff/80001/webrtc/modules/audio_mixer/audio_mixer.h File webrtc/modules/audio_mixer/audio_mixer.h (right): https://codereview.webrtc.org/2408683002/diff/80001/webrtc/modules/audio_mixer/audio_mixer.h#newcode57 webrtc/modules/audio_mixer/audio_mixer.h:57: // source twice is forbidden, as is removing a ...
4 years, 2 months ago (2016-10-11 12:10:56 UTC) #13
hlundin-webrtc
lgtm https://codereview.webrtc.org/2408683002/diff/80001/webrtc/modules/audio_mixer/audio_mixer.h File webrtc/modules/audio_mixer/audio_mixer.h (right): https://codereview.webrtc.org/2408683002/diff/80001/webrtc/modules/audio_mixer/audio_mixer.h#newcode57 webrtc/modules/audio_mixer/audio_mixer.h:57: // source twice is forbidden, as is removing ...
4 years, 2 months ago (2016-10-11 12:49:54 UTC) #14
aleloi
https://codereview.webrtc.org/2408683002/diff/80001/webrtc/modules/audio_mixer/audio_mixer.h File webrtc/modules/audio_mixer/audio_mixer.h (right): https://codereview.webrtc.org/2408683002/diff/80001/webrtc/modules/audio_mixer/audio_mixer.h#newcode57 webrtc/modules/audio_mixer/audio_mixer.h:57: // source twice is forbidden, as is removing a ...
4 years, 2 months ago (2016-10-12 10:20:53 UTC) #19
aleloi
NOTRY=True since all tests have passed recently.
4 years, 2 months ago (2016-10-12 12:58:02 UTC) #21
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/2408683002/180001
4 years, 2 months ago (2016-10-12 12:58:50 UTC) #24
commit-bot: I haz the power
Committed patchset #6 (id:180001)
4 years, 2 months ago (2016-10-12 13:07:10 UTC) #26
commit-bot: I haz the power
4 years, 2 months ago (2016-10-12 13:07:21 UTC) #28
Message was sent while issue was closed.
Patchset 6 (id:??) landed as
https://crrev.com/116ec6da50c7c82b2341b97e2d6d512ade3f6e00
Cr-Commit-Position: refs/heads/master@{#14612}

Powered by Google App Engine
This is Rietveld 408576698