Commit 56d9c631 authored by Dale Curtis's avatar Dale Curtis Committed by Commit Bot

Revert "Add a microtask version of the video.rAF for testing."

This reverts commit 6db10514. This did
not work well so it's being reverted.

R=tguilbert

Bug: 1012063
Change-Id: Ia5faf1026921dab735ead8acaa8f4fdd80dc6fc1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2135894
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Thomas Guilbert <tguilbert@chromium.org>
Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: default avatarThomas Guilbert <tguilbert@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756441}
parent da4dfa79
...@@ -390,12 +390,6 @@ const base::Feature kUseNewMediaCache{"use-new-media-cache", ...@@ -390,12 +390,6 @@ const base::Feature kUseNewMediaCache{"use-new-media-cache",
const base::Feature kUseMediaHistoryStore{"UseMediaHistoryStore", const base::Feature kUseMediaHistoryStore{"UseMediaHistoryStore",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
// Causes video.requestAniationFrame to use a microtask instead of running with
// the rendering steps. TODO(crbug.com/1012063): Remove this once we figure out
// which implementation to use.
const base::Feature kUseMicrotaskForVideoRAF{"UseMicrotaskForVideoRAF",
base::FEATURE_DISABLED_BY_DEFAULT};
// Use R16 texture for 9-16 bit channel instead of half-float conversion by CPU. // Use R16 texture for 9-16 bit channel instead of half-float conversion by CPU.
const base::Feature kUseR16Texture{"use-r16-texture", const base::Feature kUseR16Texture{"use-r16-texture",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
......
...@@ -164,7 +164,6 @@ MEDIA_EXPORT extern const base::Feature kUnifiedAutoplay; ...@@ -164,7 +164,6 @@ MEDIA_EXPORT extern const base::Feature kUnifiedAutoplay;
MEDIA_EXPORT extern const base::Feature kUseAndroidOverlayAggressively; MEDIA_EXPORT extern const base::Feature kUseAndroidOverlayAggressively;
MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream; MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream;
MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore; MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore;
MEDIA_EXPORT extern const base::Feature kUseMicrotaskForVideoRAF;
MEDIA_EXPORT extern const base::Feature kUseNewMediaCache; MEDIA_EXPORT extern const base::Feature kUseNewMediaCache;
MEDIA_EXPORT extern const base::Feature kUseR16Texture; MEDIA_EXPORT extern const base::Feature kUseR16Texture;
MEDIA_EXPORT extern const base::Feature kVaapiH264AMDEncoder; MEDIA_EXPORT extern const base::Feature kVaapiH264AMDEncoder;
......
include_rules = [ include_rules = [
"+media/base/media_switches.h",
"+media/base/video_frame.h", "+media/base/video_frame.h",
] ]
\ No newline at end of file
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <utility> #include <utility>
#include "base/trace_event/trace_event.h" #include "base/trace_event/trace_event.h"
#include "media/base/media_switches.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_video_frame_metadata.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_video_frame_metadata.h"
#include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/document.h"
#include "third_party/blink/renderer/core/dom/scripted_animation_controller.h" #include "third_party/blink/renderer/core/dom/scripted_animation_controller.h"
...@@ -17,7 +16,6 @@ ...@@ -17,7 +16,6 @@
#include "third_party/blink/renderer/core/timing/performance.h" #include "third_party/blink/renderer/core/timing/performance.h"
#include "third_party/blink/renderer/core/timing/time_clamper.h" #include "third_party/blink/renderer/core/timing/time_clamper.h"
#include "third_party/blink/renderer/modules/video_raf/video_frame_request_callback_collection.h" #include "third_party/blink/renderer/modules/video_raf/video_frame_request_callback_collection.h"
#include "third_party/blink/renderer/platform/bindings/microtask.h"
#include "third_party/blink/renderer/platform/wtf/functional.h" #include "third_party/blink/renderer/platform/wtf/functional.h"
namespace blink { namespace blink {
...@@ -92,24 +90,12 @@ void VideoRequestAnimationFrameImpl::ScheduleCallbackExecution() { ...@@ -92,24 +90,12 @@ void VideoRequestAnimationFrameImpl::ScheduleCallbackExecution() {
return; return;
pending_execution_ = true; pending_execution_ = true;
if (base::FeatureList::IsEnabled(media::kUseMicrotaskForVideoRAF)) { GetSupplementable()
auto& time_converter = ->GetDocument()
GetSupplementable()->GetDocument().Loader()->GetTiming(); .GetScriptedAnimationController()
Microtask::EnqueueMicrotask(WTF::Bind( .ScheduleVideoRafExecution(
&VideoRequestAnimationFrameImpl::OnRenderingSteps, WTF::Bind(&VideoRequestAnimationFrameImpl::OnRenderingSteps,
WrapWeakPersistent(this), WrapWeakPersistent(this)));
// TODO(crbug.com/1012063): Now is probably not the right value.
GetClampedTimeInMillis(
time_converter.MonotonicTimeToZeroBasedDocumentTime(
base::TimeTicks::Now()))));
} else {
GetSupplementable()
->GetDocument()
.GetScriptedAnimationController()
.ScheduleVideoRafExecution(
WTF::Bind(&VideoRequestAnimationFrameImpl::OnRenderingSteps,
WrapWeakPersistent(this)));
}
} }
void VideoRequestAnimationFrameImpl::OnRequestAnimationFrame() { void VideoRequestAnimationFrameImpl::OnRequestAnimationFrame() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment