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

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

Issue 2645033002: Remove VoEExternalMedia interface. (Closed)
Patch Set: bad merge Created 3 years, 10 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
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 17 matching lines...) Expand all
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 35
36 class AudioProcessing; 36 class AudioProcessing;
37 class ProcessThread; 37 class ProcessThread;
38 class VoEExternalMedia;
39 class VoEMediaProcess;
40 38
41 namespace voe { 39 namespace voe {
42 40
43 class ChannelManager; 41 class ChannelManager;
44 class MixedAudio; 42 class MixedAudio;
45 class Statistics; 43 class Statistics;
46 44
47 class TransmitMixer : public MonitorObserver, 45 class TransmitMixer : public MonitorObserver,
48 public FileCallback { 46 public FileCallback {
49 public: 47 public:
(...skipping 26 matching lines...) Expand all
76 int32_t EncodeAndSend(); 74 int32_t EncodeAndSend();
77 // Used by the Chrome to pass the recording data to the specific VoE 75 // Used by the Chrome to pass the recording data to the specific VoE
78 // channels for encoding and sending to the network. 76 // channels for encoding and sending to the network.
79 void EncodeAndSend(const int voe_channels[], size_t number_of_voe_channels); 77 void EncodeAndSend(const int voe_channels[], size_t number_of_voe_channels);
80 78
81 // Must be called on the same thread as PrepareDemux(). 79 // Must be called on the same thread as PrepareDemux().
82 uint32_t CaptureLevel() const; 80 uint32_t CaptureLevel() const;
83 81
84 int32_t StopSend(); 82 int32_t StopSend();
85 83
86 // VoEExternalMedia
87 int RegisterExternalMediaProcessing(VoEMediaProcess* object,
88 ProcessingTypes type);
89 int DeRegisterExternalMediaProcessing(ProcessingTypes type);
90
91 int GetMixingFrequency();
92
93 // VoEVolumeControl 84 // VoEVolumeControl
94 int SetMute(bool enable); 85 int SetMute(bool enable);
95 86
96 bool Mute() const; 87 bool Mute() const;
97 88
98 int8_t AudioLevel() const; 89 int8_t AudioLevel() const;
99 90
100 int16_t AudioLevelFullRange() const; 91 int16_t AudioLevelFullRange() const;
101 92
102 bool IsRecordingCall(); 93 bool IsRecordingCall();
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 #if WEBRTC_VOICE_ENGINE_TYPING_DETECTION 212 #if WEBRTC_VOICE_ENGINE_TYPING_DETECTION
222 webrtc::TypingDetection _typingDetection; 213 webrtc::TypingDetection _typingDetection;
223 bool _typingNoiseWarningPending; 214 bool _typingNoiseWarningPending;
224 bool _typingNoiseDetected; 215 bool _typingNoiseDetected;
225 #endif 216 #endif
226 bool _saturationWarning; 217 bool _saturationWarning;
227 218
228 int _instanceId; 219 int _instanceId;
229 bool _mixFileWithMicrophone; 220 bool _mixFileWithMicrophone;
230 uint32_t _captureLevel; 221 uint32_t _captureLevel;
231 VoEMediaProcess* external_postproc_ptr_;
232 VoEMediaProcess* external_preproc_ptr_;
233 bool _mute; 222 bool _mute;
234 bool stereo_codec_; 223 bool stereo_codec_;
235 bool swap_stereo_channels_; 224 bool swap_stereo_channels_;
236 }; 225 };
237 226
238 } // namespace voe 227 } // namespace voe
239 228
240 } // namespace webrtc 229 } // namespace webrtc
241 230
242 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H 231 #endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
OLDNEW
« no previous file with comments | « webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc ('k') | webrtc/voice_engine/transmit_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698