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

Unified Diff: webrtc/voice_engine/voice_engine.gyp

Issue 2240163002: Move FilePlayer and FileRecorder to Voice Engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/voice_engine/transmit_mixer.h ('k') | webrtc/voice_engine/voice_engine_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voice_engine.gyp
diff --git a/webrtc/voice_engine/voice_engine.gyp b/webrtc/voice_engine/voice_engine.gyp
index 912b5228c1b267059d9303bb00c3fdbf5fb61fb3..336bb3a3dbfb89eb5d4992a5a1c250d48ac9f1c1 100644
--- a/webrtc/voice_engine/voice_engine.gyp
+++ b/webrtc/voice_engine/voice_engine.gyp
@@ -29,6 +29,8 @@
'<(webrtc_root)/modules/modules.gyp:webrtc_utility',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
'<(webrtc_root)/webrtc.gyp:rtc_event_log',
+ 'file_player',
+ 'file_recorder',
'level_indicator',
],
'export_dependent_settings': [
@@ -95,6 +97,38 @@
],
},
{
+ 'target_name': 'audio_coder',
+ 'type': 'static_library',
+ 'sources': [
+ 'coder.cc',
+ 'coder.h',
+ ],
+ },
+ {
+ 'target_name': 'file_player',
+ 'type': 'static_library',
+ 'sources': [
+ 'file_player.h',
+ 'file_player_impl.cc',
+ 'file_player_impl.h',
+ ],
+ 'dependencies': [
+ 'audio_coder',
+ ],
+ },
+ {
+ 'target_name': 'file_recorder',
+ 'type': 'static_library',
+ 'sources': [
+ 'file_recorder.h',
+ 'file_recorder_impl.cc',
+ 'file_recorder_impl.h',
+ ],
+ 'dependencies': [
+ 'audio_coder',
+ ],
+ },
+ {
'target_name': 'level_indicator',
'type': 'static_library',
'dependencies': [
@@ -121,6 +155,7 @@
'voice_engine',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
+ '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
# The rest are to satisfy the unittests' include chain.
# This would be unnecessary if we used qualified includes.
'<(webrtc_root)/common_audio/common_audio.gyp:common_audio',
@@ -136,6 +171,7 @@
],
'sources': [
'channel_unittest.cc',
+ 'file_player_unittests.cc',
'network_predictor_unittest.cc',
'transmit_mixer_unittest.cc',
'utility_unittest.cc',
@@ -152,6 +188,12 @@
'<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
],
}],
+ ['OS=="ios"', {
+ 'mac_bundle_resources': [
+ '<(DEPTH)/resources/utility/encapsulated_pcm16b_8khz.wav',
+ '<(DEPTH)/resources/utility/encapsulated_pcmu_8khz.wav',
+ ],
+ }],
],
},
{
« no previous file with comments | « webrtc/voice_engine/transmit_mixer.h ('k') | webrtc/voice_engine/voice_engine_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698