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

Unified Diff: content/renderer/media/webrtc/video_destination_handler_unittest.cc

Issue 631903003: Move VideoDestinationHandler processing to the IO-thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 6 years, 2 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/webrtc/video_destination_handler_unittest.cc
diff --git a/content/renderer/media/webrtc/video_destination_handler_unittest.cc b/content/renderer/media/webrtc/video_destination_handler_unittest.cc
index dc0dd8c4b0e7f7002a9d25d853db7609b57c237d..c408e10d6e5462537e72681bc0fe3e34cab6196d 100644
--- a/content/renderer/media/webrtc/video_destination_handler_unittest.cc
+++ b/content/renderer/media/webrtc/video_destination_handler_unittest.cc
@@ -57,21 +57,20 @@ class VideoDestinationHandlerTest : public PpapiUnittest {
};
TEST_F(VideoDestinationHandlerTest, Open) {
- FrameWriterInterface* frame_writer = NULL;
+ VideoDestinationHandler::FrameWriterCallback frame_writer;
+
// Unknow url will return false.
EXPECT_FALSE(VideoDestinationHandler::Open(registry_.get(),
kUnknownStreamUrl, &frame_writer));
EXPECT_TRUE(VideoDestinationHandler::Open(registry_.get(),
kTestStreamUrl, &frame_writer));
- // The |frame_writer| is a proxy and is owned by whoever call Open.
- delete frame_writer;
}
TEST_F(VideoDestinationHandlerTest, PutFrame) {
- FrameWriterInterface* frame_writer = NULL;
+ VideoDestinationHandler::FrameWriterCallback frame_writer;
EXPECT_TRUE(VideoDestinationHandler::Open(registry_.get(),
kTestStreamUrl, &frame_writer));
- ASSERT_TRUE(frame_writer);
+ ASSERT_FALSE(frame_writer.is_null());
// Verify the video track has been added.
const blink::WebMediaStream test_stream = registry_->test_stream();
@@ -86,7 +85,7 @@ TEST_F(VideoDestinationHandlerTest, PutFrame) {
MockMediaStreamVideoSink sink;
native_track->AddSink(&sink, sink.GetDeliverFrameCB());
- scoped_refptr<PPB_ImageData_Impl> image(
+ scoped_refptr<PPB_ImageData_Impl> image(
new PPB_ImageData_Impl(instance()->pp_instance(),
PPB_ImageData_Impl::ForTest()));
image->Init(PP_IMAGEDATAFORMAT_BGRA_PREMUL, 640, 360, true);
@@ -96,16 +95,11 @@ TEST_F(VideoDestinationHandlerTest, PutFrame) {
EXPECT_CALL(sink, OnVideoFrame()).WillOnce(
RunClosure(quit_closure));
- frame_writer->PutFrame(image.get(), 10);
+ frame_writer.Run(image.get(), 10);
run_loop.Run();
}
- // TODO(perkj): Verify that the track output I420 when
- // https://codereview.chromium.org/213423006/ is landed.
EXPECT_EQ(1, sink.number_of_frames());
native_track->RemoveSink(&sink);
-
- // The |frame_writer| is a proxy and is owned by whoever call Open.
- delete frame_writer;
}
} // namespace content
« no previous file with comments | « content/renderer/media/webrtc/video_destination_handler.cc ('k') | content/renderer/pepper/pepper_video_destination_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698