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

Unified Diff: media/filters/video_renderer_base_unittest.cc

Issue 10832087: Remove VideoDecoderConfig.frame_rate_xxx() & VideoFrame:Get/SetDuration() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address more CR comments. Created 8 years, 5 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
« no previous file with comments | « media/filters/video_renderer_base.cc ('k') | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/video_renderer_base_unittest.cc
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc
index 2add437ebaf1fafd6936da45decde183ab5e1525..9b38dfad0221fc0c54e7a0b2bd45980e5abfc7ff 100644
--- a/media/filters/video_renderer_base_unittest.cc
+++ b/media/filters/video_renderer_base_unittest.cc
@@ -197,7 +197,7 @@ class VideoRendererBaseTest : public ::testing::Test {
if (timestamp == kEndOfStream) {
read_cb.Run(VideoDecoder::kOk, VideoFrame::CreateEmptyFrame());
} else {
- read_cb.Run(VideoDecoder::kOk, CreateFrame(timestamp, kFrameDuration));
+ read_cb.Run(VideoDecoder::kOk, CreateFrame(timestamp));
}
}
@@ -250,13 +250,12 @@ class VideoRendererBaseTest : public ::testing::Test {
event_.Reset();
}
- // Creates a frame with given timestamp and duration.
- scoped_refptr<VideoFrame> CreateFrame(int64 timestamp, int64 duration) {
+ // Creates a frame with given timestamp.
+ scoped_refptr<VideoFrame> CreateFrame(int64 timestamp) {
scoped_refptr<VideoFrame> frame =
VideoFrame::CreateFrame(VideoFrame::RGB32, kNaturalSize.width(),
kNaturalSize.height(),
- base::TimeDelta::FromMicroseconds(timestamp),
- base::TimeDelta::FromMicroseconds(duration));
+ base::TimeDelta::FromMicroseconds(timestamp));
return frame;
}
@@ -369,7 +368,7 @@ class VideoRendererBaseTest : public ::testing::Test {
read_cb.Run(VideoDecoder::kOk, VideoFrame::CreateEmptyFrame());
} else {
read_cb.Run(VideoDecoder::kOk,
- CreateFrame(i * kFrameDuration, kFrameDuration));
+ CreateFrame(i * kFrameDuration));
i++;
}
} else {
@@ -442,7 +441,7 @@ TEST_F(VideoRendererBaseTest, EndOfStream) {
// Finish rendering the last frame, we should NOT get a new frame but instead
// get notified of end of stream.
DeliverFrame(kEndOfStream);
- RenderLastFrame(kFrameDuration * limits::kMaxVideoFrames);
+ RenderLastFrame(kVideoDuration);
Shutdown();
}
« no previous file with comments | « media/filters/video_renderer_base.cc ('k') | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698