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

Side by Side Diff: webrtc/modules/audio_mixer/audio_mixer_impl_unittest.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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
11 #include <string.h> 11 #include <string.h>
12 12
13 #include <limits> 13 #include <limits>
14 #include <memory> 14 #include <memory>
15 #include <sstream> 15 #include <sstream>
16 #include <string> 16 #include <string>
17 #include <utility> 17 #include <utility>
18 18
19 #include "webrtc/api/audio/audio_mixer.h" 19 #include "webrtc/api/audio/audio_mixer.h"
20 #include "webrtc/base/bind.h"
21 #include "webrtc/base/checks.h"
22 #include "webrtc/base/thread.h"
20 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h" 23 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
21 #include "webrtc/modules/audio_mixer/default_output_rate_calculator.h" 24 #include "webrtc/modules/audio_mixer/default_output_rate_calculator.h"
22 #include "webrtc/rtc_base/bind.h"
23 #include "webrtc/rtc_base/checks.h"
24 #include "webrtc/rtc_base/thread.h"
25 #include "webrtc/test/gmock.h" 25 #include "webrtc/test/gmock.h"
26 26
27 using testing::_; 27 using testing::_;
28 using testing::Exactly; 28 using testing::Exactly;
29 using testing::Invoke; 29 using testing::Invoke;
30 using testing::Return; 30 using testing::Return;
31 31
32 namespace webrtc { 32 namespace webrtc {
33 33
34 namespace { 34 namespace {
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 } 531 }
532 532
533 mixer->Mix(number_of_channels, &frame_for_mixing); 533 mixer->Mix(number_of_channels, &frame_for_mixing);
534 EXPECT_EQ(rate, frame_for_mixing.sample_rate_hz_); 534 EXPECT_EQ(rate, frame_for_mixing.sample_rate_hz_);
535 EXPECT_EQ(number_of_channels, frame_for_mixing.num_channels_); 535 EXPECT_EQ(number_of_channels, frame_for_mixing.num_channels_);
536 } 536 }
537 } 537 }
538 } 538 }
539 } 539 }
540 } // namespace webrtc 540 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_mixer/audio_mixer_impl.cc ('k') | webrtc/modules/audio_mixer/frame_combiner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698