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

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

Issue 1505253004: Support for remote audio into tracks (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Revert unwanted VoE changes Created 5 years 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/audio/audio_sink.h"
14 #include "webrtc/base/thread_checker.h" 15 #include "webrtc/base/thread_checker.h"
15 #include "webrtc/voice_engine/channel_manager.h" 16 #include "webrtc/voice_engine/channel_manager.h"
16 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 17 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
17 18
18 #include <string> 19 #include <string>
19 #include <vector> 20 #include <vector>
20 21
21 namespace webrtc { 22 namespace webrtc {
22 23
23 class PacketRouter; 24 class PacketRouter;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 virtual CallStatistics GetRTCPStatistics() const; 58 virtual CallStatistics GetRTCPStatistics() const;
58 virtual std::vector<ReportBlock> GetRemoteRTCPReportBlocks() const; 59 virtual std::vector<ReportBlock> GetRemoteRTCPReportBlocks() const;
59 virtual NetworkStatistics GetNetworkStatistics() const; 60 virtual NetworkStatistics GetNetworkStatistics() const;
60 virtual AudioDecodingCallStats GetDecodingCallStatistics() const; 61 virtual AudioDecodingCallStats GetDecodingCallStatistics() const;
61 virtual int32_t GetSpeechOutputLevelFullRange() const; 62 virtual int32_t GetSpeechOutputLevelFullRange() const;
62 virtual uint32_t GetDelayEstimate() const; 63 virtual uint32_t GetDelayEstimate() const;
63 64
64 virtual bool SetSendTelephoneEventPayloadType(int payload_type); 65 virtual bool SetSendTelephoneEventPayloadType(int payload_type);
65 virtual bool SendTelephoneEventOutband(uint8_t event, uint32_t duration_ms); 66 virtual bool SendTelephoneEventOutband(uint8_t event, uint32_t duration_ms);
66 67
68 virtual void SetSink(rtc::scoped_ptr<AudioSink> sink);
69
67 private: 70 private:
68 Channel* channel() const; 71 Channel* channel() const;
69 72
70 rtc::ThreadChecker thread_checker_; 73 rtc::ThreadChecker thread_checker_;
71 ChannelOwner channel_owner_; 74 ChannelOwner channel_owner_;
72 }; 75 };
73 } // namespace voe 76 } // namespace voe
74 } // namespace webrtc 77 } // namespace webrtc
75 78
76 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 79 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698