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

Side by Side Diff: webrtc/media/base/videosourcebase.h

Issue 2383093002: Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: objc: Add missing include of video_frame_buffer.h. Created 4 years, 1 month 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/media/base/videocapturer.cc ('k') | webrtc/media/base/videosourcebase.cc » ('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 (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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_MEDIA_BASE_VIDEOSOURCEBASE_H_ 11 #ifndef WEBRTC_MEDIA_BASE_VIDEOSOURCEBASE_H_
12 #define WEBRTC_MEDIA_BASE_VIDEOSOURCEBASE_H_ 12 #define WEBRTC_MEDIA_BASE_VIDEOSOURCEBASE_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/thread_checker.h" 16 #include "webrtc/base/thread_checker.h"
17 #include "webrtc/media/base/videoframe.h"
18 #include "webrtc/media/base/videosourceinterface.h" 17 #include "webrtc/media/base/videosourceinterface.h"
18 #include "webrtc/video_frame.h"
19 19
20 namespace rtc { 20 namespace rtc {
21 21
22 // VideoSourceBase is not thread safe. 22 // VideoSourceBase is not thread safe.
23 class VideoSourceBase : public VideoSourceInterface<cricket::VideoFrame> { 23 class VideoSourceBase : public VideoSourceInterface<webrtc::VideoFrame> {
24 public: 24 public:
25 VideoSourceBase(); 25 VideoSourceBase();
26 void AddOrUpdateSink(VideoSinkInterface<cricket::VideoFrame>* sink, 26 void AddOrUpdateSink(VideoSinkInterface<webrtc::VideoFrame>* sink,
27 const VideoSinkWants& wants) override; 27 const VideoSinkWants& wants) override;
28 void RemoveSink(VideoSinkInterface<cricket::VideoFrame>* sink) override; 28 void RemoveSink(VideoSinkInterface<webrtc::VideoFrame>* sink) override;
29 29
30 protected: 30 protected:
31 struct SinkPair { 31 struct SinkPair {
32 SinkPair(VideoSinkInterface<cricket::VideoFrame>* sink, 32 SinkPair(VideoSinkInterface<webrtc::VideoFrame>* sink, VideoSinkWants wants)
33 VideoSinkWants wants)
34 : sink(sink), wants(wants) {} 33 : sink(sink), wants(wants) {}
35 VideoSinkInterface<cricket::VideoFrame>* sink; 34 VideoSinkInterface<webrtc::VideoFrame>* sink;
36 VideoSinkWants wants; 35 VideoSinkWants wants;
37 }; 36 };
38 SinkPair* FindSinkPair(const VideoSinkInterface<cricket::VideoFrame>* sink); 37 SinkPair* FindSinkPair(const VideoSinkInterface<webrtc::VideoFrame>* sink);
39 38
40 const std::vector<SinkPair>& sink_pairs() const { return sinks_; } 39 const std::vector<SinkPair>& sink_pairs() const { return sinks_; }
41 ThreadChecker thread_checker_; 40 ThreadChecker thread_checker_;
42 41
43 private: 42 private:
44 std::vector<SinkPair> sinks_; 43 std::vector<SinkPair> sinks_;
45 }; 44 };
46 45
47 } // namespace rtc 46 } // namespace rtc
48 47
49 #endif // WEBRTC_MEDIA_BASE_VIDEOSOURCEBASE_H_ 48 #endif // WEBRTC_MEDIA_BASE_VIDEOSOURCEBASE_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/videocapturer.cc ('k') | webrtc/media/base/videosourcebase.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698