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

Side by Side Diff: webrtc/voice_engine/transmit_mixer.h

Issue 2665693002: Moves channel-dependent audio input processing to separate encoder task queue (Closed)
Patch Set: Final comments from Tommi Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/voice_engine/shared_data.cc ('k') | webrtc/voice_engine/transmit_mixer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 14 matching lines...) Expand all
25 #include "webrtc/voice_engine/monitor_module.h" 25 #include "webrtc/voice_engine/monitor_module.h"
26 #include "webrtc/voice_engine/voice_engine_defines.h" 26 #include "webrtc/voice_engine/voice_engine_defines.h"
27 27
28 #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS) 28 #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS)
29 #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION 1 29 #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION 1
30 #else 30 #else
31 #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION 0 31 #define WEBRTC_VOICE_ENGINE_TYPING_DETECTION 0
32 #endif 32 #endif
33 33
34 namespace webrtc { 34 namespace webrtc {
35
36 class AudioProcessing; 35 class AudioProcessing;
37 class ProcessThread; 36 class ProcessThread;
38 37
39 namespace voe { 38 namespace voe {
40 39
41 class ChannelManager; 40 class ChannelManager;
42 class MixedAudio; 41 class MixedAudio;
43 class Statistics; 42 class Statistics;
44 43
45 class TransmitMixer : public FileCallback { 44 class TransmitMixer : public FileCallback {
(...skipping 11 matching lines...) Expand all
57 56
58 int32_t PrepareDemux(const void* audioSamples, 57 int32_t PrepareDemux(const void* audioSamples,
59 size_t nSamples, 58 size_t nSamples,
60 size_t nChannels, 59 size_t nChannels,
61 uint32_t samplesPerSec, 60 uint32_t samplesPerSec,
62 uint16_t totalDelayMS, 61 uint16_t totalDelayMS,
63 int32_t clockDrift, 62 int32_t clockDrift,
64 uint16_t currentMicLevel, 63 uint16_t currentMicLevel,
65 bool keyPressed); 64 bool keyPressed);
66 65
67 66 void ProcessAndEncodeAudio();
68 int32_t DemuxAndMix();
69 // Used by the Chrome to pass the recording data to the specific VoE
70 // channels for demux.
71 void DemuxAndMix(const int voe_channels[], size_t number_of_voe_channels);
72
73 int32_t EncodeAndSend();
74 // Used by the Chrome to pass the recording data to the specific VoE
75 // channels for encoding and sending to the network.
76 void EncodeAndSend(const int voe_channels[], size_t number_of_voe_channels);
77 67
78 // Must be called on the same thread as PrepareDemux(). 68 // Must be called on the same thread as PrepareDemux().
79 uint32_t CaptureLevel() const; 69 uint32_t CaptureLevel() const;
80 70
81 int32_t StopSend(); 71 int32_t StopSend();
82 72
83 // TODO(solenberg): Remove, once AudioMonitor is gone. 73 // TODO(solenberg): Remove, once AudioMonitor is gone.
84 int8_t AudioLevel() const; 74 int8_t AudioLevel() const;
85 75
86 // 'virtual' to allow mocking. 76 // 'virtual' to allow mocking.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 int _instanceId = 0; 203 int _instanceId = 0;
214 bool _mixFileWithMicrophone = false; 204 bool _mixFileWithMicrophone = false;
215 uint32_t _captureLevel = 0; 205 uint32_t _captureLevel = 0;
216 bool stereo_codec_ = false; 206 bool stereo_codec_ = false;
217 bool swap_stereo_channels_ = false; 207 bool swap_stereo_channels_ = false;
218 }; 208 };
219 } // namespace voe 209 } // namespace voe
220 } // namespace webrtc 210 } // namespace webrtc
221 211
222 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H 212 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/shared_data.cc ('k') | webrtc/voice_engine/transmit_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698