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

Unified Diff: content/renderer/media/media_stream_video_capturer_source_unittest.cc

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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_stream_video_capturer_source_unittest.cc
diff --git a/content/renderer/media/media_stream_video_capturer_source_unittest.cc b/content/renderer/media/media_stream_video_capturer_source_unittest.cc
index fe24e66fbd6f4bd37de2f70afd68899e271e4f7e..d631ced672db247e5a1c548a34ef0eafc60be5a1 100644
--- a/content/renderer/media/media_stream_video_capturer_source_unittest.cc
+++ b/content/renderer/media/media_stream_video_capturer_source_unittest.cc
@@ -335,6 +335,17 @@ class FakeMediaStreamVideoSink : public MediaStreamVideoSink {
metadata_(metadata),
got_frame_cb_(got_frame_cb) {}
+ void ConnectToTrack(const blink::WebMediaStreamTrack& track) {
+ MediaStreamVideoSink::ConnectToTrack(
+ track,
+ base::Bind(&FakeMediaStreamVideoSink::OnVideoFrame,
+ base::Unretained(this)));
+ }
+
+ void DisconnectFromTrack() {
+ MediaStreamVideoSink::DisconnectFromTrack();
+ }
+
void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame,
base::TimeTicks capture_time) {
*capture_time_ = capture_time;
@@ -377,17 +388,14 @@ TEST_F(MediaStreamVideoCapturerSourceTest, CaptureTimeAndMetadataPlumbing) {
FakeMediaStreamVideoSink fake_sink(
&capture_time, &metadata,
media::BindToCurrentLoop(run_loop.QuitClosure()));
- FakeMediaStreamVideoSink::AddToVideoTrack(
- &fake_sink, base::Bind(&FakeMediaStreamVideoSink::OnVideoFrame,
- base::Unretained(&fake_sink)),
- track);
+ fake_sink.ConnectToTrack(track);
const scoped_refptr<media::VideoFrame> frame =
media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2));
frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE, 30.0);
child_process_->io_task_runner()->PostTask(
FROM_HERE, base::Bind(deliver_frame_cb, frame, reference_capture_time));
run_loop.Run();
- FakeMediaStreamVideoSink::RemoveFromVideoTrack(&fake_sink, track);
+ fake_sink.DisconnectFromTrack();
EXPECT_EQ(reference_capture_time, capture_time);
double metadata_value;
EXPECT_TRUE(metadata.GetDouble(media::VideoFrameMetadata::FRAME_RATE,

Powered by Google App Engine
This is Rietveld 408576698