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

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

Issue 1684423002: Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Delete unused last_frame method and corresponding member. Created 4 years, 9 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
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_VIDEOTRACK_H_ 11 #ifndef WEBRTC_API_VIDEOTRACK_H_
12 #define WEBRTC_API_VIDEOTRACK_H_ 12 #define WEBRTC_API_VIDEOTRACK_H_
13 13
14 #include <string> 14 #include <string>
15 15
16 #include "webrtc/api/mediastreamtrack.h" 16 #include "webrtc/api/mediastreamtrack.h"
17 #include "webrtc/api/videosourceinterface.h" 17 #include "webrtc/api/videosourceinterface.h"
18 #include "webrtc/api/videotrackrenderers.h" 18 #include "webrtc/api/videotrackrenderers.h"
19 #include "webrtc/base/scoped_ref_ptr.h" 19 #include "webrtc/base/scoped_ref_ptr.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 class VideoTrack : public MediaStreamTrack<VideoTrackInterface> { 23 class VideoTrack : public MediaStreamTrack<VideoTrackInterface> {
24 public: 24 public:
25 static rtc::scoped_refptr<VideoTrack> Create( 25 static rtc::scoped_refptr<VideoTrack> Create(const std::string& label,
26 const std::string& label, VideoSourceInterface* source); 26 VideoSourceInterface* source);
27 27
28 virtual void AddRenderer(VideoRendererInterface* renderer); 28 void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
29 virtual void RemoveRenderer(VideoRendererInterface* renderer); 29 const rtc::VideoSinkWants& wants) override;
30 void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
31
30 virtual VideoSourceInterface* GetSource() const { 32 virtual VideoSourceInterface* GetSource() const {
31 return video_source_.get(); 33 return video_source_.get();
32 } 34 }
33 rtc::VideoSinkInterface<cricket::VideoFrame>* GetSink() override; 35 rtc::VideoSinkInterface<cricket::VideoFrame>* GetSink() override;
34 virtual bool set_enabled(bool enable); 36 virtual bool set_enabled(bool enable);
35 virtual std::string kind() const; 37 virtual std::string kind() const;
36 38
37 protected: 39 protected:
38 VideoTrack(const std::string& id, VideoSourceInterface* video_source); 40 VideoTrack(const std::string& id, VideoSourceInterface* video_source);
39 ~VideoTrack(); 41 ~VideoTrack();
40 42
41 private: 43 private:
42 VideoTrackRenderers renderers_; 44 VideoTrackRenderers renderers_;
43 rtc::scoped_refptr<VideoSourceInterface> video_source_; 45 rtc::scoped_refptr<VideoSourceInterface> video_source_;
44 }; 46 };
45 47
46 } // namespace webrtc 48 } // namespace webrtc
47 49
48 #endif // WEBRTC_API_VIDEOTRACK_H_ 50 #endif // WEBRTC_API_VIDEOTRACK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698