Add FrameAndMuteInfo to AudioConferenceMixer

Add FrameAndMuteInfo to AudioConferenceMixer

BUG=webrtc:5609
Committed: https://crrev.com/60200d1094ea46651752d0ce8eab78a1fee8273f
Cr-Commit-Position: refs/heads/master@{#12786}

[hlundin-webrtc, 2016-05-17 18:18:20]

henrik.lundin@webrtc.org changed reviewers:
+ minyue@webrtc.org

[hlundin-webrtc, 2016-05-17 18:18:21]

Minyue, I forgot to send this CL, sitting in the middle of the chain. PTAL.

[hlundin-webrtc, 2016-05-18 00:17:40]

The CQ bit was checked by henrik.lundin@webrtc.org to run a CQ dry run

[commit-bot: I haz the power, 2016-05-18 00:17:43]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1980343002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1980343002/1

[commit-bot: I haz the power, 2016-05-18 02:18:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-18 02:18:24]

Dry run: Try jobs failed on following builders:
  android_arm64_rel on tryserver.webrtc (JOB_TIMED_OUT, no build URL)

[minyue-webrtc, 2016-05-18 05:28:09]

https://codereview.webrtc.org/1980343002/diff/1/webrtc/modules/audio_conferen...
File webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
(right):

https://codereview.webrtc.org/1980343002/diff/1/webrtc/modules/audio_conferen...
webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc:872:
iter->frame->Mute();
I do not understand this? How does it affect mixedAudio?

[hlundin-webrtc, 2016-05-18 05:53:07]

https://codereview.webrtc.org/1980343002/diff/1/webrtc/modules/audio_conferen...
File webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
(right):

https://codereview.webrtc.org/1980343002/diff/1/webrtc/modules/audio_conferen...
webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc:872:
iter->frame->Mute();
On 2016/05/18 05:28:09, minyue-webrtc wrote:
> I do not understand this? How does it affect mixedAudio?

The idea is that if the first (or only) frame that is added to the mix is muted,
we must actually create the zero-samples to have something to mix and play. That
is what is done with the AudioFrame::Mute() method. But, if first_frame is
false, we already have other real samples in the mix, and adding zero-samples is
no-op, and we can just skip all following muted frames.

[minyue-webrtc, 2016-05-18 06:47:27]

LGTM given that you do the change per offline discussion

[hlundin-webrtc, 2016-05-18 06:47:46]

Don't create zero-samples for muted frames

[hlundin-webrtc, 2016-05-18 06:48:30]

Fixed this now according to our offline conversation.

https://codereview.webrtc.org/1980343002/diff/1/webrtc/modules/audio_conferen...
File webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc
(right):

https://codereview.webrtc.org/1980343002/diff/1/webrtc/modules/audio_conferen...
webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc:872:
iter->frame->Mute();
On 2016/05/18 05:53:06, hlundin-webrtc wrote:
> On 2016/05/18 05:28:09, minyue-webrtc wrote:
> > I do not understand this? How does it affect mixedAudio?
> 
> The idea is that if the first (or only) frame that is added to the mix is
muted,
> we must actually create the zero-samples to have something to mix and play.
That
> is what is done with the AudioFrame::Mute() method. But, if first_frame is
> false, we already have other real samples in the mix, and adding zero-samples
is
> no-op, and we can just skip all following muted frames.

After offline discussions, I realize that nothing needs to be done with muted
frames. The samples in mixedAudio are already zero to begin with, so mixing in
zeros is never needed.

[hlundin-webrtc, 2016-05-18 06:49:13]

The CQ bit was checked by henrik.lundin@webrtc.org

[hlundin-webrtc, 2016-05-18 06:49:14]

The patchset sent to the CQ was uploaded after l-g-t-m from minyue@webrtc.org
Link to the patchset: https://codereview.webrtc.org/1980343002/#ps20001 (title:
"Don't create zero-samples for muted frames")

[commit-bot: I haz the power, 2016-05-18 06:49:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1980343002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1980343002/20001

[commit-bot: I haz the power, 2016-05-18 08:48:44]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-05-18 08:48:52]

Description was changed from

==========
Add FrameAndMuteInfo to AudioConferenceMixer

BUG=webrtc:5609
==========

to

==========
Add FrameAndMuteInfo to AudioConferenceMixer

BUG=webrtc:5609

Committed: https://crrev.com/60200d1094ea46651752d0ce8eab78a1fee8273f
Cr-Commit-Position: refs/heads/master@{#12786}
==========

[commit-bot: I haz the power, 2016-05-18 08:48:53]

Patchset 2 (id:??) landed as
https://crrev.com/60200d1094ea46651752d0ce8eab78a1fee8273f
Cr-Commit-Position: refs/heads/master@{#12786}