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

Side by Side Diff: webrtc/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_RECEIVE_STREAM_H_ 11 #ifndef WEBRTC_AUDIO_RECEIVE_STREAM_H_
12 #define WEBRTC_AUDIO_RECEIVE_STREAM_H_ 12 #define WEBRTC_AUDIO_RECEIVE_STREAM_H_
13 13
14 #include <map> 14 #include <map>
15 #include <memory>
15 #include <string> 16 #include <string>
16 #include <vector> 17 #include <vector>
17 18
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/config.h" 19 #include "webrtc/config.h"
20 #include "webrtc/stream.h" 20 #include "webrtc/stream.h"
21 #include "webrtc/transport.h" 21 #include "webrtc/transport.h"
22 #include "webrtc/typedefs.h" 22 #include "webrtc/typedefs.h"
23 23
24 namespace webrtc { 24 namespace webrtc {
25 25
26 class AudioDecoder; 26 class AudioDecoder;
27 class AudioSinkInterface; 27 class AudioSinkInterface;
28 28
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 virtual Stats GetStats() const = 0; 107 virtual Stats GetStats() const = 0;
108 108
109 // Sets an audio sink that receives unmixed audio from the receive stream. 109 // Sets an audio sink that receives unmixed audio from the receive stream.
110 // Ownership of the sink is passed to the stream and can be used by the 110 // Ownership of the sink is passed to the stream and can be used by the
111 // caller to do lifetime management (i.e. when the sink's dtor is called). 111 // caller to do lifetime management (i.e. when the sink's dtor is called).
112 // Only one sink can be set and passing a null sink clears an existing one. 112 // Only one sink can be set and passing a null sink clears an existing one.
113 // NOTE: Audio must still somehow be pulled through AudioTransport for audio 113 // NOTE: Audio must still somehow be pulled through AudioTransport for audio
114 // to stream through this sink. In practice, this happens if mixed audio 114 // to stream through this sink. In practice, this happens if mixed audio
115 // is being pulled+rendered and/or if audio is being pulled for the purposes 115 // is being pulled+rendered and/or if audio is being pulled for the purposes
116 // of feeding to the AEC. 116 // of feeding to the AEC.
117 virtual void SetSink(rtc::scoped_ptr<AudioSinkInterface> sink) = 0; 117 virtual void SetSink(std::unique_ptr<AudioSinkInterface> sink) = 0;
118 }; 118 };
119 } // namespace webrtc 119 } // namespace webrtc
120 120
121 #endif // WEBRTC_AUDIO_RECEIVE_STREAM_H_ 121 #endif // WEBRTC_AUDIO_RECEIVE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698