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

Unified Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 7461016: Replace VideoDecoder::media_format() with significantly simpler width()/height() methods. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: fixes Created 9 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/ffmpeg_video_decoder.cc ('k') | media/filters/video_renderer_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index a45a42f4b539a9cf5bc9db16ee14703c5a2aa217..7aafaacd658ade63a977348ee1ea7baad6311eba 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -257,15 +257,10 @@ TEST_F(FFmpegVideoDecoderTest, Initialize_EngineFails) {
TEST_F(FFmpegVideoDecoderTest, Initialize_Successful) {
InitializeDecoderSuccessfully();
- // Test that the output media format is an uncompressed video surface that
- // matches the dimensions specified by FFmpeg.
- const MediaFormat& media_format = decoder_->media_format();
- int width = 0;
- int height = 0;
- EXPECT_TRUE(media_format.GetAsInteger(MediaFormat::kWidth, &width));
- EXPECT_EQ(kWidth, width);
- EXPECT_TRUE(media_format.GetAsInteger(MediaFormat::kHeight, &height));
- EXPECT_EQ(kHeight, height);
+ // Test that the uncompressed video surface matches the dimensions
+ // specified by FFmpeg.
+ EXPECT_EQ(kWidth, decoder_->width());
+ EXPECT_EQ(kHeight, decoder_->height());
}
TEST_F(FFmpegVideoDecoderTest, OnError) {
« no previous file with comments | « media/filters/ffmpeg_video_decoder.cc ('k') | media/filters/video_renderer_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698