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

Side by Side Diff: content/renderer/media/mock_media_stream_video_sink.h

Issue 1849003002: Add video frame refresh to MediaStream and VideoCapture stacks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nick's PS3 comments (moving non-observer impl out of MSVideoSink interface). Created 4 years, 8 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SINK_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SINK_H_
6 #define CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SINK_H_ 6 #define CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SINK_H_
7 7
8 #include "content/public/renderer/media_stream_video_sink.h" 8 #include "content/public/renderer/media_stream_video_sink.h"
9 9
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "content/common/media/video_capture.h" 11 #include "content/common/media/video_capture.h"
12 #include "media/base/video_frame.h" 12 #include "media/base/video_frame.h"
13 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 class MockMediaStreamVideoSink : public MediaStreamVideoSink { 17 class MockMediaStreamVideoSink : public MediaStreamVideoSink {
18 public: 18 public:
19 MockMediaStreamVideoSink(); 19 MockMediaStreamVideoSink();
20 ~MockMediaStreamVideoSink() override; 20 ~MockMediaStreamVideoSink() override;
21 21
22 void ConnectToTrack(const blink::WebMediaStreamTrack& track) {
23 MediaStreamVideoSink::ConnectToTrack(track, GetDeliverFrameCB());
24 }
25
26 void ConnectToTrackWithCallback(const blink::WebMediaStreamTrack& track,
27 const VideoCaptureDeliverFrameCB& callback) {
28 MediaStreamVideoSink::ConnectToTrack(track, callback);
29 }
30
31 void DisconnectFromTrack() {
32 MediaStreamVideoSink::DisconnectFromTrack();
33 }
34
22 void OnReadyStateChanged( 35 void OnReadyStateChanged(
23 blink::WebMediaStreamSource::ReadyState state) override; 36 blink::WebMediaStreamSource::ReadyState state) override;
24 void OnEnabledChanged(bool enabled) override; 37 void OnEnabledChanged(bool enabled) override;
25 38
26 // Triggered when OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame) 39 // Triggered when OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame)
27 // is called. 40 // is called.
28 MOCK_METHOD0(OnVideoFrame, void()); 41 MOCK_METHOD0(OnVideoFrame, void());
29 42
30 VideoCaptureDeliverFrameCB GetDeliverFrameCB(); 43 VideoCaptureDeliverFrameCB GetDeliverFrameCB();
31 44
(...skipping 14 matching lines...) Expand all
46 media::VideoPixelFormat format_; 59 media::VideoPixelFormat format_;
47 blink::WebMediaStreamSource::ReadyState state_; 60 blink::WebMediaStreamSource::ReadyState state_;
48 gfx::Size frame_size_; 61 gfx::Size frame_size_;
49 scoped_refptr<media::VideoFrame> last_frame_; 62 scoped_refptr<media::VideoFrame> last_frame_;
50 base::WeakPtrFactory<MockMediaStreamVideoSink> weak_factory_; 63 base::WeakPtrFactory<MockMediaStreamVideoSink> weak_factory_;
51 }; 64 };
52 65
53 } // namespace content 66 } // namespace content
54 67
55 #endif // CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SINK_H_ 68 #endif // CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SINK_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_video_track_unittest.cc ('k') | content/renderer/media/video_capture_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698