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

Put ViEFrameProviderBase::DeliverFrame back in the critical section in ViECapturer::DeliverI420Frame

Browse Source 
The CL that moved it out of the critical section is here: https://webrtc-codereview.appspot.com/43669004/

BUG=1128
R=tommi@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8724}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8724 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
magjed@webrtc.org
2015-03-14 11:49:55 +00:00
parent f1f558cde8
commit 6107ba12f9
1 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/video_engine/vie_capturer.cc
View File

@ -496,14 +496,14 @@ bool ViECapturer::ViECaptureProcess() {
} }
void ViECapturer::DeliverI420Frame(I420VideoFrame* video_frame) { void ViECapturer::DeliverI420Frame(I420VideoFrame* video_frame) {
CriticalSectionScoped cs(effects_and_stats_cs_.get());
if (video_frame->native_handle() != NULL) { if (video_frame->native_handle() != NULL) {
ViEFrameProviderBase::DeliverFrame(video_frame, std::vector<uint32_t>()); ViEFrameProviderBase::DeliverFrame(video_frame, std::vector<uint32_t>());
return; return;
} }
// Apply image enhancement and effect filter. // Apply image enhancement and effect filter.
{
CriticalSectionScoped cs(effects_and_stats_cs_.get());
if (deflicker_frame_stats_) { if (deflicker_frame_stats_) {
if (image_proc_module_->GetFrameStats(deflicker_frame_stats_, if (image_proc_module_->GetFrameStats(deflicker_frame_stats_,
*video_frame) == 0) { *video_frame) == 0) {
@ -545,7 +545,7 @@ void ViECapturer::DeliverI420Frame(I420VideoFrame* video_frame) {
video_frame->width(), video_frame->width(),
video_frame->height()); video_frame->height());
} }
}
// Deliver the captured frame to all observers (channels, renderer or file). // Deliver the captured frame to all observers (channels, renderer or file).
ViEFrameProviderBase::DeliverFrame(video_frame, std::vector<uint32_t>()); ViEFrameProviderBase::DeliverFrame(video_frame, std::vector<uint32_t>());
} }