| Index: webrtc/modules/audio_mixer/frame_combiner_unittest.cc
|
| diff --git a/webrtc/modules/audio_mixer/frame_combiner_unittest.cc b/webrtc/modules/audio_mixer/frame_combiner_unittest.cc
|
| index 13c66012f99f27c4fd30d820e19c0166fcf3d1f6..4d2673d2c4e2026a45e5d8be34ef9d22ae73a091 100644
|
| --- a/webrtc/modules/audio_mixer/frame_combiner_unittest.cc
|
| +++ b/webrtc/modules/audio_mixer/frame_combiner_unittest.cc
|
| @@ -57,7 +57,7 @@ TEST(FrameCombiner, BasicApiCallsLimiter) {
|
| const std::vector<AudioFrame*> frames_to_combine(
|
| all_frames.begin(), all_frames.begin() + number_of_frames);
|
| combiner.Combine(frames_to_combine, number_of_channels, rate,
|
| - &audio_frame_for_mixing);
|
| + frames_to_combine.size(), &audio_frame_for_mixing);
|
| }
|
| }
|
| }
|
| @@ -79,7 +79,7 @@ TEST(FrameCombiner, BasicApiCallsNoLimiter) {
|
| const std::vector<AudioFrame*> frames_to_combine(
|
| all_frames.begin(), all_frames.begin() + number_of_frames);
|
| combiner.Combine(frames_to_combine, number_of_channels, rate,
|
| - &audio_frame_for_mixing);
|
| + frames_to_combine.size(), &audio_frame_for_mixing);
|
| }
|
| }
|
| }
|
| @@ -93,7 +93,7 @@ TEST(FrameCombiner, CombiningZeroFramesShouldProduceSilence) {
|
|
|
| const std::vector<AudioFrame*> frames_to_combine;
|
| combiner.Combine(frames_to_combine, number_of_channels, rate,
|
| - &audio_frame_for_mixing);
|
| + frames_to_combine.size(), &audio_frame_for_mixing);
|
|
|
| const std::vector<int16_t> mixed_data(
|
| audio_frame_for_mixing.data_,
|
| @@ -116,7 +116,7 @@ TEST(FrameCombiner, CombiningOneFrameShouldNotChangeFrame) {
|
| 0);
|
| const std::vector<AudioFrame*> frames_to_combine = {&frame1};
|
| combiner.Combine(frames_to_combine, number_of_channels, rate,
|
| - &audio_frame_for_mixing);
|
| + frames_to_combine.size(), &audio_frame_for_mixing);
|
|
|
| const std::vector<int16_t> mixed_data(
|
| audio_frame_for_mixing.data_,
|
|
|