Modified old wait sync point functions to also accept new sync tokens.

content/renderer/media/video_capture_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 
 #include <list>
 #include <map>
 
@@ skipping 86 matching lines @@
   // for capturing and callbacks to the client.
   struct ClientInfo {
     ClientInfo();
     ~ClientInfo();
     media::VideoCaptureParams params;
     VideoCaptureStateUpdateCB state_update_cb;
     VideoCaptureDeliverFrameCB deliver_frame_cb;
   };
   typedef std::map<int, ClientInfo> ClientInfoMap;
 
+  typedef base::Callback<void(uint32 sync_point,
+                              const gpu::SyncToken& sync_token,
+                              double consumer_resource_utilization)>
+      BufferFinishedCB;

[dcheng, 2015/10/27 19:09:28]

Generally, abbreviations are discouraged:
http://google.github.io/styleguide/cppguide.html#General_Naming_Rules

This should probably be BufferFinishedCallback.

[David Yen, 2015/10/28 22:03:43]

Done.

+
   // VideoCaptureMessageFilter::Delegate interface.
   void OnBufferCreated(base::SharedMemoryHandle handle,
                        int length,
                        int buffer_id) override;
   void OnBufferCreated2(const std::vector<gfx::GpuMemoryBufferHandle>& handles,
                         const gfx::Size& size,
                         int buffer_id) override;
   void OnBufferDestroyed(int buffer_id) override;
   void OnBufferReceived(
       int buffer_id,
       base::TimeTicks timestamp,
       const base::DictionaryValue& metadata,
       media::VideoPixelFormat pixel_format,
       media::VideoFrame::StorageType storage_type,
       const gfx::Size& coded_size,
       const gfx::Rect& visible_rect,
       const std::vector<gpu::MailboxHolder>& mailbox_holders) override;
   void OnStateChanged(VideoCaptureState state) override;
   void OnDeviceSupportedFormatsEnumerated(
       const media::VideoCaptureFormats& supported_formats) override;
   void OnDeviceFormatsInUseReceived(
       const media::VideoCaptureFormats& formats_in_use) override;
   void OnDelegateAdded(int32 device_id) override;
 
   // Sends an IPC message to browser process when all clients are done with the
   // buffer.
-  void OnClientBufferFinished(
-      int buffer_id,
-      const scoped_refptr<ClientBuffer>& buffer,
-      uint32 release_sync_point,
-      double consumer_resource_utilization);
-  void OnClientBufferFinished2(
-      int buffer_id,
-      const scoped_refptr<ClientBuffer2>& buffer,
-      uint32 release_sync_point,
-      double consumer_resource_utilization);
+  void OnClientBufferFinished(int buffer_id,
+                              const scoped_refptr<ClientBuffer>& buffer,
+                              uint32 release_sync_point,
+                              const gpu::SyncToken& release_sync_token,
+                              double consumer_resource_utilization);
+  void OnClientBufferFinished2(int buffer_id,
+                               const scoped_refptr<ClientBuffer2>& buffer,
+                               uint32 release_sync_point,
+                               const gpu::SyncToken& release_sync_token,
+                               double consumer_resource_utilization);
 
   void StopDevice();
   void RestartCapture();
   void StartCaptureInternal();
 
   virtual void Send(IPC::Message* message);
 
   // Helpers.
   bool RemoveClient(int client_id, ClientInfoMap* clients);
 
   // Called (by an unknown thread) when all consumers are done with a VideoFrame
   // and its ref-count has gone to zero.  This helper function grabs the
   // RESOURCE_UTILIZATION value from the |metadata| and then runs the given
   // callback, to trampoline back to the IO thread with the values.
   static void DidFinishConsumingFrame(
-    const media::VideoFrameMetadata* metadata,
-    uint32* release_sync_point_storage,  // Takes ownership.
-    const base::Callback<void(uint32, double)>& callback_to_io_thread);
+      const media::VideoFrameMetadata* metadata,
+      uint32* release_sync_point_storage,          // Takes ownership.
+      gpu::SyncToken* release_sync_token_storage,  // Takes ownership
+      const BufferFinishedCB& callback_to_io_thread);
 
   const scoped_refptr<VideoCaptureMessageFilter> message_filter_;
   int device_id_;
   const int session_id_;
 
   // Vector of callbacks to be notified of device format enumerations, used only
   // on IO Thread.
   std::vector<VideoCaptureDeviceFormatsCB> device_formats_cb_queue_;
   // Vector of callbacks to be notified of a device's in use capture format(s),
   // used only on IO Thread.
@@ skipping 27 matching lines @@
   // in |client_buffers_|.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_