Chromium Code Reviews| Index: content/renderer/media/media_stream_video_source.h |
| diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h |
| index 1b9bad51d79f6ba32cd08cd401cabe8d4fa7e3e0..8c2b4e9025c97d49232f815bfc07435866502848 100644 |
| --- a/content/renderer/media/media_stream_video_source.h |
| +++ b/content/renderer/media/media_stream_video_source.h |
| @@ -64,7 +64,7 @@ class CONTENT_EXPORT MediaStreamVideoSource |
| // interface of this class. |
| // This creates a VideoSourceInterface implementation if it does not already |
| // exist. |
| - webrtc::VideoSourceInterface* GetAdapter(); |
| + virtual webrtc::VideoSourceInterface* GetAdapter(); |
| // Constraint keys used by a video source. |
| // Specified by draft-alvestrand-constraints-resolution-00b |
| @@ -118,6 +118,15 @@ class CONTENT_EXPORT MediaStreamVideoSource |
| // method has been called, MediaStreamVideoSource may be deleted. |
| virtual void StopSourceImpl() = 0; |
| + enum State { |
| + NEW, |
| + RETRIEVING_CAPABILITIES, |
| + STARTING, |
| + STARTED, |
| + ENDED |
| + }; |
| + State GetState() const { return state_; } |
|
Jói
2014/03/17 22:00:40
Our naming conventions would typically name this m
perkj_chrome
2014/03/19 16:34:48
Done.
|
| + |
| private: |
| // Creates a webrtc::VideoSourceInterface used by libjingle. |
| void InitAdapter(); |
| @@ -138,13 +147,6 @@ class CONTENT_EXPORT MediaStreamVideoSource |
| // AddTrack match the format that was used to start the device. |
| void FinalizeAddTrack(); |
| - enum State { |
| - NEW, |
| - RETRIEVING_CAPABILITIES, |
| - STARTING, |
| - STARTED, |
| - ENDED |
| - }; |
| State state_; |
| media::VideoCaptureFormat current_format_; |