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

Revert "Split EventWrapper in twain."

Browse Source 
This reverts commit 9509fbfc301dd5412804ce5731afedc81480f2f8.

This is to debug a Chromium issue that WebRTC hangs if there is > 1 PeerConnection active in the browser on Win XP.

BUG=

TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/43019004

Cr-Commit-Position: refs/heads/master@{#8912}
This commit is contained in:
Minyue
2015-04-01 16:31:38 +02:00
parent 31331cfd2d
commit cf3c83e76c
25 changed files with 94 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/modules/audio_coding/main/test/APITest.cc
View File

@ -247,14 +247,14 @@ int16_t APITest::SetUp() {
//--- EVENT TIMERS
// A
_pullEventA = EventTimerWrapper::Create();
_pushEventA = EventTimerWrapper::Create();
_processEventA = EventTimerWrapper::Create();
_pullEventA = EventWrapper::Create();
_pushEventA = EventWrapper::Create();
_processEventA = EventWrapper::Create();
_apiEventA = EventWrapper::Create();
// B
_pullEventB = EventTimerWrapper::Create();
_pushEventB = EventTimerWrapper::Create();
_processEventB = EventTimerWrapper::Create();
_pullEventB = EventWrapper::Create();
_pushEventB = EventWrapper::Create();
_processEventB = EventWrapper::Create();
_apiEventB = EventWrapper::Create();
//--- I/O params
@ -682,7 +682,7 @@ void APITest::TestDelay(char side) {
AudioCodingModule* myACM;
Channel* myChannel;
int32_t* myMinDelay;
EventTimerWrapper* myEvent = EventTimerWrapper::Create();
EventWrapper* myEvent = EventWrapper::Create();
uint32_t inTimestamp = 0;
uint32_t outTimestamp = 0;

12
webrtc/modules/audio_coding/main/test/APITest.h
View File

@ -109,14 +109,14 @@ class APITest : public ACMTest {
bool _writeToFile;
//--- Events
// A
EventTimerWrapper* _pullEventA; // pulling data from ACM
EventTimerWrapper* _pushEventA; // pushing data to ACM
EventTimerWrapper* _processEventA; // process
EventWrapper* _pullEventA; // pulling data from ACM
EventWrapper* _pushEventA; // pushing data to ACM
EventWrapper* _processEventA; // process
EventWrapper* _apiEventA; // API calls
// B
EventTimerWrapper* _pullEventB; // pulling data from ACM
EventTimerWrapper* _pushEventB; // pushing data to ACM
EventTimerWrapper* _processEventB; // process
EventWrapper* _pullEventB; // pulling data from ACM
EventWrapper* _pushEventB; // pushing data to ACM
EventWrapper* _processEventB; // process
EventWrapper* _apiEventB; // API calls
// keep track of the codec in either side.

2
webrtc/modules/audio_coding/main/test/iSACTest.cc
View File

@ -292,7 +292,7 @@ void ISACTest::EncodeDecode(int testNr, ACMTestISACConfig& wbISACConfig,
char currentTime[500];
CodecInst sendCodec;
EventTimerWrapper* myEvent = EventTimerWrapper::Create();
EventWrapper* myEvent = EventWrapper::Create();
EXPECT_TRUE(myEvent->StartTimer(true, 10));
while (!(_inFileA.EndOfFile() || _inFileA.Rewinded())) {
Run10ms();