Skip to content

Commit

Permalink
Remove VoEFile and things it uses.
Browse files Browse the repository at this point in the history
BUG=webrtc:4690

Review-Url: https://codereview.webrtc.org/3013033002
Cr-Commit-Position: refs/heads/master@{#19885}
  • Loading branch information
solenberg authored and Commit Bot committed Sep 18, 2017
1 parent 2352ce3 commit b63310a
Show file tree
Hide file tree
Showing 22 changed files with 5 additions and 3,749 deletions.
49 changes: 0 additions & 49 deletions test/mock_voice_engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,55 +134,6 @@ class MockVoiceEngine : public VoiceEngineImpl {
MOCK_METHOD2(SetOpusMaxPlaybackRate, int(int channel, int frequency_hz));
MOCK_METHOD2(SetOpusDtx, int(int channel, bool enable_dtx));

// VoEFile
MOCK_METHOD7(StartPlayingFileLocally,
int(int channel,
const char fileNameUTF8[1024],
bool loop,
FileFormats format,
float volumeScaling,
int startPointMs,
int stopPointMs));
MOCK_METHOD6(StartPlayingFileLocally,
int(int channel,
InStream* stream,
FileFormats format,
float volumeScaling,
int startPointMs,
int stopPointMs));
MOCK_METHOD1(StopPlayingFileLocally, int(int channel));
MOCK_METHOD1(IsPlayingFileLocally, int(int channel));
MOCK_METHOD6(StartPlayingFileAsMicrophone,
int(int channel,
const char fileNameUTF8[1024],
bool loop,
bool mixWithMicrophone,
FileFormats format,
float volumeScaling));
MOCK_METHOD5(StartPlayingFileAsMicrophone,
int(int channel,
InStream* stream,
bool mixWithMicrophone,
FileFormats format,
float volumeScaling));
MOCK_METHOD1(StopPlayingFileAsMicrophone, int(int channel));
MOCK_METHOD1(IsPlayingFileAsMicrophone, int(int channel));
MOCK_METHOD4(StartRecordingPlayout,
int(int channel,
const char* fileNameUTF8,
CodecInst* compression,
int maxSizeBytes));
MOCK_METHOD1(StopRecordingPlayout, int(int channel));
MOCK_METHOD3(StartRecordingPlayout,
int(int channel, OutStream* stream, CodecInst* compression));
MOCK_METHOD3(StartRecordingMicrophone,
int(const char* fileNameUTF8,
CodecInst* compression,
int maxSizeBytes));
MOCK_METHOD2(StartRecordingMicrophone,
int(OutStream* stream, CodecInst* compression));
MOCK_METHOD0(StopRecordingMicrophone, int());

// VoENetwork
MOCK_METHOD2(RegisterExternalTransport,
int(int channel, Transport& transport));
Expand Down
70 changes: 0 additions & 70 deletions voice_engine/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -8,69 +8,6 @@

import("../webrtc.gni")

rtc_static_library("audio_coder") {
sources = [
"coder.cc",
"coder.h",
]
deps = [
"..:webrtc_common",
"../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory",
"../modules:module_api",
"../modules/audio_coding",
"../modules/audio_coding:audio_format_conversion",
"../modules/audio_coding:rent_a_codec",
]

if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}

rtc_static_library("file_player") {
sources = [
"file_player.cc",
"file_player.h",
]
deps = [
":audio_coder",
"..:webrtc_common",
"../common_audio",
"../modules:module_api",
"../modules/media_file",
"../rtc_base:rtc_base_approved",
]

if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}

rtc_static_library("file_recorder") {
sources = [
"file_recorder.cc",
"file_recorder.h",
]
deps = [
":audio_coder",
"..:webrtc_common",
"../audio/utility:audio_frame_operations",
"../common_audio",
"../modules:module_api",
"../modules/media_file:media_file",
"../rtc_base:rtc_base_approved",
"../system_wrappers",
]

if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
}

rtc_static_library("voice_engine") {
sources = [
"channel.cc",
Expand All @@ -82,7 +19,6 @@ rtc_static_library("voice_engine") {
"include/voe_base.h",
"include/voe_codec.h",
"include/voe_errors.h",
"include/voe_file.h",
"include/voe_network.h",
"include/voe_rtp_rtcp.h",
"monitor_module.h",
Expand All @@ -102,8 +38,6 @@ rtc_static_library("voice_engine") {
"voe_base_impl.h",
"voe_codec_impl.cc",
"voe_codec_impl.h",
"voe_file_impl.cc",
"voe_file_impl.h",
"voe_network_impl.cc",
"voe_network_impl.h",
"voe_rtp_rtcp_impl.cc",
Expand Down Expand Up @@ -132,8 +66,6 @@ rtc_static_library("voice_engine") {
]
deps = [
":audio_level",
":file_player",
":file_recorder",
"..:webrtc_common",
"../api:array_view",
"../api:audio_mixer_api",
Expand Down Expand Up @@ -182,7 +114,6 @@ rtc_static_library("audio_level") {
if (rtc_include_tests) {
rtc_test("voice_engine_unittests") {
deps = [
":file_player",
":voice_engine",
"../common_audio",
"../modules:module_api",
Expand Down Expand Up @@ -211,7 +142,6 @@ if (rtc_include_tests) {

sources = [
"channel_unittest.cc",
"file_player_unittests.cc",
"transport_feedback_packet_loss_tracker_unittest.cc",
"utility_unittest.cc",
"voe_base_unittest.cc",
Expand Down
Loading

0 comments on commit b63310a

Please sign in to comment.