generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Function name change.

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4655 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org 2013-09-02 12:45:09 +00:00
parent dfbf52baac
commit d51bcffc1e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/video_engine/vie_capturer.cc
View File

@ -511,7 +511,7 @@ bool ViECapturer::ViECaptureThreadFunction(void* obj) {
bool ViECapturer::ViECaptureProcess() { bool ViECapturer::ViECaptureProcess() {
if (capture_event_.Wait(kThreadWaitTimeMs) == kEventSignaled) { if (capture_event_.Wait(kThreadWaitTimeMs) == kEventSignaled) {
deliver_cs_->Enter(); deliver_cs_->Enter();
if (MaybeSwapCapturedToDeliverFrame()) { if (MaybeSwapCapturedAndDeliverFrame()) {
DeliverI420Frame(&deliver_frame_); DeliverI420Frame(&deliver_frame_);
} }
deliver_cs_->Leave(); deliver_cs_->Leave();
@ -646,7 +646,7 @@ void ViECapturer::OnNoPictureAlarm(const int32_t id,
observer_->NoPictureAlarm(id, vie_alarm); observer_->NoPictureAlarm(id, vie_alarm);
} }
bool ViECapturer::MaybeSwapCapturedToDeliverFrame() { bool ViECapturer::MaybeSwapCapturedAndDeliverFrame() {
CriticalSectionScoped cs(capture_cs_.get()); CriticalSectionScoped cs(capture_cs_.get());
if (captured_frame_.IsZeroSize()) if (captured_frame_.IsZeroSize())
return false; return false;

2
webrtc/video_engine/vie_capturer.h
View File

@ -144,7 +144,7 @@ class ViECapturer
void DeliverCodedFrame(VideoFrame* video_frame); void DeliverCodedFrame(VideoFrame* video_frame);
private: private:
bool MaybeSwapCapturedToDeliverFrame(); bool MaybeSwapCapturedAndDeliverFrame();
// Never take capture_cs_ before deliver_cs_! // Never take capture_cs_ before deliver_cs_!
scoped_ptr<CriticalSectionWrapper> capture_cs_; scoped_ptr<CriticalSectionWrapper> capture_cs_;