Chromium Code Reviews Chromium Code Reviews
Issue 2221443002:
Changed mixing api and removed resampler (Closed)
Base URL: https://chromium.googlesource.com/external/webrtc.git@master| OLD | NEW |
|---|---|
| 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 25 matching lines...) Expand all Loading... | |
| 36 public: | 36 public: |
| 37 static int32_t Create(AudioMixer*& mixer, uint32_t instanceId); // NOLINT | 37 static int32_t Create(AudioMixer*& mixer, uint32_t instanceId); // NOLINT |
| 38 | 38 |
| 39 static void Destroy(AudioMixer*& mixer); // NOLINT | 39 static void Destroy(AudioMixer*& mixer); // NOLINT |
| 40 | 40 |
| 41 int32_t SetEngineInformation(Statistics& engineStatistics); // NOLINT | 41 int32_t SetEngineInformation(Statistics& engineStatistics); // NOLINT |
| 42 | 42 |
| 43 int32_t SetAudioProcessingModule(AudioProcessing* audioProcessingModule); | 43 int32_t SetAudioProcessingModule(AudioProcessing* audioProcessingModule); |
| 44 | 44 |
| 45 // VoEExternalMedia | 45 // VoEExternalMedia |
| 46 int RegisterExternalMediaProcessing(VoEMediaProcess& // NOLINT | 46 int RegisterExternalMediaProcessing(VoEMediaProcess& // NOLINT |
|
the sun
2016/08/05 12:26:00
Do you plan to clean out all this gunk before hook
aleloi
2016/08/05 12:37:14
Yes, I want to remove this file completely. The on
| |
| 47 proccess_object); | 47 proccess_object); |
| 48 | 48 |
| 49 int DeRegisterExternalMediaProcessing(); | 49 int DeRegisterExternalMediaProcessing(); |
| 50 | 50 |
| 51 int32_t MixActiveChannels(); | |
|
aleloi
2016/08/05 09:52:21
This file is the former 'OutputMixer'. Parts of it
| |
| 52 | |
| 53 int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm); | 51 int32_t DoOperationsOnCombinedSignal(bool feed_data_to_apm); |
| 54 | 52 |
| 55 int32_t SetMixabilityStatus(MixerAudioSource& audio_source, // NOLINT | 53 int32_t SetMixabilityStatus(MixerAudioSource& audio_source, // NOLINT |
| 56 bool mixable); | 54 bool mixable); |
| 57 | 55 |
| 58 int32_t SetAnonymousMixabilityStatus( | 56 int32_t SetAnonymousMixabilityStatus( |
| 59 MixerAudioSource& audio_source, // NOLINT | 57 MixerAudioSource& audio_source, // NOLINT |
| 60 bool mixable); | 58 bool mixable); |
| 61 | 59 |
| 62 int GetMixedAudio(int sample_rate_hz, | 60 int GetMixedAudio(int sample_rate_hz, |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 93 | 91 |
| 94 // uses | 92 // uses |
| 95 Statistics* _engineStatisticsPtr; | 93 Statistics* _engineStatisticsPtr; |
| 96 AudioProcessing* _audioProcessingModulePtr; | 94 AudioProcessing* _audioProcessingModulePtr; |
| 97 | 95 |
| 98 rtc::CriticalSection _callbackCritSect; | 96 rtc::CriticalSection _callbackCritSect; |
| 99 // protect the _outputFileRecorderPtr and _outputFileRecording | 97 // protect the _outputFileRecorderPtr and _outputFileRecording |
| 100 rtc::CriticalSection _fileCritSect; | 98 rtc::CriticalSection _fileCritSect; |
| 101 NewAudioConferenceMixer& _mixerModule; | 99 NewAudioConferenceMixer& _mixerModule; |
| 102 AudioFrame _audioFrame; | 100 AudioFrame _audioFrame; |
| 103 // Converts mixed audio to the audio device output rate. | |
|
aleloi
2016/08/05 09:52:21
Moved to NewAudioConferenceMixer.
| |
| 104 PushResampler<int16_t> resampler_; | |
| 105 // Converts mixed audio to the audio processing rate. | 101 // Converts mixed audio to the audio processing rate. |
| 106 PushResampler<int16_t> audioproc_resampler_; | 102 PushResampler<int16_t> audioproc_resampler_; |
| 107 AudioLevel _audioLevel; // measures audio level for the combined signal | 103 AudioLevel _audioLevel; // measures audio level for the combined signal |
| 108 int _instanceId; | 104 int _instanceId; |
| 109 VoEMediaProcess* _externalMediaCallbackPtr; | 105 VoEMediaProcess* _externalMediaCallbackPtr; |
| 110 bool _externalMedia; | 106 bool _externalMedia; |
| 111 float _panLeft; | 107 float _panLeft; |
| 112 float _panRight; | 108 float _panRight; |
| 113 int _mixingFrequencyHz; | 109 int _mixingFrequencyHz; |
| 114 FileRecorder* _outputFileRecorderPtr; | 110 FileRecorder* _outputFileRecorderPtr; |
| 115 bool _outputFileRecording; | 111 bool _outputFileRecording; |
| 116 }; | 112 }; |
| 117 | 113 |
| 118 } // namespace voe | 114 } // namespace voe |
| 119 | 115 |
| 120 } // namespace webrtc | 116 } // namespace webrtc |
| 121 | 117 |
| 122 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ | 118 #endif // WEBRTC_MODULES_AUDIO_MIXER_AUDIO_MIXER_H_ |
| OLD | NEW |
