Rebase of Removing gpu::SyncToken usage from video capture pipeline

Removing gpu::SyncToken usage from video capture pipeline

This CL is patched from https://codereview.chromium.org/2442193002/. All
credit goes to D.O.Teller@gmail.com.

The use of gpu::SyncToken has been added for the sake of capture into
textures, but is now useless. This patch removes all uses up to
`OnClientBufferFinished` (excluded).

BUG=653994
Committed: https://crrev.com/214a2c9b14523bebc5ccef00e8df54099e3a619a
Cr-Commit-Position: refs/heads/master@{#441223}

[emircan, 2016-12-17 00:51:50]

The CQ bit was checked by emircan@chromium.org to run a CQ dry run

[emircan, 2016-12-17 00:52:13]

Description was changed from

==========
rebase

BUG=
==========

to

==========
Removing gpu::SyncToken usage from video capture pipeline, part 1.

The use of gpu::SyncToken has been added for the sake of capture into
textures, but is now useless. This patch removes all uses up to
`OnClientBufferFinished` (excluded).

BUG=653994
==========

[commit-bot: I haz the power, 2016-12-17 00:52:39]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-17 00:55:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-17 00:55:15]

Dry run: Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-device-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device-xcode-...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  ios-simulator-xcode-clang on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-xco...)

[emircan, 2016-12-17 01:08:16]

The CQ bit was checked by emircan@chromium.org to run a CQ dry run

[emircan, 2016-12-17 01:08:26]

Patchset #1 (id:1) has been deleted

[commit-bot: I haz the power, 2016-12-17 01:08:54]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-17 01:25:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-17 01:25:54]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[emircan, 2016-12-19 18:14:10]

The CQ bit was checked by emircan@chromium.org to run a CQ dry run

[emircan, 2016-12-19 18:14:19]

Patchset #1 (id:20001) has been deleted

[commit-bot: I haz the power, 2016-12-19 18:14:25]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-19 20:44:00]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-19 20:44:01]

Dry run: This issue passed the CQ dry run.

[emircan, 2016-12-22 00:18:03]

Description was changed from

==========
Removing gpu::SyncToken usage from video capture pipeline, part 1.

The use of gpu::SyncToken has been added for the sake of capture into
textures, but is now useless. This patch removes all uses up to
`OnClientBufferFinished` (excluded).

BUG=653994
==========

to

==========
Removing gpu::SyncToken usage from video capture pipeline

This CL is patched from https://codereview.chromium.org/2442193002/. All
credit goes to D.O.Teller@gmail.com.

The use of gpu::SyncToken has been added for the sake of capture into
textures, but is now useless. This patch removes all uses up to
`OnClientBufferFinished` (excluded).

BUG=653994
==========

[emircan, 2016-12-22 00:18:03]

emircan@chromium.org changed reviewers:
+ mcasas@chromium.org

[emircan, 2016-12-22 00:18:38]

External reviewer seems to give up on
https://codereview.chromium.org/2442193002/ :( PTAL.

[mcasas, 2016-12-22 01:04:01]

mcasas@chromium.org changed reviewers:
+ miu@chromium.org

[mcasas, 2016-12-22 01:04:02]

lgtm, 

miu@ can you take a quick look as well?

https://codereview.chromium.org/2583883003/diff/40001/content/renderer/media/...
File content/renderer/media/video_capture_impl_unittest.cc (right):

https://codereview.chromium.org/2583883003/diff/40001/content/renderer/media/...
content/renderer/media/video_capture_impl_unittest.cc:60: void(int32_t, int32_t,
double));
nit: fits in one line now.

[miu, 2016-12-22 01:33:32]

PS1 lgtm

[emircan, 2016-12-22 22:57:20]

The CQ bit was checked by emircan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-22 22:57:44]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[emircan, 2016-12-22 22:58:13]

Thanks.

https://codereview.chromium.org/2583883003/diff/40001/content/renderer/media/...
File content/renderer/media/video_capture_impl_unittest.cc (right):

https://codereview.chromium.org/2583883003/diff/40001/content/renderer/media/...
content/renderer/media/video_capture_impl_unittest.cc:60: void(int32_t, int32_t,
double));
On 2016/12/22 01:04:01, mcasas (OOO till Jan-3) wrote:
> nit: fits in one line now.

