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

Unified Diff: media/filters/pipeline_integration_test.cc

Issue 11280301: Roll FFMpeg for M26. Fix ffmpeg float audio decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix hash checks on windows. Created 8 years 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: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 088d991cac98b4bfb44b777271028cee039184e0..8337afeb1d3c52b8afd0ef8c5baf412306e338c3 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/string_util.h"
+#include "build/build_config.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decryptor_client.h"
#include "media/base/test_data_util.h"
@@ -292,7 +293,15 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
ASSERT_TRUE(WaitUntilOnEnded());
EXPECT_EQ(GetVideoHash(), "f0be120a90a811506777c99a2cdf7cc1");
- EXPECT_EQ(GetAudioHash(), "5699a4415b620e45b9d0aae531c9df76");
+
+ // Windows produces slightly different results due to differences in floating
+ // point functions (e.g. sin(), cos(), etc).
+#if defined(OS_WIN)
+ static const char* kExpectedAudioHash = "1c139e31a7a9e9a8978291ca35215e8f";
+#else
+ static const char* kExpectedAudioHash = "8d66c511a726827b2572e247bf6c02da";
+#endif
+ EXPECT_EQ(GetAudioHash(), kExpectedAudioHash);
}
TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {

Powered by Google App Engine
This is Rietveld 408576698