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

Side by Side Diff: content/renderer/media/media_stream_video_capture_source_unittest.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix media/base/callback_holder.h compile Created 5 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 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/bind_to_current_loop.h"
6 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
7 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 9 #include "base/run_loop.h"
9 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
10 #include "content/child/child_process.h" 11 #include "content/child/child_process.h"
11 #include "content/public/renderer/media_stream_video_sink.h" 12 #include "content/public/renderer/media_stream_video_sink.h"
12 #include "content/renderer/media/media_stream_video_capturer_source.h" 13 #include "content/renderer/media/media_stream_video_capturer_source.h"
13 #include "content/renderer/media/media_stream_video_track.h" 14 #include "content/renderer/media/media_stream_video_track.h"
14 #include "content/renderer/media/mock_media_constraint_factory.h" 15 #include "content/renderer/media/mock_media_constraint_factory.h"
15 #include "media/base/bind_to_current_loop.h"
16 #include "testing/gmock/include/gmock/gmock.h" 16 #include "testing/gmock/include/gmock/gmock.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 #include "third_party/WebKit/public/web/WebHeap.h" 18 #include "third_party/WebKit/public/web/WebHeap.h"
19 19
20 namespace content { 20 namespace content {
21 21
22 class MockVideoCapturerDelegate : public VideoCapturerDelegate { 22 class MockVideoCapturerDelegate : public VideoCapturerDelegate {
23 public: 23 public:
24 explicit MockVideoCapturerDelegate(const StreamDeviceInfo& device_info) 24 explicit MockVideoCapturerDelegate(const StreamDeviceInfo& device_info)
25 : VideoCapturerDelegate(device_info) {} 25 : VideoCapturerDelegate(device_info) {}
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 running_cb.Run(true); 216 running_cb.Run(true);
217 217
218 base::RunLoop run_loop; 218 base::RunLoop run_loop;
219 base::TimeTicks reference_capture_time = 219 base::TimeTicks reference_capture_time =
220 base::TimeTicks::FromInternalValue(60013); 220 base::TimeTicks::FromInternalValue(60013);
221 base::TimeTicks capture_time; 221 base::TimeTicks capture_time;
222 media::VideoFrameMetadata metadata; 222 media::VideoFrameMetadata metadata;
223 FakeMediaStreamVideoSink fake_sink( 223 FakeMediaStreamVideoSink fake_sink(
224 &capture_time, 224 &capture_time,
225 &metadata, 225 &metadata,
226 media::BindToCurrentLoop(run_loop.QuitClosure())); 226 base::BindToCurrentLoop(run_loop.QuitClosure()));
227 FakeMediaStreamVideoSink::AddToVideoTrack( 227 FakeMediaStreamVideoSink::AddToVideoTrack(
228 &fake_sink, 228 &fake_sink,
229 base::Bind(&FakeMediaStreamVideoSink::OnVideoFrame, 229 base::Bind(&FakeMediaStreamVideoSink::OnVideoFrame,
230 base::Unretained(&fake_sink)), 230 base::Unretained(&fake_sink)),
231 track); 231 track);
232 const scoped_refptr<media::VideoFrame> frame = 232 const scoped_refptr<media::VideoFrame> frame =
233 media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2)); 233 media::VideoFrame::CreateBlackFrame(gfx::Size(2, 2));
234 frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE, 30.0); 234 frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE, 30.0);
235 child_process_->io_message_loop()->PostTask( 235 child_process_->io_message_loop()->PostTask(
236 FROM_HERE, base::Bind(deliver_frame_cb, frame, reference_capture_time)); 236 FROM_HERE, base::Bind(deliver_frame_cb, frame, reference_capture_time));
237 run_loop.Run(); 237 run_loop.Run();
238 FakeMediaStreamVideoSink::RemoveFromVideoTrack(&fake_sink, track); 238 FakeMediaStreamVideoSink::RemoveFromVideoTrack(&fake_sink, track);
239 EXPECT_EQ(reference_capture_time, capture_time); 239 EXPECT_EQ(reference_capture_time, capture_time);
240 double metadata_value; 240 double metadata_value;
241 EXPECT_TRUE(metadata.GetDouble(media::VideoFrameMetadata::FRAME_RATE, 241 EXPECT_TRUE(metadata.GetDouble(media::VideoFrameMetadata::FRAME_RATE,
242 &metadata_value)); 242 &metadata_value));
243 EXPECT_EQ(30.0, metadata_value); 243 EXPECT_EQ(30.0, metadata_value);
244 } 244 }
245 245
246 } // namespace content 246 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/media_stream_video_capturer_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698