Done.

[emircan, 2016-12-22 22:59:02]

emircan@chromium.org changed reviewers:
+ tsepez@chromium.org

[emircan, 2016-12-22 22:59:03]

tsepez@, can you PTAL at content/common/video_capture.mojom?

[commit-bot: I haz the power, 2016-12-22 23:53:32]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-22 23:53:32]

Dry run: This issue passed the CQ dry run.

[Tom Sepez, 2017-01-03 19:17:36]

RS LGTM on deleting args

[emircan, 2017-01-03 19:18:39]

The CQ bit was checked by emircan@chromium.org

[emircan, 2017-01-03 19:18:40]

The patchset sent to the CQ was uploaded after l-g-t-m from mcasas@chromium.org,
miu@chromium.org
Link to the patchset: https://codereview.chromium.org/2583883003/#ps60001
(title: "mcasas nit.")

[commit-bot: I haz the power, 2017-01-03 19:18:54]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-03 20:29:26]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-03 20:29:28]

Failed to apply patch for content/renderer/media/video_capture_impl.cc:
While running git apply --index -p1;
  error: patch failed: content/renderer/media/video_capture_impl.cc:310
  error: content/renderer/media/video_capture_impl.cc: patch does not apply

Patch:       content/renderer/media/video_capture_impl.cc
Index: content/renderer/media/video_capture_impl.cc
diff --git a/content/renderer/media/video_capture_impl.cc
b/content/renderer/media/video_capture_impl.cc
index
aaacbf0695f01a8afac11d23064ad5a6d5705e65..3674569716ac36a12930cbc0e8193efed0e37717
100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -269,8 +269,7 @@ void VideoCaptureImpl::OnBufferReady(int32_t buffer_id,
                 << ", storage:" << info->storage_type;
   }
   if (!consume_buffer) {
-    GetVideoCaptureHost()->ReleaseBuffer(device_id_, buffer_id,
-                                         gpu::SyncToken(), -1.0);
+    GetVideoCaptureHost()->ReleaseBuffer(device_id_, buffer_id, -1.0);
     return;
   }
 
@@ -310,18 +309,16 @@ void VideoCaptureImpl::OnBufferReady(int32_t buffer_id,
           buffer->buffer_size(), buffer->buffer()->handle(),
           0 /* shared_memory_offset */, info->timestamp);
   if (!frame) {
-    GetVideoCaptureHost()->ReleaseBuffer(device_id_, buffer_id,
-                                         gpu::SyncToken(), -1.0);
+    GetVideoCaptureHost()->ReleaseBuffer(device_id_, buffer_id, -1.0);
     return;
   }
 
   BufferFinishedCallback buffer_finished_callback = media::BindToCurrentLoop(
       base::Bind(&VideoCaptureImpl::OnClientBufferFinished,
                  weak_factory_.GetWeakPtr(), buffer_id, buffer));
-  std::unique_ptr<gpu::SyncToken> release_sync_token(new gpu::SyncToken);
   frame->AddDestructionObserver(
       base::Bind(&VideoCaptureImpl::DidFinishConsumingFrame, frame->metadata(),
-                 base::Passed(&release_sync_token), buffer_finished_callback));
+                 buffer_finished_callback));
 
   frame->metadata()->MergeInternalValuesFrom(info->metadata);
 
