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

Issue 2104363003: A simple copy of the old mixer to a new directory. I also plan to run 'git cl format'. In another C… (Closed)

Created:
4 years, 5 months ago by aleloi
Modified:
4 years, 5 months ago
Reviewers:
ivoc, hlundin-webrtc, ossu
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

A simple copy of the old audio mixer to a new directory. I have added build files and renamed the mixer so that it doesn't conflict with the old one. The header includes now point to this copy of the mixer. I have also fixed some of the more obvious cases of style guide non-conformance and run 'PRESUBMIT' on the old mixer. This is a first step in the creation of a new mixing module that will replace AudioConferencMixer and OutputMixer. NOTRY=True Committed: https://crrev.com/77ad394fa6680aa9fb36d0bcac330dd84b29dfc2 Cr-Commit-Position: refs/heads/master@{#13378}

Patch Set 1 #

Total comments: 3

Patch Set 2 : Run 'git cl format' on the mixer #

Total comments: 1

Patch Set 3 : Renamed mixer classes to avoid conflicts with existing mixer. #

Patch Set 4 : removed change in modules build file #

Patch Set 5 : Removed time scheduler and pool. #

Patch Set 6 : Removed time scheduler and pool #

Total comments: 7

Patch Set 7 : Another cl format #

Total comments: 1

Patch Set 8 : Updated include guard names #

Total comments: 11

Patch Set 9 : Added builds, test and renamed files and a class. #

Patch Set 10 : Accidentally changed the old audio_conference_mixer #

Total comments: 8

Patch Set 11 : Added voice engine dependency. #

Patch Set 12 : Fixed cpplint complaints in old code. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1900 lines, -13 lines) Patch
A + webrtc/modules/audio_mixer/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +36 lines, -14 lines 0 comments Download
A + webrtc/modules/audio_mixer/DEPS View 1 2 3 4 5 6 7 8 9 10 1 chunk +1 line, -0 lines 0 comments Download
A webrtc/modules/audio_mixer/audio_mixer.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +127 lines, -0 lines 0 comments Download
A webrtc/modules/audio_mixer/audio_mixer.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +451 lines, -0 lines 0 comments Download
A webrtc/modules/audio_mixer/audio_mixer.gypi View 1 2 3 4 5 6 7 8 9 1 chunk +40 lines, -0 lines 0 comments Download
A webrtc/modules/audio_mixer/include/audio_mixer_defines.h View 1 2 3 4 5 6 7 8 1 chunk +84 lines, -0 lines 0 comments Download
A webrtc/modules/audio_mixer/include/new_audio_conference_mixer.h View 1 2 3 4 5 6 7 8 1 chunk +74 lines, -0 lines 0 comments Download
A + webrtc/modules/audio_mixer/source/OWNERS View 0 chunks +-1 lines, --1 lines 0 comments Download
A webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +188 lines, -0 lines 0 comments Download
A webrtc/modules/audio_mixer/source/new_audio_conference_mixer_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +898 lines, -0 lines 0 comments Download
M webrtc/modules/modules.gyp View 1 2 3 4 5 6 7 8 9 2 chunks +2 lines, -0 lines 0 comments Download

Dependent Patchsets:

Messages

