OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 if (use_mock_decoder_database_) { | 74 if (use_mock_decoder_database_) { |
75 std::unique_ptr<MockDecoderDatabase> mock(new MockDecoderDatabase); | 75 std::unique_ptr<MockDecoderDatabase> mock(new MockDecoderDatabase); |
76 mock_decoder_database_ = mock.get(); | 76 mock_decoder_database_ = mock.get(); |
77 EXPECT_CALL(*mock_decoder_database_, GetActiveCngDecoder()) | 77 EXPECT_CALL(*mock_decoder_database_, GetActiveCngDecoder()) |
78 .WillOnce(ReturnNull()); | 78 .WillOnce(ReturnNull()); |
79 deps.decoder_database = std::move(mock); | 79 deps.decoder_database = std::move(mock); |
80 } | 80 } |
81 decoder_database_ = deps.decoder_database.get(); | 81 decoder_database_ = deps.decoder_database.get(); |
82 | 82 |
83 if (use_mock_delay_peak_detector_) { | 83 if (use_mock_delay_peak_detector_) { |
84 std::unique_ptr<MockDelayPeakDetector> mock(new MockDelayPeakDetector); | 84 std::unique_ptr<MockDelayPeakDetector> mock( |
| 85 new MockDelayPeakDetector(tick_timer_)); |
85 mock_delay_peak_detector_ = mock.get(); | 86 mock_delay_peak_detector_ = mock.get(); |
86 EXPECT_CALL(*mock_delay_peak_detector_, Reset()).Times(1); | 87 EXPECT_CALL(*mock_delay_peak_detector_, Reset()).Times(1); |
87 deps.delay_peak_detector = std::move(mock); | 88 deps.delay_peak_detector = std::move(mock); |
88 } | 89 } |
89 delay_peak_detector_ = deps.delay_peak_detector.get(); | 90 delay_peak_detector_ = deps.delay_peak_detector.get(); |
90 | 91 |
91 if (use_mock_delay_manager_) { | 92 if (use_mock_delay_manager_) { |
92 std::unique_ptr<MockDelayManager> mock(new MockDelayManager( | 93 std::unique_ptr<MockDelayManager> mock(new MockDelayManager( |
93 config_.max_packets_in_buffer, delay_peak_detector_)); | 94 config_.max_packets_in_buffer, delay_peak_detector_)); |
94 mock_delay_manager_ = mock.get(); | 95 mock_delay_manager_ = mock.get(); |
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1173 UseNoMocks(); | 1174 UseNoMocks(); |
1174 CreateInstance(); | 1175 CreateInstance(); |
1175 ASSERT_TRUE(tick_timer_); | 1176 ASSERT_TRUE(tick_timer_); |
1176 EXPECT_EQ(0u, tick_timer_->ticks()); | 1177 EXPECT_EQ(0u, tick_timer_->ticks()); |
1177 AudioFrame output; | 1178 AudioFrame output; |
1178 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output)); | 1179 EXPECT_EQ(NetEq::kOK, neteq_->GetAudio(&output)); |
1179 EXPECT_EQ(1u, tick_timer_->ticks()); | 1180 EXPECT_EQ(1u, tick_timer_->ticks()); |
1180 } | 1181 } |
1181 | 1182 |
1182 }// namespace webrtc | 1183 }// namespace webrtc |
OLD | NEW |