ff761fba82
This changes the following module directories:
* webrtc/modules/audio_conference_mixer/interface
* webrtc/modules/interface
* webrtc/modules/media_file/interface
* webrtc/modules/rtp_rtcp/interface
* webrtc/modules/utility/interface
To avoid breaking downstream, I followed this recipe:
1. Copy the interface dir to a new sibling directory: include
2. Update the header guards in the include directory to match the style guide.
3. Update the header guards in the interface directory to match the ones in include. This is required to avoid getting redefinitions in the not-yet-updated downstream code.
4. Add a pragma warning in the header files in the interface dir. Example:
#pragma message("WARNING: webrtc/modules/interface is DEPRECATED; "
"use webrtc/modules/include")
5. Search for all source references to webrtc/modules/interface and update them to webrtc/modules/include (*.c*,*.h,*.mm,*.S)
6. Update all GYP+GN files. This required manual inspection since many subdirectories of webrtc/modules referenced the interface dir using ../interface etc(*.gyp*,*.gn*)
BUG=5095
TESTED=Passing compile-trybots with --clobber flag:
git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel -m tryserver.webrtc
R=stefan@webrtc.org, tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1417683006 .
Cr-Commit-Position: refs/heads/master@{#10500}
77 lines
2.4 KiB
C++
77 lines
2.4 KiB
C++
/*
|
|
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/modules/audio_processing/audio_processing_impl.h"
|
|
|
|
#include "testing/gmock/include/gmock/gmock.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
#include "webrtc/config.h"
|
|
#include "webrtc/modules/audio_processing/test/test_utils.h"
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
|
|
using ::testing::Invoke;
|
|
using ::testing::Return;
|
|
|
|
namespace webrtc {
|
|
|
|
class MockInitialize : public AudioProcessingImpl {
|
|
public:
|
|
explicit MockInitialize(const Config& config) : AudioProcessingImpl(config) {
|
|
}
|
|
|
|
MOCK_METHOD0(InitializeLocked, int());
|
|
int RealInitializeLocked() NO_THREAD_SAFETY_ANALYSIS {
|
|
return AudioProcessingImpl::InitializeLocked();
|
|
}
|
|
};
|
|
|
|
TEST(AudioProcessingImplTest, AudioParameterChangeTriggersInit) {
|
|
Config config;
|
|
MockInitialize mock(config);
|
|
ON_CALL(mock, InitializeLocked())
|
|
.WillByDefault(Invoke(&mock, &MockInitialize::RealInitializeLocked));
|
|
|
|
EXPECT_CALL(mock, InitializeLocked()).Times(1);
|
|
mock.Initialize();
|
|
|
|
AudioFrame frame;
|
|
// Call with the default parameters; there should be no init.
|
|
frame.num_channels_ = 1;
|
|
SetFrameSampleRate(&frame, 16000);
|
|
EXPECT_CALL(mock, InitializeLocked())
|
|
.Times(0);
|
|
EXPECT_NOERR(mock.ProcessStream(&frame));
|
|
EXPECT_NOERR(mock.AnalyzeReverseStream(&frame));
|
|
|
|
// New sample rate. (Only impacts ProcessStream).
|
|
SetFrameSampleRate(&frame, 32000);
|
|
EXPECT_CALL(mock, InitializeLocked())
|
|
.Times(1);
|
|
EXPECT_NOERR(mock.ProcessStream(&frame));
|
|
|
|
// New number of channels.
|
|
frame.num_channels_ = 2;
|
|
EXPECT_CALL(mock, InitializeLocked())
|
|
.Times(2);
|
|
EXPECT_NOERR(mock.ProcessStream(&frame));
|
|
// ProcessStream sets num_channels_ == num_output_channels.
|
|
frame.num_channels_ = 2;
|
|
EXPECT_NOERR(mock.AnalyzeReverseStream(&frame));
|
|
|
|
// A new sample rate passed to AnalyzeReverseStream should be an error and
|
|
// not cause an init.
|
|
SetFrameSampleRate(&frame, 16000);
|
|
EXPECT_CALL(mock, InitializeLocked())
|
|
.Times(0);
|
|
EXPECT_EQ(mock.kBadSampleRateError, mock.AnalyzeReverseStream(&frame));
|
|
}
|
|
|
|
} // namespace webrtc
|