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

Revert "Delete class EventTimerWrapper."

Browse Source 
This reverts commit a421775a6d4f78f7aa9c3ea020a8834e049efbcc.

Reason for revert: Depends on https://webrtc-review.googlesource.com/c/src/+/97320, which will be reverted due to breakage in video_engine_tests.

Original change's description:
> Delete class EventTimerWrapper.
> 
> Only user, iSACTest, refactored to use a sleep instead.
> 
> Bug: webrtc:3380
> Change-Id: I683a5a05349f75a17e5d2a02d4a20a9cf059a28f
> Reviewed-on: https://webrtc-review.googlesource.com/96802
> Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
> Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24541}

TBR=henrika@webrtc.org,henrik.lundin@webrtc.org,nisse@webrtc.org

Change-Id: Iea92618c87cb4eb4595f22674528920171a9defb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:3380
Reviewed-on: https://webrtc-review.googlesource.com/97681
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24551}
This commit is contained in:
Niels Moller
2018-09-04 11:49:57 +00:00
committed by Commit Bot
parent f217903a67
commit 85e6e826a2
9 changed files with 690 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/audio_coding/test/iSACTest.cc
View File

@ -26,7 +26,7 @@
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "modules/audio_coding/codecs/audio_format_conversion.h"
#include "modules/audio_coding/test/utility.h"
#include "system_wrappers/include/sleep.h"
#include "system_wrappers/include/event_wrapper.h"
#include "test/testsupport/fileutils.h"
namespace webrtc {
@ -251,19 +251,15 @@ void ISACTest::EncodeDecode(int testNr,
_channel_B2A->ResetStats();
char currentTime[500];
int64_t time_ms = rtc::TimeMillis();
EventTimerWrapper* myEvent = EventTimerWrapper::Create();
EXPECT_TRUE(myEvent->StartTimer(true, 10));
while (!(_inFileA.EndOfFile() || _inFileA.Rewinded())) {
Run10ms();
_myTimer.Tick10ms();
_myTimer.CurrentTimeHMS(currentTime);
if ((adaptiveMode) && (_testMode != 0)) {
time_ms += 10;
int64_t time_left_ms = time_ms - rtc::TimeMillis();
if (time_left_ms > 0) {
SleepMs(time_left_ms);
}
myEvent->Wait(5000);
EXPECT_TRUE(_acmA->SendCodec());
EXPECT_TRUE(_acmB->SendCodec());
}