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

Fixing neteq_rtpplay

Browse Source 
A regression happened in https://codereview.webrtc.org/2006723002,
causing neteq_rtpplay not to work. The problem was that when the main
code was moved inside of the webrtc::test namespace, it was no longer
visible to the linker. Meanwhile, the dependency on test_support_main
rather than test_support caused the executable to be a gtest.

In this fix, the gyp dependencies are corrected, and a main method is
added outside of the namespaces.

NOTRY=True

Review-Url: https://codereview.webrtc.org/2018473002
Cr-Commit-Position: refs/heads/master@{#12918}
This commit is contained in:
henrik.lundin
2016-05-26 05:56:03 -07:00
committed by Commit bot
parent 73257d1b5a
commit 303d3e1782
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/audio_coding/neteq/neteq_tests.gypi
View File

@ -30,7 +30,8 @@
'type': 'executable',
'dependencies': [
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support_main',
'<(webrtc_root)/test/test.gyp:test_support',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
'rtc_event_log_source',
'neteq',
'neteq_unittest_tools',

9
webrtc/modules/audio_coding/neteq/tools/neteq_rtpplay.cc
View File

@ -368,9 +368,7 @@ size_t ReplacePayload(InputAudioFile* replacement_audio_file,
return payload_len;
}
} // namespace
int main(int argc, char* argv[]) {
int RunTest(int argc, char* argv[]) {
static const int kOutputBlockSizeMs = 10;
std::string program_name = argv[0];
@ -632,5 +630,10 @@ int main(int argc, char* argv[]) {
return 0;
}
} // namespace
} // namespace test
} // namespace webrtc
int main(int argc, char* argv[]) {
webrtc::test::RunTest(argc, argv);
}