Style changes in Audio Mixer

webrtc/modules/audio_mixer/audio_mixer_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/audio_mixer/audio_frame_manipulator.h"
 #include "webrtc/modules/audio_mixer/audio_mixer_defines.h"

[aleloi, 2016/09/01 14:12:22]

Duplicate between .cc and .h

-#include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/utility/include/audio_frame_operations.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"

[aleloi, 2016/09/01 14:12:21]

Shouldn't include headers in .cc file that are duplicated in accompanying .h
file

 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 namespace {
 
 class SourceFrame {
  public:
   SourceFrame(MixerAudioSource* p, AudioFrame* a, bool m, bool was_mixed_before)
       : audio_source_(p),
         audio_frame_(a),
@@ skipping 58 matching lines @@
     const bool is_mixed = source_frame.audio_source_->mix_history_->IsMixed();
     // Ramp out currently unmixed.
     if (source_frame.was_mixed_before_ && !is_mixed) {
       NewMixerRampOut(source_frame.audio_frame_);
     }
   }
 }
 
 }  // namespace
 
-MixerAudioSource::MixerAudioSource() : mix_history_(new NewMixHistory()) {}
-
-MixerAudioSource::~MixerAudioSource() {
-  delete mix_history_;
-}
-
-bool MixerAudioSource::IsMixed() const {
-  return mix_history_->IsMixed();
-}
-
-NewMixHistory::NewMixHistory() : is_mixed_(0) {}
-
-NewMixHistory::~NewMixHistory() {}
-
-bool NewMixHistory::IsMixed() const {
-  return is_mixed_;
-}
-
-bool NewMixHistory::WasMixed() const {
-  // Was mixed is the same as is mixed depending on perspective. This function
-  // is for the perspective of NewAudioConferenceMixerImpl.
-  return IsMixed();
-}
-
-int32_t NewMixHistory::SetIsMixed(const bool mixed) {
-  is_mixed_ = mixed;
-  return 0;
-}
-
-void NewMixHistory::ResetMixedStatus() {
-  is_mixed_ = false;
-}
-
 std::unique_ptr<AudioMixer> AudioMixer::Create(int id) {
   AudioMixerImpl* mixer = new AudioMixerImpl(id);
   if (!mixer->Init()) {
     delete mixer;
     return NULL;
   }
   return std::unique_ptr<AudioMixer>(mixer);
 }
 
 AudioMixerImpl::AudioMixerImpl(int id)
@@ skipping 417 matching lines @@
 }
 
 int AudioMixerImpl::GetOutputAudioLevelFullRange() {
   RTC_DCHECK_RUN_ON(&thread_checker_);
   const int level = audio_level_.LevelFullRange();
   WEBRTC_TRACE(kTraceStateInfo, kTraceAudioMixerServer, id_,
                "GetAudioOutputLevelFullRange() => level=%d", level);
   return level;
 }
 }  // namespace webrtc