diff options
| author | pbos@webrtc.org <pbos@webrtc.org> | 2015-02-09 10:16:33 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org> | 2015-02-09 10:17:12 +0000 |
| commit | 8cf9bdb3fad92fd783b32152e912859d8b399c97 (patch) | |
| tree | f447a1afaf7d41ea1cd5c42848c8ede7c293468c /talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc | |
| parent | 2b69eab0776b2aa45183bc011982fbb282052bc7 (diff) | |
| download | webrtc-8cf9bdb3fad92fd783b32152e912859d8b399c97.tar.gz | |
Remove USE_WEBRTC_DEV_BRANCH.
talk/ and webrtc/ are hosted in the same repository and it no longer
makes sense to support building talk/ without the corresponding webrtc/
catalog.
R=bjornv@webrtc.org, juberti@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/39849004
Cr-Commit-Position: refs/heads/master@{#8291}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8291 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc')
| -rw-r--r-- | talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc b/talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc index f9c9ea7298..8fcbfd7012 100644 --- a/talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc +++ b/talk/app/webrtc/test/fakeaudiocapturemodule_unittest.cc @@ -85,11 +85,7 @@ class FakeAdmTest : public testing::Test, const uint32_t samplesPerSec, void* audioSamples, uint32_t& nSamplesOut, -#ifdef USE_WEBRTC_DEV_BRANCH int64_t* elapsed_time_ms, -#else - uint32_t* rtp_timestamp, -#endif int64_t* ntp_time_ms) { ++pull_iterations_; const uint32_t audio_buffer_size = nSamples * nBytesPerSample; @@ -97,11 +93,7 @@ class FakeAdmTest : public testing::Test, CopyFromRecBuffer(audioSamples, audio_buffer_size): GenerateZeroBuffer(audioSamples, audio_buffer_size); nSamplesOut = bytes_out / nBytesPerSample; -#ifdef USE_WEBRTC_DEV_BRANCH *elapsed_time_ms = 0; -#else - *rtp_timestamp = 0; -#endif *ntp_time_ms = 0; return 0; } |