VideoCaptureImpl & relatives small cleanup.

content/renderer/media/video_capture_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Notes about usage of this object by VideoCaptureImplManager.
 //
 // VideoCaptureImplManager access this object by using a Unretained()
 // binding and tasks on the IO thread. It is then important that
 // VideoCaptureImpl never post task to itself. All operations must be
 // synchronous.
@@ skipping 180 matching lines @@
       client_buffers_.insert(std::make_pair(
                                  buffer_id,
                                  new ClientBuffer(shm.Pass(),
                                                   length))).second;
   DCHECK(inserted);
 }
 
 void VideoCaptureImpl::OnBufferDestroyed(int buffer_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  ClientBufferMap::iterator iter = client_buffers_.find(buffer_id);
+  const ClientBufferMap::iterator iter = client_buffers_.find(buffer_id);
   if (iter == client_buffers_.end())
     return;
 
   DCHECK(!iter->second.get() || iter->second->HasOneRef())
       << "Instructed to delete buffer we are still using.";
   client_buffers_.erase(iter);
 }
 
 void VideoCaptureImpl::OnBufferReceived(int buffer_id,
                                         const media::VideoCaptureFormat& format,
@@ skipping 13 matching lines @@
   if (first_frame_timestamp_.is_null())
     first_frame_timestamp_ = timestamp;
 
   // Used by chrome/browser/extension/api/cast_streaming/performance_test.cc
   TRACE_EVENT_INSTANT2(
       "cast_perf_test", "OnBufferReceived",
       TRACE_EVENT_SCOPE_THREAD,
       "timestamp", timestamp.ToInternalValue(),
       "time_delta", (timestamp - first_frame_timestamp_).ToInternalValue());
 
-  ClientBufferMap::iterator iter = client_buffers_.find(buffer_id);
+  const ClientBufferMap::const_iterator iter = client_buffers_.find(buffer_id);
   DCHECK(iter != client_buffers_.end());
   scoped_refptr<ClientBuffer> buffer = iter->second;
   scoped_refptr<media::VideoFrame> frame =
       media::VideoFrame::WrapExternalPackedMemory(
           media::VideoFrame::I420,
           last_frame_format_.frame_size,
           visible_rect,
           gfx::Size(visible_rect.width(), visible_rect.height()),
           reinterpret_cast<uint8*>(buffer->buffer->memory()),
           buffer->buffer_size,
           buffer->buffer->handle(),
           0,
           timestamp - first_frame_timestamp_,
           media::BindToCurrentLoop(
               base::Bind(&VideoCaptureImpl::OnClientBufferFinished,
                          weak_factory_.GetWeakPtr(),
                          buffer_id,
                          buffer,
                          0)));
 
-  for (ClientInfoMap::iterator it = clients_.begin(); it != clients_.end();
-       ++it) {
-    it->second.deliver_frame_cb.Run(frame, format, timestamp);
-  }
+  for (const auto& it : clients_)

[wolenetz, 2015/03/02 23:51:09]

nit: s/it/something-more-type-descriptive/ ?

[mcasas, 2015/03/03 15:40:52]

Done.

+    it.second.deliver_frame_cb.Run(frame, format, timestamp);
 }
 
 void VideoCaptureImpl::OnMailboxBufferReceived(
     int buffer_id,
     const gpu::MailboxHolder& mailbox_holder,
     const media::VideoCaptureFormat& format,
     base::TimeTicks timestamp) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (state_ != VIDEO_CAPTURE_STATE_STARTED || suspended_) {
     Send(new VideoCaptureHostMsg_BufferReady(device_id_, buffer_id, 0));
     return;
   }
 
   last_frame_format_ = format;
   if (first_frame_timestamp_.is_null())
     first_frame_timestamp_ = timestamp;
 
   scoped_refptr<media::VideoFrame> frame = media::VideoFrame::WrapNativeTexture(
       make_scoped_ptr(new gpu::MailboxHolder(mailbox_holder)),
       media::BindToCurrentLoop(base::Bind(
           &VideoCaptureImpl::OnClientBufferFinished, weak_factory_.GetWeakPtr(),
           buffer_id, scoped_refptr<ClientBuffer>())),
       last_frame_format_.frame_size, gfx::Rect(last_frame_format_.frame_size),
       last_frame_format_.frame_size, timestamp - first_frame_timestamp_, false);
 
-  for (ClientInfoMap::iterator it = clients_.begin(); it != clients_.end();
-       ++it) {
-    it->second.deliver_frame_cb.Run(frame, format, timestamp);
-  }
+  for (const auto& it : clients_)

[wolenetz, 2015/03/02 23:51:09]

nit: ditto here and elsewhere in this CL.

[mcasas, 2015/03/03 15:40:52]

Done.

