diff options
Diffstat (limited to 'voice_engine')
| -rw-r--r-- | voice_engine/utility.cc | 3 | ||||
| -rw-r--r-- | voice_engine/voice_engine.gyp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/voice_engine/utility.cc b/voice_engine/utility.cc index 561b4ef5..f952d6c5 100644 --- a/voice_engine/utility.cc +++ b/voice_engine/utility.cc @@ -22,8 +22,7 @@ namespace webrtc { namespace voe { // TODO(ajm): There is significant overlap between RemixAndResample and -// ConvertToCodecFormat, but if we're to consolidate we should probably make a -// real converter class. +// ConvertToCodecFormat. Consolidate using AudioConverter. void RemixAndResample(const AudioFrame& src_frame, PushResampler<int16_t>* resampler, AudioFrame* dst_frame) { diff --git a/voice_engine/voice_engine.gyp b/voice_engine/voice_engine.gyp index deed467a..252afde2 100644 --- a/voice_engine/voice_engine.gyp +++ b/voice_engine/voice_engine.gyp @@ -148,7 +148,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', + '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/test/test.gyp:test_support', ], @@ -216,7 +216,7 @@ '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/gflags/gflags.gyp:gflags', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', + '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/test/test.gyp:channel_transport', '<(webrtc_root)/test/test.gyp:test_support', ], |