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

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

Issue 1993783002: Moved CreateBuiltinDecoderFactory out to VoEBaseImpl. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-2
Patch Set: Rebass! How low can you go? Created 4 years, 6 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 11 matching lines...) Expand all
22 class ProcessThread; 22 class ProcessThread;
23 23
24 class VoEBaseImpl : public VoEBase, 24 class VoEBaseImpl : public VoEBase,
25 public AudioTransport, 25 public AudioTransport,
26 public AudioDeviceObserver { 26 public AudioDeviceObserver {
27 public: 27 public:
28 int RegisterVoiceEngineObserver(VoiceEngineObserver& observer) override; 28 int RegisterVoiceEngineObserver(VoiceEngineObserver& observer) override;
29 int DeRegisterVoiceEngineObserver() override; 29 int DeRegisterVoiceEngineObserver() override;
30 30
31 int Init(AudioDeviceModule* external_adm = nullptr, 31 int Init(AudioDeviceModule* external_adm = nullptr,
32 AudioProcessing* audioproc = nullptr) override; 32 AudioProcessing* audioproc = nullptr,
33 const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory =
34 nullptr) override;
33 AudioProcessing* audio_processing() override { 35 AudioProcessing* audio_processing() override {
34 return shared_->audio_processing(); 36 return shared_->audio_processing();
35 } 37 }
36 AudioDeviceModule* audio_device_module() override { 38 AudioDeviceModule* audio_device_module() override {
37 return shared_->audio_device(); 39 return shared_->audio_device();
38 } 40 }
39 int Terminate() override; 41 int Terminate() override;
40 42
41 int CreateChannel() override; 43 int CreateChannel() override;
42 int CreateChannel(const Config& config) override; 44 int CreateChannel(const Config& config) override;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 void GetPlayoutData(int sample_rate, size_t number_of_channels, 138 void GetPlayoutData(int sample_rate, size_t number_of_channels,
137 size_t number_of_frames, bool feed_data_to_apm, 139 size_t number_of_frames, bool feed_data_to_apm,
138 void* audio_data, int64_t* elapsed_time_ms, 140 void* audio_data, int64_t* elapsed_time_ms,
139 int64_t* ntp_time_ms); 141 int64_t* ntp_time_ms);
140 142
141 // Initialize channel by setting Engine Information then initializing 143 // Initialize channel by setting Engine Information then initializing
142 // channel. 144 // channel.
143 int InitializeChannel(voe::ChannelOwner* channel_owner); 145 int InitializeChannel(voe::ChannelOwner* channel_owner);
144 VoiceEngineObserver* voiceEngineObserverPtr_; 146 VoiceEngineObserver* voiceEngineObserverPtr_;
145 rtc::CriticalSection callbackCritSect_; 147 rtc::CriticalSection callbackCritSect_;
148 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
146 149
147 AudioFrame audioFrame_; 150 AudioFrame audioFrame_;
148 voe::SharedData* shared_; 151 voe::SharedData* shared_;
149 }; 152 };
150 153
151 } // namespace webrtc 154 } // namespace webrtc
152 155
153 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H 156 #endif // WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698