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

Side by Side Diff: webrtc/voice_engine/test/auto_test/standard/external_media_test.cc

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix last incorrectly wrapped pragma message Created 5 years, 1 month 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) 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
11 #include "webrtc/base/arraysize.h" 11 #include "webrtc/base/arraysize.h"
12 #include "webrtc/modules/interface/module_common_types.h" 12 #include "webrtc/modules/include/module_common_types.h"
13 #include "webrtc/voice_engine/include/voe_external_media.h" 13 #include "webrtc/voice_engine/include/voe_external_media.h"
14 #include "webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h" 14 #include "webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h"
15 #include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h" 15 #include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
16 16
17 class ExternalMediaTest : public AfterStreamingFixture { 17 class ExternalMediaTest : public AfterStreamingFixture {
18 protected: 18 protected:
19 void TestRegisterExternalMedia(int channel, webrtc::ProcessingTypes type) { 19 void TestRegisterExternalMedia(int channel, webrtc::ProcessingTypes type) {
20 FakeMediaProcess fake_media_process; 20 FakeMediaProcess fake_media_process;
21 EXPECT_EQ(0, voe_xmedia_->RegisterExternalMediaProcessing( 21 EXPECT_EQ(0, voe_xmedia_->RegisterExternalMediaProcessing(
22 channel, type, fake_media_process)); 22 channel, type, fake_media_process));
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 ResumePlaying(); 117 ResumePlaying();
118 for (size_t i = 0; i < arraysize(kInvalidFrequencies); i++) { 118 for (size_t i = 0; i < arraysize(kInvalidFrequencies); i++) {
119 int f = kInvalidFrequencies[i]; 119 int f = kInvalidFrequencies[i];
120 EXPECT_EQ(-1, voe_xmedia_->GetAudioFrame(channel_, f, &frame)) 120 EXPECT_EQ(-1, voe_xmedia_->GetAudioFrame(channel_, f, &frame))
121 << "Resampling fails for freq=" << f; 121 << "Resampling fails for freq=" << f;
122 } 122 }
123 PausePlaying(); 123 PausePlaying();
124 EXPECT_EQ(0, voe_xmedia_->SetExternalMixing(channel_, false)); 124 EXPECT_EQ(0, voe_xmedia_->SetExternalMixing(channel_, false));
125 ResumePlaying(); 125 ResumePlaying();
126 } 126 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698