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

Delete method webrtc::VideoFrame::Reset.

Browse Source 
Mainly affects VideoCaptureInput.

BUG=webrtc:5682

Review URL: https://codereview.webrtc.org/1889443002

Cr-Commit-Position: refs/heads/master@{#12439}
This commit is contained in:
nisse
2016-04-20 03:25:36 -07:00
committed by Commit bot
parent 1a0c4611d7
commit c7fe3c27eb
7 changed files with 29 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/video/video_capture_input.cc
View File

@ -84,10 +84,11 @@ void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) {
return;
}
captured_frame_.ShallowCopy(incoming_frame);
captured_frame_.reset(new VideoFrame);
captured_frame_->ShallowCopy(incoming_frame);
last_captured_timestamp_ = incoming_frame.ntp_time_ms();
overuse_detector_->FrameCaptured(captured_frame_);
overuse_detector_->FrameCaptured(*captured_frame_);
TRACE_EVENT_ASYNC_BEGIN1("webrtc", "Video", video_frame.render_time_ms(),
"render_time", video_frame.render_time_ms());
@ -97,11 +98,11 @@ void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) {
bool VideoCaptureInput::GetVideoFrame(VideoFrame* video_frame) {
rtc::CritScope lock(&crit_);
if (captured_frame_.IsZeroSize())
if (!captured_frame_)
return false;
*video_frame = captured_frame_;
captured_frame_.Reset();
*video_frame = *captured_frame_;
captured_frame_.reset();
return true;
}