diff options
author | jyw <jyw@chromium.org> | 2015-11-24 19:20:55 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-25 03:22:57 +0000 |
commit | ad33ab7a20ddede811d0562c45a267a1b06c1ed6 (patch) | |
tree | 4177ffbb62e6a60174ff5761e7d444ad1aab184a /media/test/pipeline_integration_test.cc | |
parent | 5f8b6bcfd0170eb47ddb48206fd6181c9d01c7b9 (diff) | |
download | chromium_src-ad33ab7a20ddede811d0562c45a267a1b06c1ed6.zip chromium_src-ad33ab7a20ddede811d0562c45a267a1b06c1ed6.tar.gz chromium_src-ad33ab7a20ddede811d0562c45a267a1b06c1ed6.tar.bz2 |
Enable pcm_s32le audio decoding.
To accomodate this change, a new kSampleFormatS24 has been introduced.
It is only used with S24LE PCM input. FFmpeg treats pcm_s24le as an
encoded format that can be decoded into s32le samples; kSampleFormatS24
only exists on the Chrome side to distinguish FFmpeg's pcm_s24le from
pcm_s32le, both of which use Chrome's catch-all kCodecPCM codec and
the same real sample format.
BUG=557170,internal b/22378279
TEST=media_unittests --gtest_filter=AudioBufferTest.*
media_unittests --gtest_filter=PipelineIntegrationTest.S32PlaybackHashed
Review URL: https://codereview.chromium.org/1422113002
Cr-Commit-Position: refs/heads/master@{#361545}
Diffstat (limited to 'media/test/pipeline_integration_test.cc')
-rw-r--r-- | media/test/pipeline_integration_test.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index b19b32c..69da770 100644 --- a/media/test/pipeline_integration_test.cc +++ b/media/test/pipeline_integration_test.cc @@ -909,6 +909,14 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackLive) { demuxer_->GetTimelineOffset()); } +TEST_F(PipelineIntegrationTest, S32PlaybackHashed) { + ASSERT_EQ(PIPELINE_OK, Start("sfx_s32le.wav", kHashed)); + Play(); + ASSERT_TRUE(WaitUntilOnEnded()); + EXPECT_HASH_EQ(std::string(kNullVideoHash), GetVideoHash()); + EXPECT_HASH_EQ("3.03,2.86,2.99,3.31,3.57,4.06,", GetAudioHash()); +} + TEST_F(PipelineIntegrationTest, F32PlaybackHashed) { ASSERT_EQ(PIPELINE_OK, Start("sfx_f32le.wav", kHashed)); Play(); |