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

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

Issue 2622263002: Delete deprecated and transitional stuff related to video frame refactoring. (Closed)
Patch Set: Fix include order. Add dependency in api/video_codecs/BUILD.gn. Created 3 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 | « no previous file | webrtc/api/video/i420_buffer.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 // 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 <stddef.h> 20 #include <stddef.h>
21 21
22 #include <string> 22 #include <string>
23 #include <vector> 23 #include <vector>
24 24
25 #include "webrtc/api/video/video_frame.h" 25 #include "webrtc/api/video/video_frame.h"
26 // TODO(nisse): Transition hack, Chrome expects that including this
27 // file declares I420Buffer. Delete after users of I420Buffer are
28 // fixed to include the new header.
29 #include "webrtc/api/video/i420_buffer.h"
30 #include "webrtc/base/refcount.h" 26 #include "webrtc/base/refcount.h"
31 #include "webrtc/base/scoped_ref_ptr.h" 27 #include "webrtc/base/scoped_ref_ptr.h"
32 #include "webrtc/base/optional.h" 28 #include "webrtc/base/optional.h"
33 #include "webrtc/media/base/mediachannel.h" 29 #include "webrtc/media/base/mediachannel.h"
34 #include "webrtc/media/base/videosinkinterface.h" 30 #include "webrtc/media/base/videosinkinterface.h"
35 #include "webrtc/media/base/videosourceinterface.h" 31 #include "webrtc/media/base/videosourceinterface.h"
36 32
37 namespace webrtc { 33 namespace webrtc {
38 34
39 // Generic observer interface. 35 // Generic observer interface.
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 virtual bool RemoveTrack(AudioTrackInterface* track) = 0; 297 virtual bool RemoveTrack(AudioTrackInterface* track) = 0;
302 virtual bool RemoveTrack(VideoTrackInterface* track) = 0; 298 virtual bool RemoveTrack(VideoTrackInterface* track) = 0;
303 299
304 protected: 300 protected:
305 virtual ~MediaStreamInterface() {} 301 virtual ~MediaStreamInterface() {}
306 }; 302 };
307 303
308 } // namespace webrtc 304 } // namespace webrtc
309 305
310 #endif // WEBRTC_API_MEDIASTREAMINTERFACE_H_ 306 #endif // WEBRTC_API_MEDIASTREAMINTERFACE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/video/i420_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698