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

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: ... rebase Created 7 years, 12 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') | 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/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index e196d588ea4efe126147386571266eaf065a8f06..dddc0652473c23e6adb0af94de4d8786a8ea6f47 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/test_data_util.h"
#include "media/crypto/aes_decryptor.h"
@@ -298,7 +299,10 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
ASSERT_TRUE(WaitUntilOnEnded());
EXPECT_EQ(GetVideoHash(), "f0be120a90a811506777c99a2cdf7cc1");
- EXPECT_EQ(GetAudioHash(), "5699a4415b620e45b9d0aae531c9df76");
+
+ // TODO(dalecurtis): Audio decoded in float does not have a consistent hash
+ // across platforms. Fix this: http://crbug.com/168204
+ // EXPECT_EQ(GetAudioHash(), "");
}
TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698