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

Move EventWrapper class to target video_coding_legacy.

Browse Source 
And remove some unneeded logic for WEBRTC_EVENT_INFINITE.

Bug: webrtc:3380
Change-Id: Ibf632493edc6ced1609bd9ced44c2020fe9878cf
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169846
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30700}
This commit is contained in:
Niels Möller
2020-03-05 15:31:10 +01:00
committed by Commit Bot
parent ae9641b6d8
commit d3da6b05c1
7 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
system_wrappers/BUILD.gn
View File

@ -95,18 +95,6 @@ rtc_library("field_trial") {
]
}
rtc_library("event_wrapper") {
visibility = [
"../modules/video_coding:video_coding_legacy",
"../modules/video_coding:video_coding_unittests",
]
sources = [
"include/event_wrapper.h",
"source/event.cc",
]
deps = [ "../rtc_base:rtc_event" ]
}
rtc_library("metrics") {
visibility = [ "*" ]
public = [ "include/metrics.h" ]

49
system_wrappers/include/event_wrapper.h
View File

@ -1,49 +0,0 @@
/*
* 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.
*/
#ifndef SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_
#define SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_
namespace webrtc {
enum EventTypeWrapper { kEventSignaled = 1, kEventTimeout = 2 };
#define WEBRTC_EVENT_INFINITE 0xffffffff
class EventWrapper {
public:
// Factory method. Constructor disabled.
static EventWrapper* Create();
virtual ~EventWrapper() {}
// Releases threads who are calling Wait() and has started waiting. Please
// note that a thread calling Wait() will not start waiting immediately.
// assumptions to the contrary is a very common source of issues in
// multithreaded programming.
// Set is sticky in the sense that it will release at least one thread
// either immediately or some time in the future.
virtual bool Set() = 0;
// Puts the calling thread into a wait state. The thread may be released
// by a Set() call depending on if other threads are waiting and if so on
// timing. The thread that was released will reset the event before leaving
// preventing more threads from being released. If multiple threads
// are waiting for the same Set(), only one (random) thread is guaranteed to
// be released. It is possible that multiple (random) threads are released
// Depending on timing.
//
// |max_time| is the maximum time to wait in milliseconds or
// WEBRTC_EVENT_INFINITE to wait infinitely.
virtual EventTypeWrapper Wait(unsigned long max_time) = 0;
};
} // namespace webrtc
#endif // SYSTEM_WRAPPERS_INCLUDE_EVENT_WRAPPER_H_

48
system_wrappers/source/event.cc
View File

@ -1,48 +0,0 @@
/*
* 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 "system_wrappers/include/event_wrapper.h"
#if defined(_WIN32)
#include <windows.h>
#elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
#include <ApplicationServices/ApplicationServices.h>
#endif
#include "rtc_base/event.h"
namespace webrtc {
class EventWrapperImpl : public EventWrapper {
public:
~EventWrapperImpl() override {}
bool Set() override {
event_.Set();
return true;
}
EventTypeWrapper Wait(unsigned long max_time) override {
int to_wait = max_time == WEBRTC_EVENT_INFINITE
? rtc::Event::kForever
: static_cast<int>(max_time);
return event_.Wait(to_wait) ? kEventSignaled : kEventTimeout;
}
private:
rtc::Event event_;
};
// static
EventWrapper* EventWrapper::Create() {
return new EventWrapperImpl();
}
} // namespace webrtc