diff options
| -rw-r--r-- | media/audio/audio_util_unittest.cc | 3 | ||||
| -rw-r--r-- | media/filters/audio_renderer_base_unittest.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/media/audio/audio_util_unittest.cc b/media/audio/audio_util_unittest.cc index aa5df4c..4554f6e 100644 --- a/media/audio/audio_util_unittest.cc +++ b/media/audio/audio_util_unittest.cc @@ -119,7 +119,7 @@ TEST(AudioUtilTest, FoldChannels_s32) { // This mimics 1 second of audio at 48000 samples per second. // Running the unittest will produce timing. -TEST(AudioUtilTest, FoldChannels_s16_benchmark) { +TEST(AudioUtilTest, DISABLED_FoldChannels_s16_benchmark) { const int kBufferSize = 1024 * 6; // Test AdjustVolume() on 16 bit samples. for (int i = 0; i < 48000; ++i) { @@ -134,4 +134,5 @@ TEST(AudioUtilTest, FoldChannels_s16_benchmark) { EXPECT_EQ(true, result_s16); } } + } // namespace media diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_base_unittest.cc index e201498..cf2856b 100644 --- a/media/filters/audio_renderer_base_unittest.cc +++ b/media/filters/audio_renderer_base_unittest.cc @@ -204,7 +204,8 @@ TEST_F(AudioRendererBaseTest, OneCompleteReadCycle) { EXPECT_EQ(kMaxQueueSize, read_queue_.size()); // Fulfill the read with an end-of-stream packet. - read_queue_.front()->Run(new DataBuffer(0)); + scoped_refptr<DataBuffer> last_buffer = new DataBuffer(0); + read_queue_.front()->Run(last_buffer); delete read_queue_.front(); read_queue_.pop_front(); |