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

Side by Side Diff: voice_engine/voe_base_impl.h

Issue 3015553002: Remove voe::OutputMixer and AudioConferenceMixer. (Closed)
Patch Set: remove conference mixer from presubmit.py Created 3 years, 2 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 | « voice_engine/shared_data.cc ('k') | voice_engine/voe_base_impl.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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 int32_t RecordedDataIsAvailable(const void* audio_data, 55 int32_t RecordedDataIsAvailable(const void* audio_data,
56 const size_t number_of_frames, 56 const size_t number_of_frames,
57 const size_t bytes_per_sample, 57 const size_t bytes_per_sample,
58 const size_t number_of_channels, 58 const size_t number_of_channels,
59 const uint32_t sample_rate, 59 const uint32_t sample_rate,
60 const uint32_t audio_delay_milliseconds, 60 const uint32_t audio_delay_milliseconds,
61 const int32_t clock_drift, 61 const int32_t clock_drift,
62 const uint32_t volume, 62 const uint32_t volume,
63 const bool key_pressed, 63 const bool key_pressed,
64 uint32_t& new_mic_volume) override; 64 uint32_t& new_mic_volume) override;
65 int32_t NeedMorePlayData(const size_t nSamples, 65 RTC_DEPRECATED int32_t NeedMorePlayData(const size_t nSamples,
66 const size_t nBytesPerSample, 66 const size_t nBytesPerSample,
67 const size_t nChannels, 67 const size_t nChannels,
68 const uint32_t samplesPerSec, 68 const uint32_t samplesPerSec,
69 void* audioSamples, 69 void* audioSamples,
70 size_t& nSamplesOut, 70 size_t& nSamplesOut,
71 int64_t* elapsed_time_ms, 71 int64_t* elapsed_time_ms,
72 int64_t* ntp_time_ms) override; 72 int64_t* ntp_time_ms) override;
73 void PushCaptureData(int voe_channel, 73 void PushCaptureData(int voe_channel,
74 const void* audio_data, 74 const void* audio_data,
75 int bits_per_sample, 75 int bits_per_sample,
76 int sample_rate, 76 int sample_rate,
77 size_t number_of_channels, 77 size_t number_of_channels,
78 size_t number_of_frames) override; 78 size_t number_of_frames) override;
79 void PullRenderData(int bits_per_sample, 79 RTC_DEPRECATED void PullRenderData(int bits_per_sample,
80 int sample_rate, 80 int sample_rate,
81 size_t number_of_channels, 81 size_t number_of_channels,
82 size_t number_of_frames, 82 size_t number_of_frames,
83 void* audio_data, 83 void* audio_data,
84 int64_t* elapsed_time_ms, 84 int64_t* elapsed_time_ms,
85 int64_t* ntp_time_ms) override; 85 int64_t* ntp_time_ms) override;
86 86
87 // AudioDeviceObserver 87 // AudioDeviceObserver
88 void OnErrorIsReported(const ErrorCode error) override; 88 void OnErrorIsReported(const ErrorCode error) override;
89 void OnWarningIsReported(const WarningCode warning) override; 89 void OnWarningIsReported(const WarningCode warning) override;
90 90
91 protected: 91 protected:
92 VoEBaseImpl(voe::SharedData* shared); 92 VoEBaseImpl(voe::SharedData* shared);
93 ~VoEBaseImpl() override; 93 ~VoEBaseImpl() override;
94 94
95 private: 95 private:
(...skipping 15 matching lines...) Expand all
111 rtc::CriticalSection callbackCritSect_; 111 rtc::CriticalSection callbackCritSect_;
112 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 112 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
113 113
114 AudioFrame audioFrame_; 114 AudioFrame audioFrame_;
115 voe::SharedData* shared_; 115 voe::SharedData* shared_;
116 }; 116 };
117 117
118 } // namespace webrtc 118 } // namespace webrtc
119 119
120 #endif // VOICE_ENGINE_VOE_BASE_IMPL_H_ 120 #endif // VOICE_ENGINE_VOE_BASE_IMPL_H_
OLDNEW
« no previous file with comments | « voice_engine/shared_data.cc ('k') | voice_engine/voe_base_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698