zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audio_coding: remove "main" directory

Browse Source 
This is the last piece of the old directory layout of the modules.

Duplicated header files are left in audio_coding/main/include until
downstream code is updated to the new location. They have pragma
warnings added to them and identical header guards as the new headers to avoid breaking things.

BUG=webrtc: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 --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc
NOTRY=True
NOPRESUBMIT=True

Review URL: https://codereview.webrtc.org/1481493004

Cr-Commit-Position: refs/heads/master@{#10803}
This commit is contained in:
kjellander
2015-11-26 04:44:54 -08:00
committed by Commit bot
parent a3c20bb9a0
commit 3e6db2321c
85 changed files with 1276 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
webrtc/modules/audio_coding/acm2/codec_manager_unittest.cc Normal file
View File

@ -0,0 +1,66 @@
/*
* Copyright (c) 2015 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 "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h"
#include "webrtc/modules/audio_coding/acm2/codec_manager.h"
namespace webrtc {
namespace acm2 {
using ::testing::Return;
namespace {
// Create a MockAudioEncoder with some reasonable default behavior.
rtc::scoped_ptr<MockAudioEncoder> CreateMockEncoder() {
auto enc = rtc_make_scoped_ptr(new MockAudioEncoder);
EXPECT_CALL(*enc, SampleRateHz()).WillRepeatedly(Return(8000));
EXPECT_CALL(*enc, NumChannels()).WillRepeatedly(Return(1));
EXPECT_CALL(*enc, Max10MsFramesInAPacket()).WillRepeatedly(Return(1));
EXPECT_CALL(*enc, Die());
return enc;
}
} // namespace
TEST(CodecManagerTest, ExternalEncoderFec) {
auto enc0 = CreateMockEncoder();
auto enc1 = CreateMockEncoder();
{
::testing::InSequence s;
EXPECT_CALL(*enc0, SetFec(false)).WillOnce(Return(true));
EXPECT_CALL(*enc0, Mark("A"));
EXPECT_CALL(*enc0, SetFec(true)).WillOnce(Return(true));
EXPECT_CALL(*enc1, SetFec(true)).WillOnce(Return(true));
EXPECT_CALL(*enc1, SetFec(false)).WillOnce(Return(true));
EXPECT_CALL(*enc0, Mark("B"));
EXPECT_CALL(*enc0, SetFec(false)).WillOnce(Return(true));
}
CodecManager cm;
EXPECT_FALSE(cm.codec_fec_enabled());
cm.RegisterEncoder(enc0.get());
EXPECT_FALSE(cm.codec_fec_enabled());
enc0->Mark("A");
EXPECT_EQ(0, cm.SetCodecFEC(true));
EXPECT_TRUE(cm.codec_fec_enabled());
cm.RegisterEncoder(enc1.get());
EXPECT_TRUE(cm.codec_fec_enabled());
EXPECT_EQ(0, cm.SetCodecFEC(false));
enc0->Mark("B");
EXPECT_FALSE(cm.codec_fec_enabled());
cm.RegisterEncoder(enc0.get());
EXPECT_FALSE(cm.codec_fec_enabled());
}
} // namespace acm2
} // namespace webrtc