@@ -345,11 +342,10 @@ void VideoCaptureImpl::OnBufferDestroyed(int32_t
buffer_id) {
 void VideoCaptureImpl::OnClientBufferFinished(
     int buffer_id,
     const scoped_refptr<ClientBuffer>& /* ignored_buffer */,
-    const gpu::SyncToken& release_sync_token,
     double consumer_resource_utilization) {
   DCHECK(io_thread_checker_.CalledOnValidThread());
   GetVideoCaptureHost()->ReleaseBuffer(
-      device_id_, buffer_id, release_sync_token,
consumer_resource_utilization);
+      device_id_, buffer_id, consumer_resource_utilization);
 }
 
 void VideoCaptureImpl::StopDevice() {
@@ -428,7 +424,6 @@ mojom::VideoCaptureHost*
VideoCaptureImpl::GetVideoCaptureHost() {
 // static
 void VideoCaptureImpl::DidFinishConsumingFrame(
     const media::VideoFrameMetadata* metadata,
-    std::unique_ptr<gpu::SyncToken> release_sync_token,
     const BufferFinishedCallback& callback_to_io_thread) {
   // Note: This function may be called on any thread by the VideoFrame
   // destructor.  |metadata| is still valid for read-access at this point.
@@ -437,8 +432,7 @@ void VideoCaptureImpl::DidFinishConsumingFrame(
                            &consumer_resource_utilization)) {
     consumer_resource_utilization = -1.0;
   }
-
-  callback_to_io_thread.Run(*release_sync_token,
consumer_resource_utilization);
+  callback_to_io_thread.Run(consumer_resource_utilization);
 }
 
 }  // namespace content

[emircan, 2017-01-03 20:37:13]

The CQ bit was checked by emircan@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-03 20:37:33]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-03 22:06:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-03 22:06:13]

Dry run: This issue passed the CQ dry run.

[emircan, 2017-01-03 22:20:11]

The CQ bit was checked by emircan@chromium.org

[emircan, 2017-01-03 22:20:11]

The patchset sent to the CQ was uploaded after l-g-t-m from tsepez@chromium.org,
mcasas@chromium.org, miu@chromium.org
Link to the patchset: https://codereview.chromium.org/2583883003/#ps80001
(title: "Rebase.")

[commit-bot: I haz the power, 2017-01-03 22:20:32]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-03 22:27:02]

CQ is committing da patch.

Bot data: {"patchset_id": 80001, "attempt_start_ts": 1483482011054440,
"parent_rev": "cfcdb37566f6607f9a874bc2d790a7233d7ba523", "commit_rev":
"bf7b77a915a07f627307fbe5a21d1e5e512c41bc"}

[commit-bot: I haz the power, 2017-01-03 22:27:33]

Description was changed from

==========
Removing gpu::SyncToken usage from video capture pipeline

This CL is patched from https://codereview.chromium.org/2442193002/. All
credit goes to D.O.Teller@gmail.com.

The use of gpu::SyncToken has been added for the sake of capture into
textures, but is now useless. This patch removes all uses up to
`OnClientBufferFinished` (excluded).

BUG=653994
==========

to

==========
Removing gpu::SyncToken usage from video capture pipeline

This CL is patched from https://codereview.chromium.org/2442193002/. All
credit goes to D.O.Teller@gmail.com.

The use of gpu::SyncToken has been added for the sake of capture into
textures, but is now useless. This patch removes all uses up to
`OnClientBufferFinished` (excluded).

BUG=653994

Review-Url: https://codereview.chromium.org/2583883003
==========

[commit-bot: I haz the power, 2017-01-03 22:27:37]

Committed patchset #3 (id:80001)

[commit-bot: I haz the power, 2017-01-03 22:31:14]

Description was changed from

==========
Removing gpu::SyncToken usage from video capture pipeline

This CL is patched from https://codereview.chromium.org/2442193002/. All
credit goes to D.O.Teller@gmail.com.

The use of gpu::SyncToken has been added for the sake of capture into
textures, but is now useless. This patch removes all uses up to
`OnClientBufferFinished` (excluded).

BUG=653994

Review-Url: https://codereview.chromium.org/2583883003
==========

to

==========
Removing gpu::SyncToken usage from video capture pipeline

This CL is patched from https://codereview.chromium.org/2442193002/. All
credit goes to D.O.Teller@gmail.com.

The use of gpu::SyncToken has been added for the sake of capture into
textures, but is now useless. This patch removes all uses up to
`OnClientBufferFinished` (excluded).

BUG=653994

Committed: https://crrev.com/214a2c9b14523bebc5ccef00e8df54099e3a619a
Cr-Commit-Position: refs/heads/master@{#441223}
==========

[commit-bot: I haz the power, 2017-01-03 22:31:15]

Patchset 3 (id:??) landed as
https://crrev.com/214a2c9b14523bebc5ccef00e8df54099e3a619a
Cr-Commit-Position: refs/heads/master@{#441223}