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

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

Issue 2799033006: Injectable audio encoders: Moved audio encoder, factory and builtin factory to api/. (Closed)
Patch Set: Created 3 years, 8 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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_CHANNEL_PROXY_H_ 11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
12 #define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
13 13
14 #include "webrtc/api/audio/audio_mixer.h" 14 #include "webrtc/api/audio/audio_mixer.h"
15 #include "webrtc/api/audio_codecs/audio_encoder.h"
15 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
16 #include "webrtc/base/race_checker.h" 17 #include "webrtc/base/race_checker.h"
17 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
18 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
19 #include "webrtc/voice_engine/channel_manager.h" 19 #include "webrtc/voice_engine/channel_manager.h"
20 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 20 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
21 21
22 #include <memory> 22 #include <memory>
23 #include <string> 23 #include <string>
24 #include <vector> 24 #include <vector>
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 class AudioSinkInterface; 28 class AudioSinkInterface;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 rtc::RaceChecker audio_thread_race_checker_; 133 rtc::RaceChecker audio_thread_race_checker_;
134 rtc::RaceChecker video_capture_thread_race_checker_; 134 rtc::RaceChecker video_capture_thread_race_checker_;
135 ChannelOwner channel_owner_; 135 ChannelOwner channel_owner_;
136 136
137 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); 137 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
138 }; 138 };
139 } // namespace voe 139 } // namespace voe
140 } // namespace webrtc 140 } // namespace webrtc
141 141
142 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 142 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW
« webrtc/media/engine/webrtcmediaengine.h ('K') | « webrtc/voice_engine/channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698