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

Provide the option of injecting rtc::TaskQueue when creating RtcEventLogImpl via factory methods.

Browse Source 
Bug: webrtc:9004
Change-Id: Ia7cc96074dbf84f576e5fb0762866b213ec8e69f
Reviewed-on: https://webrtc-review.googlesource.com/63022
Commit-Queue: Dino Radaković <dinor@webrtc.org>
Reviewed-by: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22520}
This commit is contained in:
Dino Radaković
2018-03-20 18:15:39 +01:00
committed by Commit Bot
parent fe48ee9e2c
commit e9d2e4d3fb
6 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
logging/rtc_event_log/rtc_event_log_impl.cc
View File

@ -81,10 +81,9 @@ std::unique_ptr<RtcEventLogEncoder> CreateEncoder(
class RtcEventLogImpl final : public RtcEventLog {
public:
explicit RtcEventLogImpl(
std::unique_ptr<RtcEventLogEncoder> event_encoder,
std::unique_ptr<rtc::TaskQueue> task_queue =
rtc::MakeUnique<rtc::TaskQueue>("rtc_event_log"));
RtcEventLogImpl(std::unique_ptr<RtcEventLogEncoder> event_encoder,
std::unique_ptr<rtc::TaskQueue> task_queue);
~RtcEventLogImpl() override;
// TODO(eladalon): We should change these name to reflect that what we're
@ -363,6 +362,13 @@ void RtcEventLogImpl::WriteToOutput(const std::string& output_string) {
// RtcEventLog member functions.
std::unique_ptr<RtcEventLog> RtcEventLog::Create(EncodingType encoding_type) {
return Create(encoding_type,
rtc::MakeUnique<rtc::TaskQueue>("rtc_event_log"));
}
std::unique_ptr<RtcEventLog> RtcEventLog::Create(
EncodingType encoding_type,
std::unique_ptr<rtc::TaskQueue> task_queue) {
#ifdef ENABLE_RTC_EVENT_LOG
// TODO(eladalon): Known issue - there's a race over |rtc_event_log_count|.
constexpr int kMaxLogCount = 5;
@ -374,7 +380,8 @@ std::unique_ptr<RtcEventLog> RtcEventLog::Create(EncodingType encoding_type) {
return CreateNull();
}
auto encoder = CreateEncoder(encoding_type);
return rtc::MakeUnique<RtcEventLogImpl>(std::move(encoder));
return rtc::MakeUnique<RtcEventLogImpl>(std::move(encoder),
std::move(task_queue));
#else
return CreateNull();
#endif // ENABLE_RTC_EVENT_LOG