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

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

Issue 1702983002: Replace scoped_ptr with unique_ptr in webrtc/voice_engine/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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_manager.cc ('k') | webrtc/voice_engine/channel_proxy.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) 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/base/thread_checker.h" 14 #include "webrtc/base/thread_checker.h"
15 #include "webrtc/voice_engine/channel_manager.h" 15 #include "webrtc/voice_engine/channel_manager.h"
16 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" 16 #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
17 17
18 #include <memory>
18 #include <string> 19 #include <string>
19 #include <vector> 20 #include <vector>
20 21
21 namespace webrtc { 22 namespace webrtc {
22 23
23 class AudioSinkInterface; 24 class AudioSinkInterface;
24 class PacketRouter; 25 class PacketRouter;
25 class RtpPacketSender; 26 class RtpPacketSender;
26 class TransportFeedbackObserver; 27 class TransportFeedbackObserver;
27 28
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 virtual CallStatistics GetRTCPStatistics() const; 63 virtual CallStatistics GetRTCPStatistics() const;
63 virtual std::vector<ReportBlock> GetRemoteRTCPReportBlocks() const; 64 virtual std::vector<ReportBlock> GetRemoteRTCPReportBlocks() const;
64 virtual NetworkStatistics GetNetworkStatistics() const; 65 virtual NetworkStatistics GetNetworkStatistics() const;
65 virtual AudioDecodingCallStats GetDecodingCallStatistics() const; 66 virtual AudioDecodingCallStats GetDecodingCallStatistics() const;
66 virtual int32_t GetSpeechOutputLevelFullRange() const; 67 virtual int32_t GetSpeechOutputLevelFullRange() const;
67 virtual uint32_t GetDelayEstimate() const; 68 virtual uint32_t GetDelayEstimate() const;
68 69
69 virtual bool SetSendTelephoneEventPayloadType(int payload_type); 70 virtual bool SetSendTelephoneEventPayloadType(int payload_type);
70 virtual bool SendTelephoneEventOutband(uint8_t event, uint32_t duration_ms); 71 virtual bool SendTelephoneEventOutband(uint8_t event, uint32_t duration_ms);
71 72
72 virtual void SetSink(rtc::scoped_ptr<AudioSinkInterface> sink); 73 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink);
73 74
74 private: 75 private:
75 Channel* channel() const; 76 Channel* channel() const;
76 77
77 rtc::ThreadChecker thread_checker_; 78 rtc::ThreadChecker thread_checker_;
78 ChannelOwner channel_owner_; 79 ChannelOwner channel_owner_;
79 }; 80 };
80 } // namespace voe 81 } // namespace voe
81 } // namespace webrtc 82 } // namespace webrtc
82 83
83 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_ 84 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_PROXY_H_
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_manager.cc ('k') | webrtc/voice_engine/channel_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698