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

Unified Diff: media/filters/audio_renderer_impl_unittest.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/audio_file_reader_unittest.cc ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_renderer_impl_unittest.cc
diff --git a/media/filters/audio_renderer_impl_unittest.cc b/media/filters/audio_renderer_impl_unittest.cc
index a17c6b015b47c44016ff264d78dcc2386aeb2927..58a27dfd040b1c9e701d5a8db2320e319d75a3ba 100644
--- a/media/filters/audio_renderer_impl_unittest.cc
+++ b/media/filters/audio_renderer_impl_unittest.cc
@@ -39,8 +39,8 @@ class AudioRendererImplTest : public ::testing::Test {
SetDecryptorReadyCB())),
demuxer_stream_(new MockDemuxerStream()),
decoder_(new MockAudioDecoder()),
- audio_config_(kCodecVorbis, 16, CHANNEL_LAYOUT_STEREO,
- 44100, NULL, 0, false) {
+ audio_config_(kCodecVorbis, kSampleFormatPlanarF32,
+ CHANNEL_LAYOUT_STEREO, 44100, NULL, 0, false) {
EXPECT_CALL(*demuxer_stream_, type())
.WillRepeatedly(Return(DemuxerStream::AUDIO));
EXPECT_CALL(*demuxer_stream_, audio_decoder_config())
@@ -69,11 +69,11 @@ class AudioRendererImplTest : public ::testing::Test {
void SetSupportedAudioDecoderProperties() {
ON_CALL(*decoder_, bits_per_channel())
- .WillByDefault(Return(16));
+ .WillByDefault(Return(audio_config_.bits_per_channel()));
ON_CALL(*decoder_, channel_layout())
.WillByDefault(Return(CHANNEL_LAYOUT_MONO));
ON_CALL(*decoder_, samples_per_second())
- .WillByDefault(Return(44100));
+ .WillByDefault(Return(audio_config_.samples_per_second()));
}
void SetUnsupportedAudioDecoderProperties() {
« no previous file with comments | « media/filters/audio_file_reader_unittest.cc ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698