mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-20 09:07:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reland of Switch to use SequencedTaskChecker instead of ThreadChecker where needed.

Browse source 
(patchset #1 id:1 of https://codereview.webrtc.org/2149553002/ )"
This reverts commit efd902cb1d.

Originally reviewed in https://codereview.webrtc.org/2149553002

The uptream problem should be fixed by https://codereview.webrtc.org/2145393003/

BUG=webrtc:5687
TBR=tommi@webrtc.org

Review-Url: https://codereview.webrtc.org/2152013002
Cr-Commit-Position: refs/heads/master@{#13483}
This commit is contained in:
perkj 2016-07-14 23:35:55 -07:00 committed by Commit bot
parent 32012f8c3a
commit 4e417b242a
11 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
webrtc/common_video/BUILD.gn
View file

@ -58,6 +58,7 @@ source_set("common_video") {
deps = [
"..:webrtc_common",
"../base:rtc_task_queue",
"../system_wrappers",
]

1
webrtc/common_video/common_video.gyp
View file

@ -18,6 +18,7 @@
'libyuv/include',
],
'dependencies': [
'<(webrtc_root)/base/base.gyp:rtc_task_queue',
'<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
],

6
webrtc/common_video/i420_buffer_pool.cc
View file

@ -16,17 +16,17 @@ namespace webrtc {
I420BufferPool::I420BufferPool(bool zero_initialize)
: zero_initialize_(zero_initialize) {
thread_checker_.DetachFromThread();
sequenced_checker_.Detach();
}
void I420BufferPool::Release() {
thread_checker_.DetachFromThread();
sequenced_checker_.Detach();
buffers_.clear();
}
rtc::scoped_refptr<I420Buffer> I420BufferPool::CreateBuffer(int width,
int height) {
RTC_DCHECK(thread_checker_.CalledOnValidThread());
RTC_DCHECK(sequenced_checker_.CalledSequentially());
// Release buffers with wrong resolution.
for (auto it = buffers_.begin(); it != buffers_.end();) {
if ((*it)->width() != width || (*it)->height() != height)

4
webrtc/common_video/include/i420_buffer_pool.h
View file

@ -13,7 +13,7 @@
#include <list>
#include "webrtc/base/thread_checker.h"
#include "webrtc/base/sequenced_task_checker.h"
#include "webrtc/common_video/include/video_frame_buffer.h"
namespace webrtc {
@ -40,7 +40,7 @@ class I420BufferPool {
// needed by the pool to check exclusive access.
using PooledI420Buffer = rtc::RefCountedObject<I420Buffer>;
rtc::ThreadChecker thread_checker_;
rtc::SequencedTaskChecker sequenced_checker_;
std::list<rtc::scoped_refptr<PooledI420Buffer>> buffers_;
// If true, newly allocated buffers are zero-initialized. Note that recycled
// buffers are not zero'd before reuse. This is required of buffers used by

2
webrtc/media/media.gyp
View file

@ -199,6 +199,7 @@
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/media/media.gyp:rtc_media',
],
'direct_dependent_settings': {
'include_dirs': [
@ -250,7 +251,6 @@
'type': 'executable',
'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/media/media.gyp:rtc_media',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
'<(webrtc_root)/test/test.gyp:test_support',
'rtc_unittest_main',

1
webrtc/modules/video_coding/BUILD.gn
View file

@ -125,6 +125,7 @@ source_set("video_coding_utility") {
}
deps = [
"../../common_video",
"../../system_wrappers",
]
}

1
webrtc/modules/video_coding/utility/video_coding_utility.gyp
View file

@ -15,6 +15,7 @@
'target_name': 'video_coding_utility',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/common_video/common_video.gyp:common_video',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
],
'sources': [

1
webrtc/modules/video_coding/video_coding.gypi
View file

@ -14,6 +14,7 @@
'dependencies': [
'webrtc_h264',
'webrtc_i420',
'../base/base.gyp:rtc_task_queue',
'<(webrtc_root)/common_video/common_video.gyp:common_video',
'<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',

5
webrtc/modules/video_coding/video_coding_impl.h
View file

@ -19,7 +19,7 @@
#include "webrtc/base/onetimeevent.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/base/thread_checker.h"
#include "webrtc/base/sequenced_task_checker.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/modules/video_coding/codec_database.h"
#include "webrtc/modules/video_coding/frame_buffer.h"
@ -108,8 +108,7 @@ class VideoSender : public Module {
// Must be accessed on the construction thread of VideoSender.
VideoCodec current_codec_;
rtc::ThreadChecker main_thread_;
rtc::SequencedTaskChecker sequenced_checker_;
rtc::CriticalSection params_crit_;
EncoderParameters encoder_params_ GUARDED_BY(params_crit_);

10
webrtc/modules/video_coding/video_sender.cc
View file

@ -43,7 +43,7 @@ VideoSender::VideoSender(Clock* clock,
// Allow VideoSender to be created on one thread but used on another, post
// construction. This is currently how this class is being used by at least
// one external project (diffractor).
main_thread_.DetachFromThread();
sequenced_checker_.Detach();
}
VideoSender::~VideoSender() {}
@ -82,7 +82,7 @@ int64_t VideoSender::TimeUntilNextProcess() {
int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec,
uint32_t numberOfCores,
uint32_t maxPayloadSize) {
RTC_DCHECK(main_thread_.CalledOnValidThread());
RTC_DCHECK(sequenced_checker_.CalledSequentially());
rtc::CritScope lock(&encoder_crit_);
if (sendCodec == nullptr) {
return VCM_PARAMETER_ERROR;
@ -150,7 +150,7 @@ int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec,
void VideoSender::RegisterExternalEncoder(VideoEncoder* externalEncoder,
uint8_t payloadType,
bool internalSource /*= false*/) {
RTC_DCHECK(main_thread_.CalledOnValidThread());
RTC_DCHECK(sequenced_checker_.CalledSequentially());
rtc::CritScope lock(&encoder_crit_);
@ -172,7 +172,7 @@ void VideoSender::RegisterExternalEncoder(VideoEncoder* externalEncoder,
// Get encode bitrate
int VideoSender::Bitrate(unsigned int* bitrate) const {
RTC_DCHECK(main_thread_.CalledOnValidThread());
RTC_DCHECK(sequenced_checker_.CalledSequentially());
// Since we're running on the thread that's the only thread known to modify
// the value of _encoder, we don't need to grab the lock here.
@ -184,7 +184,7 @@ int VideoSender::Bitrate(unsigned int* bitrate) const {
// Get encode frame rate
int VideoSender::FrameRate(unsigned int* framerate) const {
RTC_DCHECK(main_thread_.CalledOnValidThread());
RTC_DCHECK(sequenced_checker_.CalledSequentially());
// Since we're running on the thread that's the only thread known to modify
// the value of _encoder, we don't need to grab the lock here.

1
webrtc/video/BUILD.gn
View file

@ -100,6 +100,7 @@ if (rtc_include_tests) {
"video_send_stream_tests.cc",
"vie_remb_unittest.cc",
]
configs += [ "..:common_config" ]
deps = [
":video",
"//testing/gmock",