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

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

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds 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
« no previous file with comments | « webrtc/api/mediastreamhandler.cc ('k') | webrtc/api/mediastreamobserver.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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 13 matching lines...) Expand all
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 // This file contains interfaces for MediaStream, MediaTrack and MediaSource. 28 // This file contains interfaces for MediaStream, MediaTrack and MediaSource.
29 // These interfaces are used for implementing MediaStream and MediaTrack as 29 // These interfaces are used for implementing MediaStream and MediaTrack as
30 // defined in http://dev.w3.org/2011/webrtc/editor/webrtc.html#stream-api. These 30 // defined in http://dev.w3.org/2011/webrtc/editor/webrtc.html#stream-api. These
31 // interfaces must be used only with PeerConnection. PeerConnectionManager 31 // interfaces must be used only with PeerConnection. PeerConnectionManager
32 // interface provides the factory methods to create MediaStream and MediaTracks. 32 // interface provides the factory methods to create MediaStream and MediaTracks.
33 33
34 #ifndef TALK_APP_WEBRTC_MEDIASTREAMINTERFACE_H_ 34 #ifndef WEBRTC_API_MEDIASTREAMINTERFACE_H_
35 #define TALK_APP_WEBRTC_MEDIASTREAMINTERFACE_H_ 35 #define WEBRTC_API_MEDIASTREAMINTERFACE_H_
36 36
37 #include <string> 37 #include <string>
38 #include <vector> 38 #include <vector>
39 39
40 #include "webrtc/base/basictypes.h" 40 #include "webrtc/base/basictypes.h"
41 #include "webrtc/base/refcount.h" 41 #include "webrtc/base/refcount.h"
42 #include "webrtc/base/scoped_ref_ptr.h" 42 #include "webrtc/base/scoped_ref_ptr.h"
43 #include "webrtc/media/base/videosinkinterface.h" 43 #include "webrtc/media/base/videosinkinterface.h"
44 44
45 namespace cricket { 45 namespace cricket {
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 virtual bool AddTrack(VideoTrackInterface* track) = 0; 286 virtual bool AddTrack(VideoTrackInterface* track) = 0;
287 virtual bool RemoveTrack(AudioTrackInterface* track) = 0; 287 virtual bool RemoveTrack(AudioTrackInterface* track) = 0;
288 virtual bool RemoveTrack(VideoTrackInterface* track) = 0; 288 virtual bool RemoveTrack(VideoTrackInterface* track) = 0;
289 289
290 protected: 290 protected:
291 virtual ~MediaStreamInterface() {} 291 virtual ~MediaStreamInterface() {}
292 }; 292 };
293 293
294 } // namespace webrtc 294 } // namespace webrtc
295 295
296 #endif // TALK_APP_WEBRTC_MEDIASTREAMINTERFACE_H_ 296 #endif // WEBRTC_API_MEDIASTREAMINTERFACE_H_
OLDNEW
« no previous file with comments | « webrtc/api/mediastreamhandler.cc ('k') | webrtc/api/mediastreamobserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698