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

Side by Side Diff: webrtc/audio/audio_receive_stream.h

Issue 1706183002: Replace scoped_ptr with unique_ptr in webrtc/audio/ (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
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_AUDIO_AUDIO_RECEIVE_STREAM_H_ 11 #ifndef WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
12 #define WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ 12 #define WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
13 13
14 #include <memory>
15
14 #include "webrtc/audio_receive_stream.h" 16 #include "webrtc/audio_receive_stream.h"
15 #include "webrtc/audio_state.h" 17 #include "webrtc/audio_state.h"
16 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
17 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" 19 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
18 20
19 namespace webrtc { 21 namespace webrtc {
20 class CongestionController; 22 class CongestionController;
21 class RemoteBitrateEstimator; 23 class RemoteBitrateEstimator;
22 24
23 namespace voe { 25 namespace voe {
(...skipping 14 matching lines...) Expand all
38 void Stop() override; 40 void Stop() override;
39 void SignalNetworkState(NetworkState state) override; 41 void SignalNetworkState(NetworkState state) override;
40 bool DeliverRtcp(const uint8_t* packet, size_t length) override; 42 bool DeliverRtcp(const uint8_t* packet, size_t length) override;
41 bool DeliverRtp(const uint8_t* packet, 43 bool DeliverRtp(const uint8_t* packet,
42 size_t length, 44 size_t length,
43 const PacketTime& packet_time) override; 45 const PacketTime& packet_time) override;
44 46
45 // webrtc::AudioReceiveStream implementation. 47 // webrtc::AudioReceiveStream implementation.
46 webrtc::AudioReceiveStream::Stats GetStats() const override; 48 webrtc::AudioReceiveStream::Stats GetStats() const override;
47 49
48 void SetSink(rtc::scoped_ptr<AudioSinkInterface> sink) override; 50 void SetSink(std::unique_ptr<AudioSinkInterface> sink) override;
49 51
50 const webrtc::AudioReceiveStream::Config& config() const; 52 const webrtc::AudioReceiveStream::Config& config() const;
51 53
52 private: 54 private:
53 VoiceEngine* voice_engine() const; 55 VoiceEngine* voice_engine() const;
54 56
55 rtc::ThreadChecker thread_checker_; 57 rtc::ThreadChecker thread_checker_;
56 RemoteBitrateEstimator* remote_bitrate_estimator_ = nullptr; 58 RemoteBitrateEstimator* remote_bitrate_estimator_ = nullptr;
57 const webrtc::AudioReceiveStream::Config config_; 59 const webrtc::AudioReceiveStream::Config config_;
58 rtc::scoped_refptr<webrtc::AudioState> audio_state_; 60 rtc::scoped_refptr<webrtc::AudioState> audio_state_;
59 rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_; 61 std::unique_ptr<RtpHeaderParser> rtp_header_parser_;
60 rtc::scoped_ptr<voe::ChannelProxy> channel_proxy_; 62 std::unique_ptr<voe::ChannelProxy> channel_proxy_;
61 63
62 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream); 64 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(AudioReceiveStream);
63 }; 65 };
64 } // namespace internal 66 } // namespace internal
65 } // namespace webrtc 67 } // namespace webrtc
66 68
67 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_ 69 #endif // WEBRTC_AUDIO_AUDIO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_receive_stream.cc » ('j') | webrtc/media/engine/fakewebrtccall.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698