Add a flag in StopCapture to allow event handler to choose event notification.

content/renderer/media/video_capture_impl.h

 // Copyright (c) 2011 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.
 
 // VideoCaptureImpl represents a capture device in renderer process. It provides
 // interfaces for clients to Start/Stop capture. It also communicates to clients
 // when buffer is ready, state of capture device is changed.
 
 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 
 #include <list>
 #include <map>
 
 #include "content/renderer/media/video_capture_message_filter.h"
 #include "media/video/capture/video_capture.h"
 
 namespace base {
 class MessageLoopProxy;
+class WaitableEvent;
 }
 
 class VideoCaptureImpl
     : public media::VideoCapture,
       public VideoCaptureMessageFilter::Delegate {
  public:
   // media::VideoCapture interface.
   virtual void StartCapture(media::VideoCapture::EventHandler* handler,
-                            const VideoCaptureCapability& capability);
-  virtual void StopCapture(media::VideoCapture::EventHandler* handler);
-  virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer);
-  virtual bool CaptureStarted();
-  virtual int CaptureWidth();
-  virtual int CaptureHeight();
-  virtual int CaptureFrameRate();
+                            const VideoCaptureCapability& capability) OVERRIDE;
+  virtual void StopCapture(media::VideoCapture::EventHandler* handler,
+                           bool need_notification) OVERRIDE;
+  virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) OVERRIDE;
+  virtual bool CaptureStarted() OVERRIDE;
+  virtual int CaptureWidth() OVERRIDE;
+  virtual int CaptureHeight() OVERRIDE;
+  virtual int CaptureFrameRate() OVERRIDE;
 
   // VideoCaptureMessageFilter::Delegate interface.
   virtual void OnBufferCreated(base::SharedMemoryHandle handle,
                                int length, int buffer_id);
   virtual void OnBufferReceived(int buffer_id, base::Time timestamp);
   virtual void OnStateChanged(const media::VideoCapture::State& state);
   virtual void OnDeviceInfoReceived(
       const media::VideoCaptureParams& device_info);
   virtual void OnDelegateAdded(int32 device_id);
 
@@ skipping 16 matching lines @@
     scoped_refptr<media::VideoCapture::VideoFrameBuffer> mapped_memory;
   };
 
   VideoCaptureImpl(media::VideoCaptureSessionId id,
                    scoped_refptr<base::MessageLoopProxy> ml_proxy,
                    VideoCaptureMessageFilter* filter);
   virtual ~VideoCaptureImpl();
 
   void DoStartCapture(media::VideoCapture::EventHandler* handler,
                       const VideoCaptureCapability& capability);
-  void DoStopCapture(media::VideoCapture::EventHandler* handler);
+  void DoStopCapture(media::VideoCapture::EventHandler* handler,
+                     base::WaitableEvent* completion);
   void DoFeedBuffer(scoped_refptr<VideoFrameBuffer> buffer);
 
   void DoBufferCreated(base::SharedMemoryHandle handle,
                        int length, int buffer_id);
   void DoBufferReceived(int buffer_id, base::Time timestamp);
   void DoStateChanged(const media::VideoCapture::State& state);
   void DoDeviceInfoReceived(const media::VideoCaptureParams& device_info);
   void DoDelegateAdded(int32 device_id);
 
   void Init();
@@ skipping 34 matching lines @@
   // The parameter will be used in next capture session.
   media::VideoCaptureParams new_params_;
   State state_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImpl);
 };
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(VideoCaptureImpl);
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_