diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-11-04 23:45:06 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-11-04 23:45:06 +0000 |
commit | a91b08bea4306fbc634924eab6845c96d18eae62 (patch) | |
tree | 1b6082fc976cb3b1187d72bf61897191657df8e4 /video/loopback.cc | |
parent | 8f2a7fafe87564dceb5db0a03326036e5022ee13 (diff) | |
parent | 9a8c28f10f329c5ce91e77057933e60224000627 (diff) | |
download | webrtc-a91b08bea4306fbc634924eab6845c96d18eae62.tar.gz |
Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 9a8c28f10f329c5ce91e77057933e60224000627
This commit was generated by merge_from_chromium.py.
Change-Id: If9e805f5024e1fcdd99127626811f9650e109b1d
Diffstat (limited to 'video/loopback.cc')
-rw-r--r-- | video/loopback.cc | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/video/loopback.cc b/video/loopback.cc index 4d3393e7..4b49c31e 100644 --- a/video/loopback.cc +++ b/video/loopback.cc @@ -22,13 +22,18 @@ #include "webrtc/test/direct_transport.h" #include "webrtc/test/encoder_settings.h" #include "webrtc/test/fake_encoder.h" +#include "webrtc/test/field_trial.h" #include "webrtc/test/run_loop.h" #include "webrtc/test/run_test.h" +#include "webrtc/test/testsupport/trace_to_stderr.h" #include "webrtc/test/video_capturer.h" #include "webrtc/test/video_renderer.h" #include "webrtc/typedefs.h" namespace webrtc { + +static const int kAbsSendTimeExtensionId = 7; + namespace flags { DEFINE_int32(width, 640, "Video width."); @@ -82,6 +87,16 @@ DEFINE_int32(std_propagation_delay_ms, int StdPropagationDelayMs() { return static_cast<int>(FLAGS_std_propagation_delay_ms); } + +DEFINE_bool(logs, false, "print logs to stderr"); + +DEFINE_string( + force_fieldtrials, + "", + "Field trials control experimental feature code which can be forced. " + "E.g. running with --force_fieldtrials=WebRTC-FooFeature/Enable/" + " will assign the group Enable to field trial WebRTC-FooFeature. Multiple " + "trials are separated by \"/\""); } // namespace flags static const uint32_t kSendSsrc = 0x654321; @@ -91,6 +106,10 @@ static const uint32_t kReceiverLocalSsrc = 0x123456; static const uint8_t kRtxPayloadType = 96; void Loopback() { + scoped_ptr<test::TraceToStderr> trace_to_stderr_; + if (webrtc::flags::FLAGS_logs) + trace_to_stderr_.reset(new test::TraceToStderr); + scoped_ptr<test::VideoRenderer> local_preview(test::VideoRenderer::Create( "Local Preview", flags::Width(), flags::Height())); scoped_ptr<test::VideoRenderer> loopback_video(test::VideoRenderer::Create( @@ -116,6 +135,8 @@ void Loopback() { send_config.rtp.rtx.ssrcs.push_back(kSendRtxSsrc); send_config.rtp.rtx.payload_type = kRtxPayloadType; send_config.rtp.nack.rtp_history_ms = 1000; + send_config.rtp.extensions.push_back( + RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); send_config.local_renderer = local_preview.get(); scoped_ptr<VideoEncoder> encoder; @@ -158,6 +179,8 @@ void Loopback() { receive_config.rtp.nack.rtp_history_ms = 1000; receive_config.rtp.rtx[kRtxPayloadType].ssrc = kSendRtxSsrc; receive_config.rtp.rtx[kRtxPayloadType].payload_type = kRtxPayloadType; + receive_config.rtp.extensions.push_back( + RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); receive_config.renderer = loopback_video.get(); VideoReceiveStream::Decoder decoder = test::CreateMatchingDecoder(send_config.encoder_settings); @@ -188,7 +211,8 @@ void Loopback() { int main(int argc, char* argv[]) { ::testing::InitGoogleTest(&argc, argv); google::ParseCommandLineFlags(&argc, &argv, true); - + webrtc::test::InitFieldTrialsFromString( + webrtc::flags::FLAGS_force_fieldtrials); webrtc::test::RunTest(webrtc::Loopback); return 0; } |