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

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: More backwards-compatibility! Created 3 years, 7 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/channel.h ('k') | no next file » | 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) 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/api/rtpreceiverinterface.h" 16 #include "webrtc/api/rtpreceiverinterface.h"
16 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/race_checker.h" 18 #include "webrtc/base/race_checker.h"
18 #include "webrtc/base/thread_checker.h" 19 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
20 #include "webrtc/voice_engine/channel_manager.h" 20 #include "webrtc/voice_engine/channel_manager.h"
21 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 21 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
22 22
23 #include <memory> 23 #include <memory>
24 #include <string> 24 #include <string>
25 #include <vector> 25 #include <vector>
26 26
27 namespace webrtc { 27 namespace webrtc {
28 28
29 class AudioSinkInterface; 29 class AudioSinkInterface;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 rtc::RaceChecker audio_thread_race_checker_; 135 rtc::RaceChecker audio_thread_race_checker_;
136 rtc::RaceChecker video_capture_thread_race_checker_; 136 rtc::RaceChecker video_capture_thread_race_checker_;
137 ChannelOwner channel_owner_; 137 ChannelOwner channel_owner_;
138 138
139 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy); 139 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelProxy);
140 }; 140 };
141 } // namespace voe 141 } // namespace voe
142 } // namespace webrtc 142 } // namespace webrtc
143 143
144 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 144 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698