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

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

Issue 1965063003: Revert of Remove webrtc/base/scoped_ptr.h (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/localaudiosource.h ('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> 14 #include <memory>
15 15
16 #include "webrtc/api/rtpsenderinterface.h" 16 #include "webrtc/api/rtpsenderinterface.h"
17 #include "webrtc/base/basictypes.h" 17 #include "webrtc/base/basictypes.h"
18 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/media/base/videosinkinterface.h" 19 #include "webrtc/media/base/videosinkinterface.h"
19 #include "webrtc/media/base/videosourceinterface.h" 20 #include "webrtc/media/base/videosourceinterface.h"
20 21
21 namespace cricket { 22 namespace cricket {
22 23
23 class AudioSource; 24 class AudioSource;
24 class VideoFrame; 25 class VideoFrame;
25 struct AudioOptions; 26 struct AudioOptions;
26 struct VideoOptions; 27 struct VideoOptions;
27 28
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 virtual bool SetVideoRtpParameters(uint32_t ssrc, 93 virtual bool SetVideoRtpParameters(uint32_t ssrc,
93 const RtpParameters& parameters) = 0; 94 const RtpParameters& parameters) = 0;
94 95
95 protected: 96 protected:
96 virtual ~VideoProviderInterface() {} 97 virtual ~VideoProviderInterface() {}
97 }; 98 };
98 99
99 } // namespace webrtc 100 } // namespace webrtc
100 101
101 #endif // WEBRTC_API_MEDIASTREAMPROVIDER_H_ 102 #endif // WEBRTC_API_MEDIASTREAMPROVIDER_H_
OLDNEW
« no previous file with comments | « webrtc/api/localaudiosource.h ('k') | webrtc/api/peerconnection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698