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

Unified Diff: media/video/ffmpeg_video_decode_engine_unittest.cc

Issue 8050008: gcc 4.6 warnings cleanup (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 3 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/ffmpeg_demuxer_unittest.cc ('k') | ui/gfx/surface/accelerated_surface_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/ffmpeg_video_decode_engine_unittest.cc
diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc
index 8e171e134176be35b44e7b507c3af90fcfb0d6a9..0e9363d50874fc41efe9a1dabf6b00b276033791 100644
--- a/media/video/ffmpeg_video_decode_engine_unittest.cc
+++ b/media/video/ffmpeg_video_decode_engine_unittest.cc
@@ -176,10 +176,6 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_OpenDecoderFails) {
TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_Normal) {
Initialize();
- // We rely on FFmpeg for timestamp and duration reporting.
- const base::TimeDelta kTimestamp = base::TimeDelta::FromMicroseconds(0);
- const base::TimeDelta kDuration = base::TimeDelta::FromMicroseconds(10000);
-
// Simulate decoding a single frame.
scoped_refptr<VideoFrame> video_frame;
DecodeASingleFrame(i_frame_buffer_, &video_frame);
@@ -188,8 +184,7 @@ TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_Normal) {
// the buffer timestamp.
ASSERT_TRUE(video_frame);
EXPECT_EQ(0, video_frame->GetTimestamp().ToInternalValue());
- EXPECT_EQ(kDuration.ToInternalValue(),
- video_frame->GetDuration().ToInternalValue());
+ EXPECT_EQ(10000, video_frame->GetDuration().ToInternalValue());
}
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | ui/gfx/surface/accelerated_surface_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698