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

remove more CriticalSectionWrappers.

Browse Source 
BUG=webrtc:7035

Review-Url: https://codereview.webrtc.org/2779623002
Cr-Commit-Position: refs/heads/master@{#17392}
This commit is contained in:
kthelgason
2017-03-27 07:24:57 -07:00
committed by Commit bot
parent 1c07c70d88
commit d701dfdeef
14 changed files with 69 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/modules/video_coding/video_coding_impl.cc
View File

@ -50,21 +50,19 @@ namespace {
// a register method all the way down to the function calling it.
class EncodedImageCallbackWrapper : public EncodedImageCallback {
public:
EncodedImageCallbackWrapper()
: cs_(CriticalSectionWrapper::CreateCriticalSection()),
callback_(nullptr) {}
EncodedImageCallbackWrapper() : callback_(nullptr) {}
virtual ~EncodedImageCallbackWrapper() {}
void Register(EncodedImageCallback* callback) {
CriticalSectionScoped cs(cs_.get());
rtc::CritScope lock(&cs_);
callback_ = callback;
}
virtual Result OnEncodedImage(const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) {
CriticalSectionScoped cs(cs_.get());
rtc::CritScope lock(&cs_);
if (callback_) {
return callback_->OnEncodedImage(encoded_image, codec_specific_info,
fragmentation);
@ -73,7 +71,7 @@ class EncodedImageCallbackWrapper : public EncodedImageCallback {
}
private:
std::unique_ptr<CriticalSectionWrapper> cs_;
rtc::CriticalSection cs_;
EncodedImageCallback* callback_ GUARDED_BY(cs_);
};