Switch event type when a capture device has been stopped from the render process. This make sure th…

content/renderer/media/rtc_video_capture_delegate.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.
 
 #include "content/renderer/media/rtc_video_capture_delegate.h"
 
 #include "base/bind.h"
 
 namespace content {
 
@@ skipping 41 matching lines @@
 
 void RtcVideoCaptureDelegate::OnStopped(media::VideoCapture* capture) {
 }
 
 void RtcVideoCaptureDelegate::OnPaused(media::VideoCapture* capture) {
   NOTIMPLEMENTED();
 }
 
 void RtcVideoCaptureDelegate::OnError(media::VideoCapture* capture,
                                       int error_code) {
-  message_loop_proxy_->PostTask(
-      FROM_HERE,
-      base::Bind(&RtcVideoCaptureDelegate::OnErrorOnCaptureThread,
-                 this, capture, error_code));
 }
 
 void RtcVideoCaptureDelegate::OnRemoved(media::VideoCapture* capture) {
   DVLOG(3) << " RtcVideoCaptureDelegate::OnRemoved";
+  message_loop_proxy_->PostTask(
+      FROM_HERE,
+      base::Bind(&RtcVideoCaptureDelegate::OnRemovedOnCaptureThread,
+                 this, capture));
+
   // Balance the AddRef in StartCapture.
   // This means we are no longer registered as an event handler and can safely
   // be deleted.
   Release();
 }
 
 void RtcVideoCaptureDelegate::OnBufferReady(
     media::VideoCapture* capture,
     scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf) {
   message_loop_proxy_->PostTask(
@@ skipping 16 matching lines @@
       got_first_frame_ = true;
       if (!state_callback_.is_null())
         state_callback_.Run(CAPTURE_RUNNING);
     }
 
     captured_callback_.Run(*buf);
   }
   capture->FeedBuffer(buf);
 }
 
-void RtcVideoCaptureDelegate::OnErrorOnCaptureThread(
-    media::VideoCapture* capture, int error_code) {
+void RtcVideoCaptureDelegate::OnRemovedOnCaptureThread(
+    media::VideoCapture* capture) {
   if (!state_callback_.is_null())
     state_callback_.Run(got_first_frame_ ? CAPTURE_STOPPED : CAPTURE_FAILED);

[wjia(left Chromium), 2013/04/05 18:39:17]

This could still have problem since OnRemoved is called immediately after
onStopped too
(https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/m...).
For a session, when capture is stopped normally, this function would signal
CAPTURE_FAILED. Is that desired?

The possible fix would be remember state when OnStopped/OnError is called. Then
check that state here.

[perkj_chrome, 2013/04/08 11:15:54]

Do you know why we have have got_first_frame_ ? Why not replace it with

RtcVideoCaptureDelegate::OnError {
got_error_ = true;
}

And do 
void RtcVideoCaptureDelegate::OnRemovedOnCaptureThread(
  if (!state_callback_.is_null()) 
state_callback_.Run(got_error_ ? CAPTURE_FAILED : CAPTURE_STOPPED);

 }
 
 }  // namespace content