| Index: content/browser/renderer_host/media/video_capture_controller.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
|
| index ac5bc7215e2c02a71fa84f5a08804961ae0ca3ba..119a119b0c7bf23988ed16c2f4f9fe1c1b0f06ac 100644
|
| --- a/content/browser/renderer_host/media/video_capture_controller.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_controller.cc
|
| @@ -148,11 +148,13 @@ bool VideoCaptureController::BufferState::HasZeroConsumerHoldCount() {
|
|
|
| void VideoCaptureController::BufferState::SetConsumerFeedbackObserver(
|
| media::VideoFrameConsumerFeedbackObserver* consumer_feedback_observer) {
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| consumer_feedback_observer_ = consumer_feedback_observer;
|
| }
|
|
|
| void VideoCaptureController::BufferState::SetFrameBufferPool(
|
| media::FrameBufferPool* frame_buffer_pool) {
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| frame_buffer_pool_ = frame_buffer_pool;
|
| }
|
|
|
| @@ -372,7 +374,9 @@ void VideoCaptureController::OnIncomingCapturedVideoFrame(
|
| std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,
|
| scoped_refptr<VideoFrame> frame) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - DCHECK(frame_buffer_pool_);
|
| + if (!frame_buffer_pool_)
|
| + return;
|
| +
|
| const int buffer_id = buffer->id();
|
| DCHECK_NE(buffer_id, media::VideoCaptureBufferPool::kInvalidId);
|
|
|
| @@ -475,7 +479,6 @@ void VideoCaptureController::OnLog(const std::string& message) {
|
|
|
| void VideoCaptureController::OnBufferDestroyed(int buffer_id_to_drop) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - DCHECK(frame_buffer_pool_);
|
|
|
| for (const auto& client : controller_clients_) {
|
| if (client->session_closed)
|
|
|