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

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

Issue 229453004: Rename VideoFrame::{Get,Set}Timestamp() to {set_}timestamp(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix compile failure Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <string> 5 #include <string>
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/public/renderer/media_stream_video_sink.h" 8 #include "content/public/renderer/media_stream_video_sink.h"
9 #include "content/renderer/media/media_stream.h" 9 #include "content/renderer/media/media_stream.h"
10 #include "content/renderer/media/media_stream_registry_interface.h" 10 #include "content/renderer/media/media_stream_registry_interface.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 EXPECT_FALSE(handler_->Open(kUnknownStreamUrl, &reader)); 57 EXPECT_FALSE(handler_->Open(kUnknownStreamUrl, &reader));
58 EXPECT_TRUE(handler_->Open(kTestStreamUrl, &reader)); 58 EXPECT_TRUE(handler_->Open(kTestStreamUrl, &reader));
59 59
60 int width = 640; 60 int width = 640;
61 int height = 360; 61 int height = 360;
62 base::TimeDelta ts = base::TimeDelta::FromInternalValue(789012); 62 base::TimeDelta ts = base::TimeDelta::FromInternalValue(789012);
63 63
64 // A new frame is captured. 64 // A new frame is captured.
65 scoped_refptr<media::VideoFrame> captured_frame = 65 scoped_refptr<media::VideoFrame> captured_frame =
66 media::VideoFrame::CreateBlackFrame(gfx::Size(width, height)); 66 media::VideoFrame::CreateBlackFrame(gfx::Size(width, height));
67 captured_frame->SetTimestamp(ts); 67 captured_frame->set_timestamp(ts);
68 68
69 // The frame is delivered to VideoSourceHandler. 69 // The frame is delivered to VideoSourceHandler.
70 MediaStreamVideoSink* receiver = handler_->GetReceiver(&reader); 70 MediaStreamVideoSink* receiver = handler_->GetReceiver(&reader);
71 receiver->OnVideoFrame(captured_frame); 71 receiver->OnVideoFrame(captured_frame);
72 72
73 // Compare |frame| to |captured_frame|. 73 // Compare |frame| to |captured_frame|.
74 const media::VideoFrame* frame = reader.last_frame(); 74 const media::VideoFrame* frame = reader.last_frame();
75 ASSERT_TRUE(frame != NULL); 75 ASSERT_TRUE(frame != NULL);
76 EXPECT_EQ(width, frame->coded_size().width()); 76 EXPECT_EQ(width, frame->coded_size().width());
77 EXPECT_EQ(height, frame->coded_size().height()); 77 EXPECT_EQ(height, frame->coded_size().height());
78 EXPECT_EQ(ts, frame->GetTimestamp()); 78 EXPECT_EQ(ts, frame->timestamp());
79 EXPECT_EQ(captured_frame->data(media::VideoFrame::kYPlane), 79 EXPECT_EQ(captured_frame->data(media::VideoFrame::kYPlane),
80 frame->data(media::VideoFrame::kYPlane)); 80 frame->data(media::VideoFrame::kYPlane));
81 81
82 EXPECT_FALSE(handler_->Close(NULL)); 82 EXPECT_FALSE(handler_->Close(NULL));
83 EXPECT_TRUE(handler_->Close(&reader)); 83 EXPECT_TRUE(handler_->Close(&reader));
84 EXPECT_TRUE(handler_->GetReceiver(&reader) == NULL); 84 EXPECT_TRUE(handler_->GetReceiver(&reader) == NULL);
85 } 85 }
86 86
87 TEST_F(VideoSourceHandlerTest, OpenWithoutClose) { 87 TEST_F(VideoSourceHandlerTest, OpenWithoutClose) {
88 FakeFrameReader reader; 88 FakeFrameReader reader;
89 EXPECT_TRUE(handler_->Open(kTestStreamUrl, &reader)); 89 EXPECT_TRUE(handler_->Open(kTestStreamUrl, &reader));
90 } 90 }
91 91
92 } // namespace content 92 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_video_renderer.cc ('k') | content/renderer/media/webmediaplayer_ms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698