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

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

Issue 2145613006: Fix VideoFrame inclusion in mediastreaminterface.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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 | « no previous file | no next file » | 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 // This file contains interfaces for MediaStream, MediaTrack and MediaSource. 11 // This file contains interfaces for MediaStream, MediaTrack and MediaSource.
12 // These interfaces are used for implementing MediaStream and MediaTrack as 12 // These interfaces are used for implementing MediaStream and MediaTrack as
13 // defined in http://dev.w3.org/2011/webrtc/editor/webrtc.html#stream-api. These 13 // defined in http://dev.w3.org/2011/webrtc/editor/webrtc.html#stream-api. These
14 // interfaces must be used only with PeerConnection. PeerConnectionManager 14 // interfaces must be used only with PeerConnection. PeerConnectionManager
15 // interface provides the factory methods to create MediaStream and MediaTracks. 15 // interface provides the factory methods to create MediaStream and MediaTracks.
16 16
17 #ifndef WEBRTC_API_MEDIASTREAMINTERFACE_H_ 17 #ifndef WEBRTC_API_MEDIASTREAMINTERFACE_H_
18 #define WEBRTC_API_MEDIASTREAMINTERFACE_H_ 18 #define WEBRTC_API_MEDIASTREAMINTERFACE_H_
19 19
20 #include <string> 20 #include <string>
21 #include <vector> 21 #include <vector>
22 22
23 #include "webrtc/base/basictypes.h" 23 #include "webrtc/base/basictypes.h"
24 #include "webrtc/base/refcount.h" 24 #include "webrtc/base/refcount.h"
25 #include "webrtc/base/scoped_ref_ptr.h" 25 #include "webrtc/base/scoped_ref_ptr.h"
26 #include "webrtc/base/optional.h" 26 #include "webrtc/base/optional.h"
27 #include "webrtc/media/base/mediachannel.h" 27 #include "webrtc/media/base/mediachannel.h"
28 #include "webrtc/media/base/videoframe.h"
28 #include "webrtc/media/base/videosinkinterface.h" 29 #include "webrtc/media/base/videosinkinterface.h"
29 #include "webrtc/media/base/videosourceinterface.h" 30 #include "webrtc/media/base/videosourceinterface.h"
30 31
31 namespace cricket {
32
33 class AudioRenderer;
34 class VideoRenderer;
35 class VideoFrame;
36
37 } // namespace cricket
38
39 namespace webrtc { 32 namespace webrtc {
40 33
41 // Generic observer interface. 34 // Generic observer interface.
42 class ObserverInterface { 35 class ObserverInterface {
43 public: 36 public:
44 virtual void OnChanged() = 0; 37 virtual void OnChanged() = 0;
45 38
46 protected: 39 protected:
47 virtual ~ObserverInterface() {} 40 virtual ~ObserverInterface() {}
48 }; 41 };
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 virtual bool RemoveTrack(AudioTrackInterface* track) = 0; 266 virtual bool RemoveTrack(AudioTrackInterface* track) = 0;
274 virtual bool RemoveTrack(VideoTrackInterface* track) = 0; 267 virtual bool RemoveTrack(VideoTrackInterface* track) = 0;
275 268
276 protected: 269 protected:
277 virtual ~MediaStreamInterface() {} 270 virtual ~MediaStreamInterface() {}
278 }; 271 };
279 272
280 } // namespace webrtc 273 } // namespace webrtc
281 274
282 #endif // WEBRTC_API_MEDIASTREAMINTERFACE_H_ 275 #endif // WEBRTC_API_MEDIASTREAMINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698