+    it.second.deliver_frame_cb.Run(frame, format, timestamp);
 }
 
 void VideoCaptureImpl::OnClientBufferFinished(
     int buffer_id,
     const scoped_refptr<ClientBuffer>& /* ignored_buffer */,
     uint32 release_sync_point) {
   DCHECK(thread_checker_.CalledOnValidThread());
   Send(new VideoCaptureHostMsg_BufferReady(
       device_id_, buffer_id, release_sync_point));
 }
 
 void VideoCaptureImpl::OnStateChanged(VideoCaptureState state) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   switch (state) {
     case VIDEO_CAPTURE_STATE_STARTED:
       // Camera has started in the browser process. Since we have already
       // told all clients that we have started there's nothing to do.
       break;
     case VIDEO_CAPTURE_STATE_STOPPED:
       state_ = VIDEO_CAPTURE_STATE_STOPPED;
       DVLOG(1) << "OnStateChanged: stopped!, device_id = " << device_id_;
       client_buffers_.clear();
       weak_factory_.InvalidateWeakPtrs();
       if (!clients_.empty() || !clients_pending_on_restart_.empty())
         RestartCapture();
       break;
     case VIDEO_CAPTURE_STATE_PAUSED:
-      for (ClientInfoMap::iterator it = clients_.begin();
-           it != clients_.end(); ++it) {
-        it->second.state_update_cb.Run(VIDEO_CAPTURE_STATE_PAUSED);
-      }
+      for (const auto& it : clients_)
+        it.second.state_update_cb.Run(VIDEO_CAPTURE_STATE_PAUSED);
       break;
     case VIDEO_CAPTURE_STATE_ERROR:
       DVLOG(1) << "OnStateChanged: error!, device_id = " << device_id_;
-      for (ClientInfoMap::iterator it = clients_.begin();
-           it != clients_.end(); ++it) {
-        it->second.state_update_cb.Run(VIDEO_CAPTURE_STATE_ERROR);
-      }
+      for (const auto& it : clients_)
+        it.second.state_update_cb.Run(VIDEO_CAPTURE_STATE_ERROR);
       clients_.clear();
       state_ = VIDEO_CAPTURE_STATE_ERROR;
       break;
     case VIDEO_CAPTURE_STATE_ENDED:
       DVLOG(1) << "OnStateChanged: ended!, device_id = " << device_id_;
-      for (ClientInfoMap::iterator it = clients_.begin();
-          it != clients_.end(); ++it) {
+      for (const auto& it : clients_) {
         // We'll only notify the client that the stream has stopped.
-        it->second.state_update_cb.Run(VIDEO_CAPTURE_STATE_STOPPED);
+        it.second.state_update_cb.Run(VIDEO_CAPTURE_STATE_STOPPED);
       }
       clients_.clear();
       state_ = VIDEO_CAPTURE_STATE_ENDED;
       break;
     default:
       break;
   }
 }
 
 void VideoCaptureImpl::OnDeviceSupportedFormatsEnumerated(
@@ skipping 10 matching lines @@
   for (size_t i = 0; i < device_formats_in_use_cb_queue_.size(); ++i)
     device_formats_in_use_cb_queue_[i].Run(formats_in_use);
   device_formats_in_use_cb_queue_.clear();
 }
 
 void VideoCaptureImpl::OnDelegateAdded(int32 device_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DVLOG(1) << "OnDelegateAdded: device_id " << device_id;
 
   device_id_ = device_id;
-  for (ClientInfoMap::iterator it = clients_pending_on_filter_.begin();
-       it != clients_pending_on_filter_.end(); ) {
-    int client_id = it->first;
-    VideoCaptureStateUpdateCB state_update_cb =
-        it->second.state_update_cb;
-    VideoCaptureDeliverFrameCB deliver_frame_cb =
-        it->second.deliver_frame_cb;
-    const media::VideoCaptureParams params = it->second.params;
-    clients_pending_on_filter_.erase(it++);
-    StartCapture(client_id, params, state_update_cb,
-                 deliver_frame_cb);
+  for (const auto& it = clients_pending_on_filter_) {

[wolenetz, 2015/03/02 23:51:09]

s/=/:/ ? I don't know this code, this for loop now seems like a locally scoped
variable definition *only*, and not a loop at all.

[mcasas, 2015/03/03 15:40:52]

Done.

+    StartCapture(it.first, it.second.params, it.second.state_update_cb,
+        it.second.deliver_frame_cb);
   }
+  clients_pending_on_filter_.clear();
 }
 
 void VideoCaptureImpl::StopDevice() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (state_ == VIDEO_CAPTURE_STATE_STARTED) {
     state_ = VIDEO_CAPTURE_STATE_STOPPING;
     Send(new VideoCaptureHostMsg_Stop(device_id_));
     params_.requested_format.frame_size.SetSize(0, 0);
   }
 }
 
 void VideoCaptureImpl::RestartCapture() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_EQ(state_, VIDEO_CAPTURE_STATE_STOPPED);
 
   int width = 0;
   int height = 0;
   clients_.insert(clients_pending_on_restart_.begin(),
                   clients_pending_on_restart_.end());
   clients_pending_on_restart_.clear();
-  for (ClientInfoMap::iterator it = clients_.begin();
-       it != clients_.end(); ++it) {
+  for (const auto& it : clients_) {
     width = std::max(width,
-                     it->second.params.requested_format.frame_size.width());
+                     it.second.params.requested_format.frame_size.width());
     height = std::max(height,
-                      it->second.params.requested_format.frame_size.height());
+                      it.second.params.requested_format.frame_size.height());
   }
   params_.requested_format.frame_size.SetSize(width, height);
   DVLOG(1) << "RestartCapture, "
            << params_.requested_format.frame_size.ToString();
   StartCaptureInternal();
 }
 
 void VideoCaptureImpl::StartCaptureInternal() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(device_id_);
 
   Send(new VideoCaptureHostMsg_Start(device_id_, session_id_, params_));
   state_ = VIDEO_CAPTURE_STATE_STARTED;
 }
 
 void VideoCaptureImpl::Send(IPC::Message* message) {
   DCHECK(thread_checker_.CalledOnValidThread());
   message_filter_->Send(message);
 }
 
 bool VideoCaptureImpl::RemoveClient(int client_id, ClientInfoMap* clients) {
   DCHECK(thread_checker_.CalledOnValidThread());
   bool found = false;
 
-  ClientInfoMap::iterator it = clients->find(client_id);
+  const ClientInfoMap::iterator it = clients->find(client_id);
   if (it != clients->end()) {
     it->second.state_update_cb.Run(VIDEO_CAPTURE_STATE_STOPPED);
     clients->erase(it);
     found = true;
   }
   return found;
 }
 
 }  // namespace content