Total messages: 41 (16 generated)
aleloi2
PTAL
4 years, 5 months ago (2016-06-30 15:04:15 UTC) #4
aleloi
As I understood it during offline discussions with hlundin@ and ossu@, the plan was to ...
4 years, 5 months ago (2016-06-30 15:20:17 UTC) #6
ivoc
On 2016/06/30 15:20:17, aleloi wrote: > As I understood it during offline discussions with hlundin@ ...
4 years, 5 months ago (2016-06-30 15:30:02 UTC) #7
ossu
On 2016/06/30 15:30:02, ivoc wrote: > On 2016/06/30 15:20:17, aleloi wrote: > > As I ...
4 years, 5 months ago (2016-06-30 15:43:51 UTC) #8
ossu
https://codereview.webrtc.org/2104363003/diff/1/webrtc/modules/audio_mixer/output_mixer.cc File webrtc/modules/audio_mixer/output_mixer.cc (right): https://codereview.webrtc.org/2104363003/diff/1/webrtc/modules/audio_mixer/output_mixer.cc#newcode43 webrtc/modules/audio_mixer/output_mixer.cc:43: // Not implement yet This ... https://codereview.webrtc.org/2104363003/diff/1/webrtc/modules/audio_mixer/output_mixer.cc#newcode53 webrtc/modules/audio_mixer/output_mixer.cc:53: // ...
4 years, 5 months ago (2016-06-30 15:44:03 UTC) #10
aleloi
I was planning to rename the files in a next CL. But as ossu@ says, ...
4 years, 5 months ago (2016-06-30 16:37:54 UTC) #11
ivoc
https://codereview.webrtc.org/2104363003/diff/100001/webrtc/modules/audio_mixer/audio_mixer.cc File webrtc/modules/audio_mixer/audio_mixer.cc (right): https://codereview.webrtc.org/2104363003/diff/100001/webrtc/modules/audio_mixer/audio_mixer.cc#newcode194 webrtc/modules/audio_mixer/audio_mixer.cc:194: bool mixable) Formatting seems off (nr of spaces) https://codereview.webrtc.org/2104363003/diff/100001/webrtc/modules/audio_mixer/audio_mixer.cc#newcode201 ...
4 years, 5 months ago (2016-07-01 07:56:27 UTC) #12
aleloi
I did a new 'cl format' that fixed indentation in audio_mixer.* https://codereview.webrtc.org/2104363003/diff/100001/webrtc/modules/audio_mixer/include/audio_conference_mixer.h File webrtc/modules/audio_mixer/include/audio_conference_mixer.h (right): ...
4 years, 5 months ago (2016-07-01 08:12:35 UTC) #13
ossu
https://codereview.webrtc.org/2104363003/diff/100001/webrtc/modules/audio_mixer/include/audio_conference_mixer.h File webrtc/modules/audio_mixer/include/audio_conference_mixer.h (right): https://codereview.webrtc.org/2104363003/diff/100001/webrtc/modules/audio_mixer/include/audio_conference_mixer.h#newcode23 webrtc/modules/audio_mixer/include/audio_conference_mixer.h:23: class NewAudioConferenceMixer : public Module { On 2016/07/01 08:12:35, ...
4 years, 5 months ago (2016-07-01 08:39:50 UTC) #14
aleloi
Updated header guards. https://codereview.webrtc.org/2104363003/diff/100001/webrtc/modules/audio_mixer/include/audio_conference_mixer.h File webrtc/modules/audio_mixer/include/audio_conference_mixer.h (right): https://codereview.webrtc.org/2104363003/diff/100001/webrtc/modules/audio_mixer/include/audio_conference_mixer.h#newcode23 webrtc/modules/audio_mixer/include/audio_conference_mixer.h:23: class NewAudioConferenceMixer : public Module { ...
4 years, 5 months ago (2016-07-01 09:12:27 UTC) #15
hlundin-webrtc
On 2016/07/01 09:12:27, aleloi wrote: > Updated header guards. > > https://codereview.webrtc.org/2104363003/diff/100001/webrtc/modules/audio_mixer/include/audio_conference_mixer.h > File webrtc/modules/audio_mixer/include/audio_conference_mixer.h ...
4 years, 5 months ago (2016-07-01 11:55:25 UTC) #16
hlundin-webrtc
https://codereview.webrtc.org/2104363003/diff/140001/webrtc/modules/audio_mixer/BUILD.gn File webrtc/modules/audio_mixer/BUILD.gn (right): https://codereview.webrtc.org/2104363003/diff/140001/webrtc/modules/audio_mixer/BUILD.gn#newcode1 webrtc/modules/audio_mixer/BUILD.gn:1: # Copyright (c) 2014 The WebRTC project authors. All ...
4 years, 5 months ago (2016-07-01 12:10:04 UTC) #17
aleloi
New patch set: 1. Added GN and gyp build files 2. Connected this folder to ...
4 years, 5 months ago (2016-07-01 14:16:29 UTC) #18
ivoc
Getting close, see some small points below. https://codereview.webrtc.org/2104363003/diff/180001/webrtc/modules/audio_mixer/audio_mixer.cc File webrtc/modules/audio_mixer/audio_mixer.cc (right): https://codereview.webrtc.org/2104363003/diff/180001/webrtc/modules/audio_mixer/audio_mixer.cc#newcode40 webrtc/modules/audio_mixer/audio_mixer.cc:40: // Not ...
4 years, 5 months ago (2016-07-04 12:07:23 UTC) #19
aleloi
https://codereview.webrtc.org/2104363003/diff/180001/webrtc/modules/audio_mixer/audio_mixer.cc File webrtc/modules/audio_mixer/audio_mixer.cc (right): https://codereview.webrtc.org/2104363003/diff/180001/webrtc/modules/audio_mixer/audio_mixer.cc#newcode40 webrtc/modules/audio_mixer/audio_mixer.cc:40: // Not implement yet On 2016/07/04 12:07:23, ivoc wrote: ...
4 years, 5 months ago (2016-07-04 12:34:45 UTC) #21
ivoc
On 2016/07/04 12:34:45, aleloi wrote: > https://codereview.webrtc.org/2104363003/diff/180001/webrtc/modules/audio_mixer/audio_mixer.cc > File webrtc/modules/audio_mixer/audio_mixer.cc (right): > > https://codereview.webrtc.org/2104363003/diff/180001/webrtc/modules/audio_mixer/audio_mixer.cc#newcode40 > ...
4 years, 5 months ago (2016-07-04 12:36:23 UTC) #22
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/2104363003/180001
4 years, 5 months ago (2016-07-04 12:37:48 UTC) #24
commit-bot: I haz the power
Try jobs failed on following builders: presubmit on master.tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/6672)
4 years, 5 months ago (2016-07-04 12:39:58 UTC) #26
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/2104363003/200001
4 years, 5 months ago (2016-07-04 12:58:47 UTC) #29
commit-bot: I haz the power
Try jobs failed on following builders: presubmit on master.tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/6674)
4 years, 5 months ago (2016-07-04 13:01:49 UTC) #31
ossu
On 2016/07/04 13:01:49, commit-bot: I haz the power wrote: > Try jobs failed on following ...
4 years, 5 months ago (2016-07-04 13:13:22 UTC) #32
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/2104363003/220001
4 years, 5 months ago (2016-07-04 13:31:27 UTC) #36
commit-bot: I haz the power
Committed patchset #12 (id:220001)
4 years, 5 months ago (2016-07-04 13:33:06 UTC) #38
commit-bot: I haz the power
CQ bit was unchecked.
4 years, 5 months ago (2016-07-04 13:33:09 UTC) #39
commit-bot: I haz the power
4 years, 5 months ago (2016-07-04 13:33:15 UTC) #41
Message was sent while issue was closed.
Patchset 12 (id:??) landed as
https://crrev.com/77ad394fa6680aa9fb36d0bcac330dd84b29dfc2
Cr-Commit-Position: refs/heads/master@{#13378}

Powered by Google App Engine
This is Rietveld 408576698