-
Jamie Madill authored
This reverts commit 9803c0eb. Reason for revert: WebGL 2 video test failures on Win/Mac. Blocking the ANGLE CQ. https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Win10%20FYI%20Release%20%28NVIDIA%29/2542 https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Mac%20FYI%20Release%20%28Intel%29/6848 https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Win7%20FYI%20Release%20%28NVIDIA%29/2571 https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Win7%20FYI%20Release%20%28AMD%29/2795 https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Mac%20FYI%20Retina%20Release%20%28AMD%29/8042 Also reverts "[media] Fix video frame copy when context is lost." Bug: 890281 Original change's description: > [media] Fix video to canvas GPU-CPU race. > > VideoFrames marked with VideoFrameMetadata::READ_LOCK_FENCES_ENABLED > must be retained until all reads have been completed. Such frames are > produced when software frames are uploaded to GpuMemoryBuffers. The > VideoResourceUpdater handles this, but PaintCanvasVideoRenderer > implemented only sync tokens. > > As a result, WebGL reads of software-decoded frames can tear when the > storage is reused for later frames. > > This CL adds a GL_COMMANDS_COMPLETED_CHROMIUM query after each potential > VideoFrame read in PaintCanvasVideoRenderer, and retains a reference to > the VideoFrame until it completes. This ensures that the memory is not > reused until after the reads complete in the GPU process. > > Bug: 819914 > Change-Id: I3e6e5f83cff86beedbd76a406aa31c4eb84a0929 > Reviewed-on: https://chromium-review.googlesource.com/1244835 > Reviewed-by: Ted Choc <tedchoc@chromium.org> > Reviewed-by: Pavel Feldman <pfeldman@chromium.org> > Reviewed-by: Sunny Sachanandani <sunnyps@chromium.org> > Reviewed-by: Antoine Labour <piman@chromium.org> > Commit-Queue: Dan Sanders <sandersd@chromium.org> > Cr-Commit-Position: refs/heads/master@{#594900} TBR=pfeldman@chromium.org,tedchoc@chromium.org,sandersd@chromium.org,dcastagna@chromium.org,sunnyps@chromium.org,piman@chromium.org Change-Id: Ib21a4879a9ca6fc4b84f6f2c2f1171c794db54b7 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 819914 Reviewed-on: https://chromium-review.googlesource.com/1251321 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by:
Jamie Madill <jmadill@chromium.org> Cr-Commit-Position: refs/heads/master@{#595058}
b39e1696