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

Side by Side Diff: webrtc/api/mediastreamprovider.h

Issue 1930463002: Replace scoped_ptr with unique_ptr in webrtc/api/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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/api/mediastream_unittest.cc ('k') | webrtc/api/peerconnection.h » ('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 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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_API_MEDIASTREAMPROVIDER_H_ 11 #ifndef WEBRTC_API_MEDIASTREAMPROVIDER_H_
12 #define WEBRTC_API_MEDIASTREAMPROVIDER_H_ 12 #define WEBRTC_API_MEDIASTREAMPROVIDER_H_
13 13
14 #include <memory>
15
14 #include "webrtc/api/rtpsenderinterface.h" 16 #include "webrtc/api/rtpsenderinterface.h"
15 #include "webrtc/base/basictypes.h" 17 #include "webrtc/base/basictypes.h"
16 #include "webrtc/base/scoped_ptr.h" 18 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/media/base/videosinkinterface.h" 19 #include "webrtc/media/base/videosinkinterface.h"
18 #include "webrtc/media/base/videosourceinterface.h" 20 #include "webrtc/media/base/videosourceinterface.h"
19 21
20 namespace cricket { 22 namespace cricket {
21 23
22 class AudioSource; 24 class AudioSource;
23 class VideoFrame; 25 class VideoFrame;
(...skipping 29 matching lines...) Expand all
53 55
54 // Sets the audio playout volume of a remote audio track with |ssrc|. 56 // Sets the audio playout volume of a remote audio track with |ssrc|.
55 // |volume| is in the range of [0, 10]. 57 // |volume| is in the range of [0, 10].
56 virtual void SetAudioPlayoutVolume(uint32_t ssrc, double volume) = 0; 58 virtual void SetAudioPlayoutVolume(uint32_t ssrc, double volume) = 0;
57 59
58 // Allows for setting a direct audio sink for an incoming audio source. 60 // Allows for setting a direct audio sink for an incoming audio source.
59 // Only one audio sink is supported per ssrc and ownership of the sink is 61 // Only one audio sink is supported per ssrc and ownership of the sink is
60 // passed to the provider. 62 // passed to the provider.
61 virtual void SetRawAudioSink( 63 virtual void SetRawAudioSink(
62 uint32_t ssrc, 64 uint32_t ssrc,
63 rtc::scoped_ptr<webrtc::AudioSinkInterface> sink) = 0; 65 std::unique_ptr<webrtc::AudioSinkInterface> sink) = 0;
64 66
65 virtual RtpParameters GetAudioRtpParameters(uint32_t ssrc) const = 0; 67 virtual RtpParameters GetAudioRtpParameters(uint32_t ssrc) const = 0;
66 virtual bool SetAudioRtpParameters(uint32_t ssrc, 68 virtual bool SetAudioRtpParameters(uint32_t ssrc,
67 const RtpParameters& parameters) = 0; 69 const RtpParameters& parameters) = 0;
68 70
69 protected: 71 protected:
70 virtual ~AudioProviderInterface() {} 72 virtual ~AudioProviderInterface() {}
71 }; 73 };
72 74
73 // This interface is called by VideoRtpSender/Receivers to change the settings 75 // This interface is called by VideoRtpSender/Receivers to change the settings
(...skipping 17 matching lines...) Expand all
91 virtual bool SetVideoRtpParameters(uint32_t ssrc, 93 virtual bool SetVideoRtpParameters(uint32_t ssrc,
92 const RtpParameters& parameters) = 0; 94 const RtpParameters& parameters) = 0;
93 95
94 protected: 96 protected:
95 virtual ~VideoProviderInterface() {} 97 virtual ~VideoProviderInterface() {}
96 }; 98 };
97 99
98 } // namespace webrtc 100 } // namespace webrtc
99 101
100 #endif // WEBRTC_API_MEDIASTREAMPROVIDER_H_ 102 #endif // WEBRTC_API_MEDIASTREAMPROVIDER_H_
OLDNEW
« no previous file with comments | « webrtc/api/mediastream_unittest.cc ('k') | webrtc/api/peerconnection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698