| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/renderers/audio_renderer_impl.h" | 5 #include "media/renderers/audio_renderer_impl.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 ConfigureDecoder(); | 146 ConfigureDecoder(); |
| 147 ScopedVector<AudioDecoder> decoders; | 147 ScopedVector<AudioDecoder> decoders; |
| 148 decoders.push_back(decoder_); | 148 decoders.push_back(decoder_); |
| 149 renderer_.reset(new AudioRendererImpl(message_loop_.task_runner(), | 149 renderer_.reset(new AudioRendererImpl(message_loop_.task_runner(), |
| 150 sink_.get(), std::move(decoders), | 150 sink_.get(), std::move(decoders), |
| 151 new MediaLog())); | 151 new MediaLog())); |
| 152 testing::Mock::VerifyAndClearExpectations(&demuxer_stream_); | 152 testing::Mock::VerifyAndClearExpectations(&demuxer_stream_); |
| 153 ConfigureDemuxerStream(true); | 153 ConfigureDemuxerStream(true); |
| 154 } | 154 } |
| 155 | 155 |
| 156 // Reconfigures a demuxer stream using a given config. |
| 157 void ConfigureChangeDemuxerStream(const AudioDecoderConfig& audio_config) { |
| 158 demuxer_stream_.set_audio_decoder_config(audio_config); |
| 159 ConfigureDecoder(); |
| 160 ConfigureDemuxerStream(true); |
| 161 } |
| 162 |
| 156 void ExpectUnsupportedAudioDecoder() { | 163 void ExpectUnsupportedAudioDecoder() { |
| 157 EXPECT_CALL(*decoder_, Initialize(_, _, _, _)) | 164 EXPECT_CALL(*decoder_, Initialize(_, _, _, _)) |
| 158 .WillOnce(DoAll(SaveArg<3>(&output_cb_), RunCallback<2>(false))); | 165 .WillOnce(DoAll(SaveArg<3>(&output_cb_), RunCallback<2>(false))); |
| 159 } | 166 } |
| 160 | 167 |
| 161 // RendererClient implementation. | 168 // RendererClient implementation. |
| 162 MOCK_METHOD1(OnError, void(PipelineStatus)); | 169 MOCK_METHOD1(OnError, void(PipelineStatus)); |
| 163 void OnEnded() override { | 170 void OnEnded() override { |
| 164 CHECK(!ended_); | 171 CHECK(!ended_); |
| 165 ended_ = true; | 172 ended_ = true; |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 641 DeliverBuffer(DecodeStatus::OK, buffer); | 648 DeliverBuffer(DecodeStatus::OK, buffer); |
| 642 | 649 |
| 643 // All channels should now be enabled. | 650 // All channels should now be enabled. |
| 644 mask = channel_mask(); | 651 mask = channel_mask(); |
| 645 EXPECT_FALSE(mask.empty()); | 652 EXPECT_FALSE(mask.empty()); |
| 646 ASSERT_EQ(mask.size(), static_cast<size_t>(hw_params.channels())); | 653 ASSERT_EQ(mask.size(), static_cast<size_t>(hw_params.channels())); |
| 647 for (int ch = 0; ch < hw_params.channels(); ++ch) | 654 for (int ch = 0; ch < hw_params.channels(); ++ch) |
| 648 ASSERT_TRUE(mask[ch]); | 655 ASSERT_TRUE(mask[ch]); |
| 649 } | 656 } |
| 650 | 657 |
| 658 // Verify that the proper channel mask is configured when downmixing is applied |
| 659 // to the input with discrete layout. The default hardware layout is stereo. |
| 660 TEST_F(AudioRendererImplTest, ChannelMask_DownmixDiscreteLayout) { |
| 661 int audio_channels = 9; |
| 662 |
| 663 AudioDecoderConfig audio_config( |
| 664 kCodecOpus, kSampleFormat, CHANNEL_LAYOUT_DISCRETE, |
| 665 kInputSamplesPerSecond, EmptyExtraData(), Unencrypted()); |
| 666 audio_config.SetChannelsForDiscrete(audio_channels); |
| 667 ConfigureChangeDemuxerStream(audio_config); |
| 668 |
| 669 // Renderer supports discrete layout only if the sink_ is a web audio source |
| 670 // with discrete layout as well. |
| 671 AudioParameters sink_params(AudioParameters::AUDIO_PCM_LOW_LATENCY, |
| 672 CHANNEL_LAYOUT_DISCRETE, kOutputSamplesPerSecond, |
| 673 SampleFormatToBytesPerChannel(kSampleFormat) * 8, |
| 674 1024); |
| 675 sink_params.set_channels_for_discrete(audio_channels); |
| 676 ConfigureBasicRenderer(sink_params); |
| 677 sink_->GetOutputDeviceInfo().SetIsWebAudioSource(true); |
| 678 |
| 679 Initialize(); |
| 680 std::vector<bool> mask = channel_mask(); |
| 681 EXPECT_FALSE(mask.empty()); |
| 682 ASSERT_EQ(mask.size(), static_cast<size_t>(audio_channels)); |
| 683 for (int ch = 0; ch < audio_channels; ++ch) |
| 684 ASSERT_TRUE(mask[ch]); |
| 685 } |
| 686 |
| 651 TEST_F(AudioRendererImplTest, Underflow_Flush) { | 687 TEST_F(AudioRendererImplTest, Underflow_Flush) { |
| 652 Initialize(); | 688 Initialize(); |
| 653 Preroll(); | 689 Preroll(); |
| 654 StartTicking(); | 690 StartTicking(); |
| 655 | 691 |
| 656 // Force underflow. | 692 // Force underflow. |
| 657 EXPECT_TRUE(ConsumeBufferedData(frames_buffered())); | 693 EXPECT_TRUE(ConsumeBufferedData(frames_buffered())); |
| 658 WaitForPendingRead(); | 694 WaitForPendingRead(); |
| 659 EXPECT_CALL(*this, OnBufferingStateChange(BUFFERING_HAVE_NOTHING)); | 695 EXPECT_CALL(*this, OnBufferingStateChange(BUFFERING_HAVE_NOTHING)); |
| 660 EXPECT_FALSE(ConsumeBufferedData(OutputFrames(1))); | 696 EXPECT_FALSE(ConsumeBufferedData(OutputFrames(1))); |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1063 // Advance far enough that we shouldn't be clamped to current time (tested | 1099 // Advance far enough that we shouldn't be clamped to current time (tested |
| 1064 // already above). | 1100 // already above). |
| 1065 tick_clock_->Advance(kOneSecond); | 1101 tick_clock_->Advance(kOneSecond); |
| 1066 EXPECT_EQ( | 1102 EXPECT_EQ( |
| 1067 current_time + timestamp_helper.GetFrameDuration(frames_to_consume.value), | 1103 current_time + timestamp_helper.GetFrameDuration(frames_to_consume.value), |
| 1068 CurrentMediaWallClockTime(&is_time_moving)); | 1104 CurrentMediaWallClockTime(&is_time_moving)); |
| 1069 EXPECT_TRUE(is_time_moving); | 1105 EXPECT_TRUE(is_time_moving); |
| 1070 } | 1106 } |
| 1071 | 1107 |
| 1072 } // namespace media | 1108 } // namespace media |
| OLD | NEW |