Index: content/renderer/media/video_capture_module_impl.cc |
=================================================================== |
--- content/renderer/media/video_capture_module_impl.cc (revision 107671) |
+++ content/renderer/media/video_capture_module_impl.cc (working copy) |
@@ -16,7 +16,6 @@ |
thread_("VideoCaptureModuleImpl"), |
vc_manager_(vc_manager), |
state_(media::VideoCapture::kStopped), |
- got_first_frame_(false), |
width_(-1), |
height_(-1), |
frame_rate_(-1), |
@@ -160,7 +159,6 @@ |
cap.height = capability.height; |
cap.max_fps = capability.maxFPS; |
cap.raw_type = media::VideoFrame::I420; |
- cap.resolution_fixed = true; |
capture_engine_->StartCapture(this, cap); |
} |
@@ -191,7 +189,6 @@ |
VLOG(1) << "Capture Stopped!!! "; |
state_ = media::VideoCapture::kStopped; |
- got_first_frame_ = false; |
width_ = -1; |
height_ = -1; |
frame_rate_ = -1; |
@@ -207,15 +204,12 @@ |
media::VideoCapture* capture, |
scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf) { |
DCHECK(message_loop_proxy_->BelongsToCurrentThread()); |
+ DCHECK_GE(buf->width, static_cast<int>(width_)); |
+ DCHECK_GE(buf->height, static_cast<int>(height_)); |
if (state_ != media::VideoCapture::kStarted) |
return; |
- if (!got_first_frame_) { |
- got_first_frame_ = true; |
- start_time_ = buf->timestamp; |
- } |
- |
frameInfo_.width = buf->width; |
frameInfo_.height = buf->height; |
frameInfo_.rawType = video_type_; |