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

Unified Diff: media/mp4/aac_unittest.cc

Issue 10795050: Fix MediaSource code so it can handle HE-AAC content that uses implicit signalling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittests 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
Index: media/mp4/aac_unittest.cc
diff --git a/media/mp4/aac_unittest.cc b/media/mp4/aac_unittest.cc
index 2f61de509b1dd85168eff0a563274612ab778416..f0225675b6d0ccb3cf9fc0f4936f6c8787d86710 100644
--- a/media/mp4/aac_unittest.cc
+++ b/media/mp4/aac_unittest.cc
@@ -18,7 +18,7 @@ TEST(AACTest, BasicProfileTest) {
data.assign(buffer, buffer + sizeof(buffer));
EXPECT_TRUE(aac.Parse(data));
- EXPECT_EQ(aac.frequency(), 44100u);
+ EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 44100);
EXPECT_EQ(aac.channel_layout(), CHANNEL_LAYOUT_STEREO);
}
@@ -30,7 +30,7 @@ TEST(AACTest, ExtensionTest) {
data.assign(buffer, buffer + sizeof(buffer));
EXPECT_TRUE(aac.Parse(data));
- EXPECT_EQ(aac.frequency(), 48000u);
+ EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 48000);
EXPECT_EQ(aac.channel_layout(), CHANNEL_LAYOUT_STEREO);
}
@@ -42,7 +42,7 @@ TEST(AACTest, SixChannelTest) {
data.assign(buffer, buffer + sizeof(buffer));
EXPECT_TRUE(aac.Parse(data));
- EXPECT_EQ(aac.frequency(), 48000u);
+ EXPECT_EQ(aac.GetOutputSamplesPerSecond(false), 48000);
EXPECT_EQ(aac.channel_layout(), CHANNEL_LAYOUT_5_1);
}
« media/mp4/aac.h ('K') | « media/mp4/aac.cc ('k') | media/mp4/mp4_stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698