commit ec6fbd277623cc60007d6a57d91f1e6b78ad6b04
author henrika <henrika@webrtc.org> Fri Mar 31 05:43:36 2017 -0700
committer Commit bot <commit-bot@chromium.org> Fri Mar 31 12:43:36 2017 +0000
tree 6b3a67a6a809548767e32ffcbc3cd282189e2202
parent 36e9eb4773d1a27d67ef632b9537bae82e3d6b6b

Moves channel-dependent audio input processing to separate encoder task queue.

First approach to remove parts of the heavy load done for encoding, and
preparation for sending, from native audio thread to separate task queue.

With this change we will give the native input audio thread more time to
"relax" between successive audio captures.

Separate profiling done on Android has verified that the change works well;
the load is now redistributed and the load of the native AudioRecordThread
is reduced. Similar conclusions should be valid for all other OS:es as well.

BUG=NONE
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_compile_dbg,linux_android_rel_ng

Review-Url: https://codereview.webrtc.org/2665693002
Cr-Commit-Position: refs/heads/master@{#17488}

webrtc/voice_engine/shared_data.h

diff --git a/webrtc/voice_engine/shared_data.h b/webrtc/voice_engine/shared_data.h
index e301419..1a91040 100644
--- a/webrtc/voice_engine/shared_data.h
+++ b/webrtc/voice_engine/shared_data.h
@@ -15,6 +15,9 @@
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/base/task_queue.h"
+#include "webrtc/base/thread_annotations.h"
+#include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/utility/include/process_thread.h"
@@ -46,6 +49,7 @@
     OutputMixer* output_mixer() { return _outputMixerPtr; }
     rtc::CriticalSection* crit_sec() { return &_apiCritPtr; }
     ProcessThread* process_thread() { return _moduleProcessThreadPtr.get(); }
+    rtc::TaskQueue* encoder_queue();
 
     int NumOfSendingChannels();
     int NumOfPlayingChannels();
@@ -57,18 +61,22 @@
                       const char* msg) const;
 
 protected:
-    const uint32_t _instanceId;
-    rtc::CriticalSection _apiCritPtr;
-    ChannelManager _channelManager;
-    Statistics _engineStatistics;
-    rtc::scoped_refptr<AudioDeviceModule> _audioDevicePtr;
-    OutputMixer* _outputMixerPtr;
-    TransmitMixer* _transmitMixerPtr;
-    std::unique_ptr<AudioProcessing> audioproc_;
-    std::unique_ptr<ProcessThread> _moduleProcessThreadPtr;
+ rtc::ThreadChecker construction_thread_;
+ const uint32_t _instanceId;
+ rtc::CriticalSection _apiCritPtr;
+ ChannelManager _channelManager;
+ Statistics _engineStatistics;
+ rtc::scoped_refptr<AudioDeviceModule> _audioDevicePtr;
+ OutputMixer* _outputMixerPtr;
+ TransmitMixer* _transmitMixerPtr;
+ std::unique_ptr<AudioProcessing> audioproc_;
+ std::unique_ptr<ProcessThread> _moduleProcessThreadPtr;
+ // |encoder_queue| is defined last to ensure all pending tasks are cancelled
+ // and deleted before any other members.
+ rtc::TaskQueue encoder_queue_ ACCESS_ON(construction_thread_);
 
-    SharedData();
-    virtual ~SharedData();
+ SharedData();
+ virtual ~SharedData();
 };
 
 }  // namespace voe