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

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

Issue 1796183002: Remove unused method OutputMixer::PlayDtmfTone() and infrastructure. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@voe_dtmf_6
Patch Set: rebase Created 4 years, 9 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/include/voe_errors.h ('k') | webrtc/voice_engine/output_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
11 #ifndef WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_ 11 #ifndef WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_
12 #define WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_ 12 #define WEBRTC_VOICE_ENGINE_OUTPUT_MIXER_H_
13 13
14 #include "webrtc/base/criticalsection.h" 14 #include "webrtc/base/criticalsection.h"
15 #include "webrtc/common_audio/resampler/include/push_resampler.h" 15 #include "webrtc/common_audio/resampler/include/push_resampler.h"
16 #include "webrtc/common_types.h" 16 #include "webrtc/common_types.h"
17 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h " 17 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h "
18 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h" 18 #include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_d efines.h"
19 #include "webrtc/modules/utility/include/file_recorder.h" 19 #include "webrtc/modules/utility/include/file_recorder.h"
20 #include "webrtc/voice_engine/dtmf_inband.h"
21 #include "webrtc/voice_engine/level_indicator.h" 20 #include "webrtc/voice_engine/level_indicator.h"
22 #include "webrtc/voice_engine/voice_engine_defines.h" 21 #include "webrtc/voice_engine/voice_engine_defines.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 24
26 class AudioProcessing; 25 class AudioProcessing;
27 class FileWrapper; 26 class FileWrapper;
28 class VoEMediaProcess; 27 class VoEMediaProcess;
29 28
30 namespace voe { 29 namespace voe {
(...skipping 12 matching lines...) Expand all
43 42
44 int32_t SetAudioProcessingModule( 43 int32_t SetAudioProcessingModule(
45 AudioProcessing* audioProcessingModule); 44 AudioProcessing* audioProcessingModule);
46 45
47 // VoEExternalMedia 46 // VoEExternalMedia
48 int RegisterExternalMediaProcessing( 47 int RegisterExternalMediaProcessing(
49 VoEMediaProcess& proccess_object); 48 VoEMediaProcess& proccess_object);
50 49
51 int DeRegisterExternalMediaProcessing(); 50 int DeRegisterExternalMediaProcessing();
52 51
53 // VoEDtmf
54 int PlayDtmfTone(uint8_t eventCode, int lengthMs, int attenuationDb);
55
56 int32_t MixActiveChannels(); 52 int32_t MixActiveChannels();
57 53
58 int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm); 54 int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm);
59 55
60 int32_t SetMixabilityStatus(MixerParticipant& participant, 56 int32_t SetMixabilityStatus(MixerParticipant& participant,
61 bool mixable); 57 bool mixable);
62 58
63 int32_t SetAnonymousMixabilityStatus(MixerParticipant& participant, 59 int32_t SetAnonymousMixabilityStatus(MixerParticipant& participant,
64 bool mixable); 60 bool mixable);
65 61
(...skipping 29 matching lines...) Expand all
95 // For file recording 91 // For file recording
96 void PlayNotification(int32_t id, uint32_t durationMs); 92 void PlayNotification(int32_t id, uint32_t durationMs);
97 93
98 void RecordNotification(int32_t id, uint32_t durationMs); 94 void RecordNotification(int32_t id, uint32_t durationMs);
99 95
100 void PlayFileEnded(int32_t id); 96 void PlayFileEnded(int32_t id);
101 void RecordFileEnded(int32_t id); 97 void RecordFileEnded(int32_t id);
102 98
103 private: 99 private:
104 OutputMixer(uint32_t instanceId); 100 OutputMixer(uint32_t instanceId);
105 int InsertInbandDtmfTone();
106 101
107 // uses 102 // uses
108 Statistics* _engineStatisticsPtr; 103 Statistics* _engineStatisticsPtr;
109 AudioProcessing* _audioProcessingModulePtr; 104 AudioProcessing* _audioProcessingModulePtr;
110 105
111 rtc::CriticalSection _callbackCritSect; 106 rtc::CriticalSection _callbackCritSect;
112 // protect the _outputFileRecorderPtr and _outputFileRecording 107 // protect the _outputFileRecorderPtr and _outputFileRecording
113 rtc::CriticalSection _fileCritSect; 108 rtc::CriticalSection _fileCritSect;
114 AudioConferenceMixer& _mixerModule; 109 AudioConferenceMixer& _mixerModule;
115 AudioFrame _audioFrame; 110 AudioFrame _audioFrame;
116 // Converts mixed audio to the audio device output rate. 111 // Converts mixed audio to the audio device output rate.
117 PushResampler<int16_t> resampler_; 112 PushResampler<int16_t> resampler_;
118 // Converts mixed audio to the audio processing rate. 113 // Converts mixed audio to the audio processing rate.
119 PushResampler<int16_t> audioproc_resampler_; 114 PushResampler<int16_t> audioproc_resampler_;
120 AudioLevel _audioLevel; // measures audio level for the combined signal 115 AudioLevel _audioLevel; // measures audio level for the combined signal
121 DtmfInband _dtmfGenerator;
122 int _instanceId; 116 int _instanceId;
123 VoEMediaProcess* _externalMediaCallbackPtr; 117 VoEMediaProcess* _externalMediaCallbackPtr;
124 bool _externalMedia; 118 bool _externalMedia;
125 float _panLeft; 119 float _panLeft;
126 float _panRight; 120 float _panRight;
127 int _mixingFrequencyHz; 121 int _mixingFrequencyHz;
128 FileRecorder* _outputFileRecorderPtr; 122 FileRecorder* _outputFileRecorderPtr;
129 bool _outputFileRecording; 123 bool _outputFileRecording;
130 }; 124 };
131 125
132 } // namespace voe 126 } // namespace voe
133 127
134 } // namespace werbtc 128 } // namespace werbtc
135 129
136 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_ 130 #endif // VOICE_ENGINE_OUTPUT_MIXER_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/include/voe_errors.h ('k') | webrtc/voice_engine/output_mixer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698