diff options
author | Chih-hung Hsieh <chh@google.com> | 2016-01-20 17:50:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-01-20 17:50:13 +0000 |
commit | b3cb8ab4ede8bb77f0bdef2715efc2c1e6267072 (patch) | |
tree | 28c4cf735dd5bd9cc8f1ccd06fff8a173b20d1cb /webrtc/modules/video_coding/timing_unittest.cc | |
parent | a4acd9d6bc9b3b033d7d274316e75ee067df8d20 (diff) | |
parent | 9a337512d97e37afc142dee4fd50a41b741a87d2 (diff) | |
download | webrtc-0ac3512cfc0bde910d47e8e244c87e260f52adc2.tar.gz |
Merge "Merge upstream SHA 04cb763"android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release
am: 9a337512d9
* commit '9a337512d97e37afc142dee4fd50a41b741a87d2': (797 commits)
Add tests for verifying transport feedback for audio and video.
Eliminate defines in talk/
Revert of Update with new default boringssl no-aes cipher suites. Re-enable tests. (patchset #3 id:40001 of https://codereview.webrtc.org/1550773002/ )
Remove assert which was incorrectly added to TcpPort::OnSentPacket.
Reland Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
Update with new default boringssl no-aes cipher suites. Re-enable tests.
Revert of Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket. (patchset #3 id:40001 of https://codereview.webrtc.org/1577873003/ )
Re-land: "Use an explicit identifier in Config"
Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
Revert of Delete remnants of non-square pixel support from cricket::VideoFrame. (patchset #1 id:1 of https://codereview.webrtc.org/1586613002/ )
Remove libfuzzer trybot from default trybot set.
Add ramp-up tests for transport sequence number with and w/o audio.
Delete remnants of non-square pixel support from cricket::VideoFrame.
Fix IPAddress::ToSensitiveString() to avoid dependency on inet_ntop().
Revert of Storing raw audio sink for default audio track. (patchset #7 id:120001 of https://codereview.chromium.org/1551813002/ )
Re-enable tests that failed under Linux_Msan.
Revert of Use an explicit identifier in Config (patchset #4 id:60001 of https://codereview.webrtc.org/1538643004/ )
Roll chromium_revision 346fea9..099be58 (369082:369139)
Disable WebRtcVideoChannel2BaseTest.SendManyResizeOnce for TSan
Add build_protobuf variable.
...
Diffstat (limited to 'webrtc/modules/video_coding/timing_unittest.cc')
-rw-r--r-- | webrtc/modules/video_coding/timing_unittest.cc | 149 |
1 files changed, 149 insertions, 0 deletions
diff --git a/webrtc/modules/video_coding/timing_unittest.cc b/webrtc/modules/video_coding/timing_unittest.cc new file mode 100644 index 0000000000..2e8df83683 --- /dev/null +++ b/webrtc/modules/video_coding/timing_unittest.cc @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + +#include <math.h> +#include <stdio.h> +#include <stdlib.h> + +#include "testing/gtest/include/gtest/gtest.h" + +#include "webrtc/modules/video_coding/include/video_coding.h" +#include "webrtc/modules/video_coding/internal_defines.h" +#include "webrtc/modules/video_coding/timing.h" +#include "webrtc/modules/video_coding/test/test_util.h" +#include "webrtc/system_wrappers/include/clock.h" +#include "webrtc/system_wrappers/include/trace.h" +#include "webrtc/test/testsupport/fileutils.h" + +namespace webrtc { + +TEST(ReceiverTiming, Tests) { + SimulatedClock clock(0); + VCMTiming timing(&clock); + uint32_t waitTime = 0; + uint32_t jitterDelayMs = 0; + uint32_t maxDecodeTimeMs = 0; + uint32_t timeStamp = 0; + + timing.Reset(); + + timing.UpdateCurrentDelay(timeStamp); + + timing.Reset(); + + timing.IncomingTimestamp(timeStamp, clock.TimeInMilliseconds()); + jitterDelayMs = 20; + timing.SetJitterDelay(jitterDelayMs); + timing.UpdateCurrentDelay(timeStamp); + timing.set_render_delay(0); + waitTime = timing.MaxWaitingTime( + timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds()), + clock.TimeInMilliseconds()); + // First update initializes the render time. Since we have no decode delay + // we get waitTime = renderTime - now - renderDelay = jitter. + EXPECT_EQ(jitterDelayMs, waitTime); + + jitterDelayMs += VCMTiming::kDelayMaxChangeMsPerS + 10; + timeStamp += 90000; + clock.AdvanceTimeMilliseconds(1000); + timing.SetJitterDelay(jitterDelayMs); + timing.UpdateCurrentDelay(timeStamp); + waitTime = timing.MaxWaitingTime( + timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds()), + clock.TimeInMilliseconds()); + // Since we gradually increase the delay we only get 100 ms every second. + EXPECT_EQ(jitterDelayMs - 10, waitTime); + + timeStamp += 90000; + clock.AdvanceTimeMilliseconds(1000); + timing.UpdateCurrentDelay(timeStamp); + waitTime = timing.MaxWaitingTime( + timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds()), + clock.TimeInMilliseconds()); + EXPECT_EQ(waitTime, jitterDelayMs); + + // 300 incoming frames without jitter, verify that this gives the exact wait + // time. + for (int i = 0; i < 300; i++) { + clock.AdvanceTimeMilliseconds(1000 / 25); + timeStamp += 90000 / 25; + timing.IncomingTimestamp(timeStamp, clock.TimeInMilliseconds()); + } + timing.UpdateCurrentDelay(timeStamp); + waitTime = timing.MaxWaitingTime( + timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds()), + clock.TimeInMilliseconds()); + EXPECT_EQ(waitTime, jitterDelayMs); + + // Add decode time estimates. + for (int i = 0; i < 10; i++) { + int64_t startTimeMs = clock.TimeInMilliseconds(); + clock.AdvanceTimeMilliseconds(10); + timing.StopDecodeTimer( + timeStamp, clock.TimeInMilliseconds() - startTimeMs, + clock.TimeInMilliseconds(), + timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds())); + timeStamp += 90000 / 25; + clock.AdvanceTimeMilliseconds(1000 / 25 - 10); + timing.IncomingTimestamp(timeStamp, clock.TimeInMilliseconds()); + } + maxDecodeTimeMs = 10; + timing.SetJitterDelay(jitterDelayMs); + clock.AdvanceTimeMilliseconds(1000); + timeStamp += 90000; + timing.UpdateCurrentDelay(timeStamp); + waitTime = timing.MaxWaitingTime( + timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds()), + clock.TimeInMilliseconds()); + EXPECT_EQ(waitTime, jitterDelayMs); + + uint32_t minTotalDelayMs = 200; + timing.set_min_playout_delay(minTotalDelayMs); + clock.AdvanceTimeMilliseconds(5000); + timeStamp += 5 * 90000; + timing.UpdateCurrentDelay(timeStamp); + const int kRenderDelayMs = 10; + timing.set_render_delay(kRenderDelayMs); + waitTime = timing.MaxWaitingTime( + timing.RenderTimeMs(timeStamp, clock.TimeInMilliseconds()), + clock.TimeInMilliseconds()); + // We should at least have minTotalDelayMs - decodeTime (10) - renderTime + // (10) to wait. + EXPECT_EQ(waitTime, minTotalDelayMs - maxDecodeTimeMs - kRenderDelayMs); + // The total video delay should be equal to the min total delay. + EXPECT_EQ(minTotalDelayMs, timing.TargetVideoDelay()); + + // Reset playout delay. + timing.set_min_playout_delay(0); + clock.AdvanceTimeMilliseconds(5000); + timeStamp += 5 * 90000; + timing.UpdateCurrentDelay(timeStamp); +} + +TEST(ReceiverTiming, WrapAround) { + const int kFramerate = 25; + SimulatedClock clock(0); + VCMTiming timing(&clock); + // Provoke a wrap-around. The forth frame will have wrapped at 25 fps. + uint32_t timestamp = 0xFFFFFFFFu - 3 * 90000 / kFramerate; + for (int i = 0; i < 4; ++i) { + timing.IncomingTimestamp(timestamp, clock.TimeInMilliseconds()); + clock.AdvanceTimeMilliseconds(1000 / kFramerate); + timestamp += 90000 / kFramerate; + int64_t render_time = + timing.RenderTimeMs(0xFFFFFFFFu, clock.TimeInMilliseconds()); + EXPECT_EQ(3 * 1000 / kFramerate, render_time); + render_time = timing.RenderTimeMs(89u, // One second later in 90 kHz. + clock.TimeInMilliseconds()); + EXPECT_EQ(3 * 1000 / kFramerate + 1, render_time); + } +} + +} // namespace webrtc |