summaryrefslogtreecommitdiffstats
path: root/dom/media/MediaDecoderStateMachine.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-02-07 16:32:52 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-02-07 16:32:52 +0100
commit0dca00b282fb06ec1512bccafd32e0a919242208 (patch)
tree1f443869475eb32a8a8babfdf68b74b6d4d601cb /dom/media/MediaDecoderStateMachine.cpp
parent76fe52eb81db323ceaa8396de39b76efbce1c25e (diff)
parent0b6d9a47051be9ef4d064c6f7c60717da91d0bc2 (diff)
downloadUXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar
UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.gz
UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.lz
UXP-0dca00b282fb06ec1512bccafd32e0a919242208.tar.xz
UXP-0dca00b282fb06ec1512bccafd32e0a919242208.zip
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'dom/media/MediaDecoderStateMachine.cpp')
-rw-r--r--dom/media/MediaDecoderStateMachine.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index 5bc1d95ef..2ed1956c9 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1173,27 +1173,12 @@ StateObject::HandleShutdown()
return SetState<ShutdownState>();
}
-static void
-ReportRecoveryTelemetry(const TimeStamp& aRecoveryStart,
- const MediaInfo& aMediaInfo,
- bool aIsHardwareAccelerated)
-{
-/* STUB */
-}
-
void
MediaDecoderStateMachine::
StateObject::HandleResumeVideoDecoding()
{
MOZ_ASSERT(mMaster->mVideoDecodeSuspended);
- // Start counting recovery time from right now.
- TimeStamp start = TimeStamp::Now();
-
- // Local reference to mInfo, so that it will be copied in the lambda below.
- auto& info = Info();
- bool hw = Reader()->VideoIsHardwareAccelerated();
-
// Start video-only seek to the current time.
SeekJob seekJob;
@@ -1205,10 +1190,7 @@ StateObject::HandleResumeVideoDecoding()
type,
true /* aVideoOnly */);
- SetState<SeekingState>(Move(seekJob), EventVisibility::Suppressed)->Then(
- AbstractThread::MainThread(), __func__,
- [start, info, hw](){ ReportRecoveryTelemetry(start, info, hw); },
- [](){});
+ SetState<SeekingState>(Move(seekJob), EventVisibility::Suppressed);
}
void