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

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

Issue 1790633002: Propagate MediaStreamSource state to video tracks the same way as audio. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@refactor_track
Patch Set: Fix bug with wrong enum values. 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
« no previous file with comments | « webrtc/api/rtpreceiver.cc ('k') | webrtc/api/videotrack.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 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 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/api/mediastreamtrack.h" 17 #include "webrtc/api/mediastreamtrack.h"
18 #include "webrtc/base/scoped_ref_ptr.h" 18 #include "webrtc/base/scoped_ref_ptr.h"
19 #include "webrtc/base/thread_checker.h" 19 #include "webrtc/base/thread_checker.h"
20 #include "webrtc/media/base/videosourcebase.h" 20 #include "webrtc/media/base/videosourcebase.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 class VideoTrack : public MediaStreamTrack<VideoTrackInterface>, 24 class VideoTrack : public MediaStreamTrack<VideoTrackInterface>,
25 public rtc::VideoSourceBase { 25 public rtc::VideoSourceBase,
26 public ObserverInterface {
26 public: 27 public:
27 static rtc::scoped_refptr<VideoTrack> Create( 28 static rtc::scoped_refptr<VideoTrack> Create(
28 const std::string& label, 29 const std::string& label,
29 VideoTrackSourceInterface* source); 30 VideoTrackSourceInterface* source);
30 31
31 void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink, 32 void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
32 const rtc::VideoSinkWants& wants) override; 33 const rtc::VideoSinkWants& wants) override;
33 void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override; 34 void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
34 35
35 virtual VideoTrackSourceInterface* GetSource() const { 36 virtual VideoTrackSourceInterface* GetSource() const {
36 return video_source_.get(); 37 return video_source_.get();
37 } 38 }
38 virtual bool set_enabled(bool enable); 39 virtual bool set_enabled(bool enable);
39 virtual std::string kind() const; 40 virtual std::string kind() const;
40 41
41 protected: 42 protected:
42 VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source); 43 VideoTrack(const std::string& id, VideoTrackSourceInterface* video_source);
43 ~VideoTrack(); 44 ~VideoTrack();
44 45
45 private: 46 private:
47 // Implements ObserverInterface. Observes |video_source_| state.
48 void OnChanged() override;
49
46 rtc::ThreadChecker thread_checker_; 50 rtc::ThreadChecker thread_checker_;
47 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_; 51 rtc::scoped_refptr<VideoTrackSourceInterface> video_source_;
48 }; 52 };
49 53
50 } // namespace webrtc 54 } // namespace webrtc
51 55
52 #endif // WEBRTC_API_VIDEOTRACK_H_ 56 #endif // WEBRTC_API_VIDEOTRACK_H_
OLDNEW
« no previous file with comments | « webrtc/api/rtpreceiver.cc ('k') | webrtc/api/videotrack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698